reset files

Author: brandon-b-miller

numba_cuda/numba/cuda/cudadrv/libs.py

@@ -13,6 +13,7 @@
 import os
 import sys
 import ctypes
+
 from numba.misc.findlib import find_lib
 from numba.cuda.cuda_paths import get_cuda_paths
 from numba.cuda.cudadrv.driver import locate_driver_and_loader, load_driver
@@ -50,7 +51,7 @@ def get_cudalib(lib, static=False):
     loader's search mechanism.
     """
     if lib == 'nvvm':
-        return get_cuda_paths()['nvvm'].info
+        return get_cuda_paths()['nvvm'].info or _dllnamepattern % 'nvvm'
     else:
         dir_type = 'static_cudalib_dir' if static else 'cudalib_dir'
         libdir = get_cuda_paths()[dir_type].info

numba_cuda/numba/cuda/cudadrv/nvrtc.py

@@ -1,19 +1,10 @@
-from ctypes import (
-    byref,
-    c_char,
-    c_char_p,
-    c_int,
-    c_size_t,
-    c_void_p,
-    POINTER,
-)
+from ctypes import byref, c_char, c_char_p, c_int, c_size_t, c_void_p, POINTER
 from enum import IntEnum
 from numba.cuda.cudadrv.error import (NvrtcError, NvrtcCompilationError,
                                       NvrtcSupportError)
 from numba.cuda.cuda_paths import get_cuda_paths
 import functools
 import os
-import sys
 import threading
 import warnings
 
@@ -23,9 +14,6 @@
 # Result code
 nvrtc_result = c_int
 
-PLATFORM_LINUX = sys.platform.startswith("linux")
-PLATFORM_WIN = sys.platform.startswith("win32")
-
 
 class NvrtcResult(IntEnum):
     NVRTC_SUCCESS = 0
@@ -43,7 +31,6 @@ class NvrtcResult(IntEnum):
 
 
 _nvrtc_lock = threading.Lock()
-_nvrtc_obj = []
 
 
 class NvrtcProgram:
@@ -123,9 +110,10 @@ class NVRTC:
     def __new__(cls):
         with _nvrtc_lock:
             if cls.__INSTANCE is None:
+                from numba.cuda.cudadrv.libs import open_cudalib
                 cls.__INSTANCE = inst = object.__new__(cls)
                 try:
-                    lib = _nvrtc_obj[0]
+                    lib = open_cudalib('nvrtc')
                 except OSError as e:
                     cls.__INSTANCE = None
                     raise NvrtcSupportError("NVRTC cannot be loaded") from e

numba_cuda/numba/cuda/cudadrv/nvvm.py

@@ -5,15 +5,8 @@
 import re
 import sys
 import warnings
-from ctypes import (
-    c_void_p,
-    c_int,
-    POINTER,
-    c_char_p,
-    c_size_t,
-    byref,
-    c_char
-)
+from ctypes import (c_void_p, c_int, POINTER, c_char_p, c_size_t, byref,
+                    c_char)
 
 import threading
 
@@ -23,8 +16,6 @@
 from .libs import get_libdevice, open_libdevice, open_cudalib
 from numba.core import cgutils, config
 
-PLATFORM_LINUX = sys.platform.startswith("linux")
-PLATFORM_WIN = sys.platform.startswith("win32")
 
 logger = logging.getLogger(__name__)