Fixed the tests.

Author: isazi

kernel_tuner/backends/nvcuda.py

@@ -13,7 +13,7 @@
 try:
     from cuda.bindings import driver, runtime, nvrtc
 except ImportError:
-    cuda = None
+    driver = None
 
 
 class CudaFunctions(GPUBackend):
@@ -39,7 +39,7 @@ def __init__(self, device=0, iterations=7, compiler_options=None, observers=None
         """
         self.allocations = []
         self.texrefs = []
-        if not cuda:
+        if not driver:
             raise ImportError(
                 "cuda-python not installed, install using 'pip install cuda-python', or check https://kerneltuner.github.io/kernel_tuner/stable/install.html#cuda-and-pycuda."
             )

kernel_tuner/observers/nvcuda.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 try:
-    from cuda.bindings import cudart
+    from cuda.bindings import runtime
 except ImportError:
     cuda = None
 
@@ -21,7 +21,7 @@ def __init__(self, dev):
 
     def after_finish(self):
         # Time is measured in milliseconds
-        err, time = cudart.cudaEventElapsedTime(self.start, self.end)
+        err, time = runtime.cudaEventElapsedTime(self.start, self.end)
         cuda_error_check(err)
         self.times.append(time)
 

test/test_cuda_functions.py

@@ -9,7 +9,7 @@
 from .test_runners import env  # noqa: F401
 
 try:
-    from cuda import cuda
+    from cuda.bindings import driver
 except Exception:
     pass
 
@@ -27,9 +27,9 @@ def test_ready_argument_list():
     dev = nvcuda.CudaFunctions(0)
     gpu_args = dev.ready_argument_list(arguments)
 
-    assert isinstance(gpu_args[0], cuda.CUdeviceptr)
+    assert isinstance(gpu_args[0], driver.CUdeviceptr)
     assert isinstance(gpu_args[1], np.int32)
-    assert isinstance(gpu_args[2], cuda.CUdeviceptr)
+    assert isinstance(gpu_args[2], driver.CUdeviceptr)
 
 
 @skip_if_no_cuda

test/test_util_functions.py

@@ -162,16 +162,6 @@ def test_get_thread_block_dimensions():
     assert threads[2] == 1
 
 
-def test_to_valid_nvrtc_gpu_arch_cc():
-    assert to_valid_nvrtc_gpu_arch_cc("89") == "89"
-    assert to_valid_nvrtc_gpu_arch_cc("88") == "87"
-    assert to_valid_nvrtc_gpu_arch_cc("86") == "80"
-    assert to_valid_nvrtc_gpu_arch_cc("40") == "52"
-    assert to_valid_nvrtc_gpu_arch_cc("90b") == "90a"
-    assert to_valid_nvrtc_gpu_arch_cc("91c") == "90a"
-    assert to_valid_nvrtc_gpu_arch_cc("1234") == "52"
-
-
 def test_prepare_kernel_string():
     kernel = "this is a weird kernel"
     grid = (3, 7)

test/utils/nvcuda.py

@@ -0,0 +1,11 @@
+from kernel_tuner.utils.nvcuda import to_valid_nvrtc_gpu_arch_cc
+
+
+def test_to_valid_nvrtc_gpu_arch_cc():
+    assert to_valid_nvrtc_gpu_arch_cc("89") == "89"
+    assert to_valid_nvrtc_gpu_arch_cc("88") == "87"
+    assert to_valid_nvrtc_gpu_arch_cc("86") == "80"
+    assert to_valid_nvrtc_gpu_arch_cc("40") == "52"
+    assert to_valid_nvrtc_gpu_arch_cc("90b") == "90a"
+    assert to_valid_nvrtc_gpu_arch_cc("91c") == "90a"
+    assert to_valid_nvrtc_gpu_arch_cc("1234") == "52"