@@ -18,10 +18,7 @@ def _no_such_file_in_sub_dirs(sub_dirs, file_wild, error_messages, attachments):
1818
1919
2020def _find_so_using_nvidia_lib_dirs (libname , so_basename , error_messages , attachments ):
21- if libname == "nvvm" : # noqa: SIM108
22- nvidia_sub_dirs = ("nvidia" , "*" , "nvvm" , "lib64" )
23- else :
24- nvidia_sub_dirs = ("nvidia" , "*" , "lib" )
21+ nvidia_sub_dirs = ("nvidia" , "*" , "nvvm" , "lib64" ) if libname == "nvvm" else ("nvidia" , "*" , "lib" )
2522 file_wild = so_basename + "*"
2623 for lib_dir in find_sub_dirs_all_sitepackages (nvidia_sub_dirs ):
2724 # First look for an exact match
@@ -47,10 +44,7 @@ def _find_dll_under_dir(dirpath, file_wild):
4744
4845
4946def _find_dll_using_nvidia_bin_dirs (libname , lib_searched_for , error_messages , attachments ):
50- if libname == "nvvm" : # noqa: SIM108
51- nvidia_sub_dirs = ("nvidia" , "*" , "nvvm" , "bin" )
52- else :
53- nvidia_sub_dirs = ("nvidia" , "*" , "bin" )
47+ nvidia_sub_dirs = ("nvidia" , "*" , "nvvm" , "bin" ) if libname == "nvvm" else ("nvidia" , "*" , "bin" )
5448 for bin_dir in find_sub_dirs_all_sitepackages (nvidia_sub_dirs ):
5549 dll_name = _find_dll_under_dir (bin_dir , lib_searched_for )
5650 if dll_name is not None :
@@ -71,18 +65,16 @@ def _find_lib_dir_using_cuda_home(libname):
7165 if cuda_home is None :
7266 return None
7367 if IS_WINDOWS :
74- if libname == "nvvm" : # noqa: SIM108
75- subdirs = (os .path .join ("nvvm" , "bin" ),)
76- else :
77- subdirs = ("bin" ,)
68+ subdirs = (os .path .join ("nvvm" , "bin" ),) if libname == "nvvm" else ("bin" ,)
7869 else :
79- if libname == "nvvm" : # noqa: SIM108
80- subdirs = (os .path .join ("nvvm" , "lib64" ),)
81- else :
82- subdirs = (
70+ subdirs = (
71+ (os .path .join ("nvvm" , "lib64" ),)
72+ if libname == "nvvm"
73+ else (
8374 "lib64" , # CTK
8475 "lib" , # Conda
8576 )
77+ )
8678 for subdir in subdirs :
8779 dirname = os .path .join (cuda_home , subdir )
8880 if os .path .isdir (dirname ):
0 commit comments