numba-cuda 0.15.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

numba_cuda/VERSION

@@ -1 +1 @@
-0.15.0
+0.15.1

numba_cuda/numba/cuda/__init__.py

@@ -31,6 +31,17 @@ if _nvidia_binding_enabled_in_env is False:
 else:
     USE_NV_BINDING = True
     config.CUDA_USE_NVIDIA_BINDING = USE_NV_BINDING
+if config.CUDA_USE_NVIDIA_BINDING:
+    if not importlib.util.find_spec("cuda.bindings"):
+        raise ImportError(
+            "CUDA bindings not found. Please pip install the "
+            "cuda-bindings package. Alternatively, install "
+            "numba-cuda[cuXY], where XY is the required CUDA "
+            "version, to install the binding automatically. "
+            "If no CUDA bindings are desired, set the env var "
+            "NUMBA_CUDA_USE_NVIDIA_BINDING=0 to enable ctypes "
+            "bindings."
+        )
 
 if config.ENABLE_CUDASIM:
     from .simulator_init import *

numba_cuda/numba/cuda/cudadrv/devicearray.py

@@ -121,16 +121,10 @@ class DeviceNDArrayBase(_devicearray.DeviceArray):
 
     @property
     def __cuda_array_interface__(self):
-        if _driver.USE_NV_BINDING:
-            if self.device_ctypes_pointer is not None:
-                ptr = int(self.device_ctypes_pointer)
-            else:
-                ptr = 0
+        if self.device_ctypes_pointer.value is not None:
+            ptr = self.device_ctypes_pointer.value
         else:
-            if self.device_ctypes_pointer.value is not None:
-                ptr = self.device_ctypes_pointer.value
-            else:
-                ptr = 0
+            ptr = 0
 
         return {
             "shape": tuple(self.shape),
@@ -204,10 +198,7 @@ class DeviceNDArrayBase(_devicearray.DeviceArray):
     def device_ctypes_pointer(self):
         """Returns the ctypes pointer to the GPU data buffer"""
         if self.gpu_data is None:
-            if _driver.USE_NV_BINDING:
-                return _driver.binding.CUdeviceptr(0)
-            else:
-                return c_void_p(0)
+            return c_void_p(0)
         else:
             return self.gpu_data.device_ctypes_pointer
 

numba_cuda/numba/cuda/cudadrv/driver.py

@@ -2090,6 +2090,8 @@ class MemoryPointer(object):
 
     @property
     def device_ctypes_pointer(self):
+        if USE_NV_BINDING:
+            return drvapi.cu_device_ptr(int(self.device_pointer))
         return self.device_pointer
 
     @property
@@ -3431,8 +3433,8 @@ def device_extents(devmem):
     """
     devptr = device_ctypes_pointer(devmem)
     if USE_NV_BINDING:
-        s, n = driver.cuMemGetAddressRange(devptr)
-        return s, binding.CUdeviceptr(int(s) + n)
+        s, n = driver.cuMemGetAddressRange(devptr.value)
+        return int(s), int(binding.CUdeviceptr(int(s) + n))
     else:
         s = drvapi.cu_device_ptr()
         n = c_size_t()
@@ -3449,10 +3451,7 @@ def device_memory_size(devmem):
     sz = getattr(devmem, "_cuda_memsize_", None)
     if sz is None:
         s, e = device_extents(devmem)
-        if USE_NV_BINDING:
-            sz = int(e) - int(s)
-        else:
-            sz = e - s
+        sz = e - s
         devmem._cuda_memsize_ = sz
     assert sz >= 0, "{} length array".format(sz)
     return sz
@@ -3518,10 +3517,7 @@ def host_memory_size(obj):
 
 def device_pointer(obj):
     "Get the device pointer as an integer"
-    if USE_NV_BINDING:
-        return obj.device_ctypes_pointer
-    else:
-        return device_ctypes_pointer(obj).value
+    return device_ctypes_pointer(obj).value
 
 
 def device_ctypes_pointer(obj):

numba_cuda/numba/cuda/dispatcher.py

@@ -588,8 +588,6 @@ class _Kernel(serialize.ReduceMixin):
         elif isinstance(ty, types.Record):
             devrec = wrap_arg(val).to_device(retr, stream)
             ptr = devrec.device_ctypes_pointer
-            if driver.USE_NV_BINDING:
-                ptr = ctypes.c_void_p(int(ptr))
             kernelargs.append(ptr)
 
         elif isinstance(ty, types.BaseTuple):
@@ -1009,7 +1007,7 @@ class CUDADispatcher(Dispatcher, serialize.ReduceMixin):
         A (template, pysig, args, kws) tuple is returned.
         """
         # Fold keyword arguments and resolve default values
-        pysig, args = self._compiler.fold_argument_types(args, kws)
+        pysig, args = self.fold_argument_types(args, kws)
         kws = {}
 
         # Ensure an exactly-matching overload is available if we can

numba_cuda/numba/cuda/memory_management/nrt.py

@@ -113,10 +113,13 @@ class _Runtime:
             self._compile_memsys_module()
 
         # Allocate space for NRT_MemSys
-        ptr, nbytes = self._memsys_module.get_global_symbol("memsys_size")
         memsys_size = ctypes.c_uint64()
+        ptr, nbytes = self._memsys_module.get_global_symbol("memsys_size")
+        device_memsys_size = ptr.device_ctypes_pointer
+        if USE_NV_BINDING:
+            device_memsys_size = device_memsys_size.value
         driver.cuMemcpyDtoH(
-            ctypes.addressof(memsys_size), ptr.device_ctypes_pointer, nbytes
+            ctypes.addressof(memsys_size), device_memsys_size, nbytes
         )
         self._memsys = device_array(
             (memsys_size.value,), dtype="i1", stream=stream
@@ -145,18 +148,6 @@ class _Runtime:
             cooperative=False,
         )
 
-    def _ctypes_pointer(self, array):
-        """
-        Given an array, return a ctypes pointer to the data suitable for
-        passing to ``launch_kernel``.
-        """
-        ptr = array.device_ctypes_pointer
-
-        if USE_NV_BINDING:
-            ptr = ctypes.c_void_p(int(ptr))
-
-        return ptr
-
     def ensure_initialized(self, stream=None):
         """
         If memsys is not initialized, initialize memsys
@@ -206,7 +197,7 @@ class _Runtime:
         context
         """
         enabled_ar = cuda.managed_array(1, np.uint8)
-        enabled_ptr = self._ctypes_pointer(enabled_ar)
+        enabled_ptr = enabled_ar.device_ctypes_pointer
 
         self._single_thread_launch(
             self._memsys_module,
@@ -233,7 +224,7 @@ class _Runtime:
         )
 
         stats_for_read = cuda.managed_array(1, dt)
-        stats_ptr = self._ctypes_pointer(stats_for_read)
+        stats_ptr = stats_for_read.device_ctypes_pointer
 
         self._single_thread_launch(
             self._memsys_module, stream, "NRT_MemSys_read", [stats_ptr]
@@ -264,7 +255,7 @@ class _Runtime:
         Get a single stat from the memsys
         """
         got = cuda.managed_array(1, np.uint64)
-        got_ptr = self._ctypes_pointer(got)
+        got_ptr = got.device_ctypes_pointer
 
         self._single_thread_launch(
             self._memsys_module, stream, f"NRT_MemSys_read_{stat}", [got_ptr]
@@ -327,7 +318,7 @@ class _Runtime:
                 "Please allocate NRT Memsys first before setting to module."
             )
 
-        memsys_ptr = self._ctypes_pointer(self._memsys)
+        memsys_ptr = self._memsys.device_ctypes_pointer
 
         self._single_thread_launch(
             module, stream, "NRT_MemSys_set", [memsys_ptr]

numba_cuda/numba/cuda/tests/cudadrv/test_cuda_driver.py

@@ -1,4 +1,4 @@
-from ctypes import byref, c_int, c_void_p, sizeof
+from ctypes import byref, c_int, sizeof
 
 from numba.cuda.cudadrv.driver import (
     host_to_device,
@@ -94,7 +94,6 @@ class TestCudaDriver(CUDATestCase):
         stream = 0
 
         if _driver.USE_NV_BINDING:
-            ptr = c_void_p(int(ptr))
             stream = _driver.binding.CUstream(stream)
 
         launch_kernel(
@@ -129,8 +128,6 @@ class TestCudaDriver(CUDATestCase):
             host_to_device(memory, array, sizeof(array), stream=stream)
 
             ptr = memory.device_ctypes_pointer
-            if _driver.USE_NV_BINDING:
-                ptr = c_void_p(int(ptr))
 
             launch_kernel(
                 function.handle,  # Kernel

numba_cuda/numba/cuda/tests/cudadrv/test_cuda_memory.py

@@ -20,10 +20,7 @@ class TestCudaMemory(ContextResettingTestCase):
     def _template(self, obj):
         self.assertTrue(driver.is_device_memory(obj))
         driver.require_device_memory(obj)
-        if driver.USE_NV_BINDING:
-            expected_class = driver.binding.CUdeviceptr
-        else:
-            expected_class = drvapi.cu_device_ptr
+        expected_class = drvapi.cu_device_ptr
         self.assertTrue(isinstance(obj.device_ctypes_pointer, expected_class))
 
     def test_device_memory(self):

numba_cuda/numba/cuda/tests/cudapy/test_cuda_array_interface.py

@@ -12,10 +12,9 @@ from unittest.mock import call, patch
 @skip_on_cudasim("CUDA Array Interface is not supported in the simulator")
 class TestCudaArrayInterface(ContextResettingTestCase):
     def assertPointersEqual(self, a, b):
-        if driver.USE_NV_BINDING:
-            self.assertEqual(
-                int(a.device_ctypes_pointer), int(b.device_ctypes_pointer)
-            )
+        self.assertEqual(
+            a.device_ctypes_pointer.value, b.device_ctypes_pointer.value
+        )
 
     def test_as_cuda_array(self):
         h_arr = np.arange(10)

{numba_cuda-0.15.0.dist-info → numba_cuda-0.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numba-cuda
-Version: 0.15.0
+Version: 0.15.1
 Summary: CUDA target for Numba
 Author: Anaconda Inc., NVIDIA Corporation
 License: BSD 2-clause

{numba_cuda-0.15.0.dist-info → numba_cuda-0.15.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 _numba_cuda_redirector.pth,sha256=cmfMMmV0JPh3yEpl4bGeM9AuXiVVMSo6Z_b7RaQL3XE,30
 _numba_cuda_redirector.py,sha256=n_r8MYbu5-vcXMnLJW147k8DnFXXvgb7nPIXnlXwTyQ,2659
-numba_cuda/VERSION,sha256=-EBaczDChwKNRww-41Bvh48a2F7XnB0a3BnfL_c5iRU,7
+numba_cuda/VERSION,sha256=RKv2awImAXmzpQmw8QtfJvQx8xbvTKUPGHZMnkuM_Uo,7
 numba_cuda/__init__.py,sha256=atXeUvJKR3JHcAiCFbXCVOJQUHgB1TulmsqSL_9RT3Q,114
 numba_cuda/_version.py,sha256=nzrrJXi85d18m6SPdsPsetJNClDETkmF1MrEhGLYDBs,734
-numba_cuda/numba/cuda/__init__.py,sha256=Di4bHKnDtTgiHC4kdEM-BRLC6MTTmDRGCpPNiNDUd_0,1842
+numba_cuda/numba/cuda/__init__.py,sha256=C4GaDax1WYQgj6JaPkHAHXSxI9grkEigbrTW03foqKU,2369
 numba_cuda/numba/cuda/api.py,sha256=mkbZBcBfm819kCywQbH8jAvUex2m4pYTcFD-LE-tXsQ,17638
 numba_cuda/numba/cuda/api_util.py,sha256=jK8oUD3zf_D5IX7vbjc3uY_5kmOxwgEqO2m_lDHdWfM,861
 numba_cuda/numba/cuda/args.py,sha256=UlTHTJpwPeCtnW0Bb-Wetm5UO9TPR-PCgIt5ys8b8tQ,1894
@@ -21,7 +21,7 @@ numba_cuda/numba/cuda/decorators.py,sha256=NeSHxaiUZyAVJf79UFTctU-7AKLm8dDPERIHb
 numba_cuda/numba/cuda/descriptor.py,sha256=t1rSVJSCAlVACC5_Un3FQ7iubdTTBe-euqz88cvs2tI,985
 numba_cuda/numba/cuda/device_init.py,sha256=Rtwd6hQMHMLMkj6MXtndbWYFJfkIaRe0MwOIJF2nzhU,3449
 numba_cuda/numba/cuda/deviceufunc.py,sha256=zj9BbLiZD-dPttHew4olw8ANgR2nXnXEE9qjCeGLrQI,30731
-numba_cuda/numba/cuda/dispatcher.py,sha256=_uaS7jxpquTiG4En2u5eNbOBXYvOIrJebVS-vk9voVU,43467
+numba_cuda/numba/cuda/dispatcher.py,sha256=wkzSs-kZGRRqgaHMffO9xtkoZZSAzdZmPjd__c5mb_c,43371
 numba_cuda/numba/cuda/errors.py,sha256=WRso1Q_jCoWP5yrDBMhihRhhVtVo1-7KdN8QVE9j46o,1712
 numba_cuda/numba/cuda/extending.py,sha256=VwuU5F0AQFlJsqaiwoWk-6Itihew1FsjVT_BVjhY8Us,2278
 numba_cuda/numba/cuda/initialize.py,sha256=0SnpjccQEYiWITIyfAJx833H1yhYFFDY42EpnwYyMn8,487
@@ -50,9 +50,9 @@ numba_cuda/numba/cuda/vector_types.py,sha256=FlzOKufhvBnZ-VC-liA7y9is8BV-uj0fD-E
 numba_cuda/numba/cuda/vectorizers.py,sha256=nEfQxjSA4oCX8ZzvoqjDRygDfwzxFVDXtnjx-K1aPqA,8387
 numba_cuda/numba/cuda/_internal/cuda_bf16.py,sha256=QYck6s_D85HBEsc__SAl_UZxf7SptqAk31mLv_1gzuE,152212
 numba_cuda/numba/cuda/cudadrv/__init__.py,sha256=inat2K8K1OVrgDe64FK7CyRmyFyNKcNO4p2_L79yRZ0,201
-numba_cuda/numba/cuda/cudadrv/devicearray.py,sha256=6tF2TYnmjMbKk2fho1ONoD_QsRD9QVTT2kHP7x1u1J0,31556
+numba_cuda/numba/cuda/cudadrv/devicearray.py,sha256=xJFZwbfi7o9bzPDLxSPDTLdH6iFYi8W1AbOMmikbpgY,31225
 numba_cuda/numba/cuda/cudadrv/devices.py,sha256=k87EDIRhj1ncM9PxJCjZGPFfEks99vzmHlTc55GK5X0,8062
-numba_cuda/numba/cuda/cudadrv/driver.py,sha256=sa6kq9Bhk2C4OvLH6Bh3S-G8CnnsKewVZsEKc_6Wkps,118849
+numba_cuda/numba/cuda/cudadrv/driver.py,sha256=DrnrTjK857vvOTO_kj5KRo59VjwyVRXAhMU6TAOwRi4,118802
 numba_cuda/numba/cuda/cudadrv/drvapi.py,sha256=OnjYWnmy8ZlSfYouhzyYIpW-AJ3x1YHj32YcBY2xet4,16790
 numba_cuda/numba/cuda/cudadrv/dummyarray.py,sha256=2jycZhniMy3ncoVWQG9D8dBehTEeocBZTW43gKHL5Tc,14291
 numba_cuda/numba/cuda/cudadrv/enums.py,sha256=raWKryxamWQZ5A8ivMpyYVhhwbSpaD9lu7l1_wl2W9M,23742
@@ -81,7 +81,7 @@ numba_cuda/numba/cuda/memory_management/memsys.cu,sha256=gMBM9_Hnv3EO3Gw_GKvII8y
 numba_cuda/numba/cuda/memory_management/memsys.cuh,sha256=hPGBQgKyOfYY25ntoBXlhYyeXzxJyz0ByeTszkaKJUM,504
 numba_cuda/numba/cuda/memory_management/nrt.cu,sha256=1hzbAKyqh9783UVdVT67ZxfvJyl_Ojt8e0AbHUC86ss,4818
 numba_cuda/numba/cuda/memory_management/nrt.cuh,sha256=p2GQ-l-EfCoO0sBTyKXhIY3hxGWbPhEJcR-mLLT_V3M,2173
-numba_cuda/numba/cuda/memory_management/nrt.py,sha256=6yXKBUvjIw_9BJ48iDIuckREaQVskzQAXm7uIRGFVuc,10039
+numba_cuda/numba/cuda/memory_management/nrt.py,sha256=D5Dh72YYRm22qzINCpQ86CS6hK6U7VcgBW-JSbDMzuM,9864
 numba_cuda/numba/cuda/simulator/__init__.py,sha256=ONoWJ3SwE53di0p-lFRH7NOZea2jEUWyn9sDpkOVjCw,2040
 numba_cuda/numba/cuda/simulator/api.py,sha256=hFSFPIrg-aUd-MHg2GCSosFJiL8x2XRiQaqolfTGA3A,3551
 numba_cuda/numba/cuda/simulator/bf16.py,sha256=1ZWkY4Adv8dY46YyorGKGQj3KEBqeet6rsyM8jwfAb4,16
@@ -114,9 +114,9 @@ numba_cuda/numba/cuda/tests/cudadrv/test_context_stack.py,sha256=m7q1bEsH3rJD2gn
 numba_cuda/numba/cuda/tests/cudadrv/test_cuda_array_slicing.py,sha256=QhBQr3ZzrBMT-r132RR99UCKwrR-RwZk98RxVv5os0w,13933
 numba_cuda/numba/cuda/tests/cudadrv/test_cuda_auto_context.py,sha256=xprxASXl0g6QrOujoj07YDw3lIwu0SQbk1lGQPJHlRc,564
 numba_cuda/numba/cuda/tests/cudadrv/test_cuda_devicerecord.py,sha256=JkMbKFa3CBSMSQaSWzOqJU7DE5YlwJLux6OLAmvnSJo,5654
-numba_cuda/numba/cuda/tests/cudadrv/test_cuda_driver.py,sha256=bn9OBNmNq5WTgv5LXQTyi-3V3auKbIBNoC-vNfzeX9I,7536
+numba_cuda/numba/cuda/tests/cudadrv/test_cuda_driver.py,sha256=Q8hfUK8xhmt1bUYpzVy5Knm_14QAWdt3zxZkXJ6RT-0,7409
 numba_cuda/numba/cuda/tests/cudadrv/test_cuda_libraries.py,sha256=KWGON5OSb5Vp74QFDIiupK6ytMwwwDfbYqpENAB4lGE,801
-numba_cuda/numba/cuda/tests/cudadrv/test_cuda_memory.py,sha256=nN1pk7CEm4j8A6XYlDpIWkpFOSO7IGz-7rwa0fFnerY,6485
+numba_cuda/numba/cuda/tests/cudadrv/test_cuda_memory.py,sha256=_ysNhgEnvr18miDhzFWbFoQdrPRl6wHPjXAH4sGTOPo,6377
 numba_cuda/numba/cuda/tests/cudadrv/test_cuda_ndarray.py,sha256=MzKXO2RLCHA_0XU29JfjaLrmKTwwu7PA3cspTfQgCPM,21699
 numba_cuda/numba/cuda/tests/cudadrv/test_deallocations.py,sha256=VKYRuIOPdEWkI-6E6-pRCNC1U4-Qxi0d-jX_q_7x1dI,8420
 numba_cuda/numba/cuda/tests/cudadrv/test_detect.py,sha256=DUYZeNlDgL1mQN1xHDYzTRfc-zetuikcULyULcRaC1A,2657
@@ -165,7 +165,7 @@ numba_cuda/numba/cuda/tests/cudapy/test_complex_kernel.py,sha256=KIuXQ0ihgQQXM-e
 numba_cuda/numba/cuda/tests/cudapy/test_const_string.py,sha256=li1UsV5vc2M01cJ7k6_526VPtuAOAKr8e7kb1CDUXi4,4323
 numba_cuda/numba/cuda/tests/cudapy/test_constmem.py,sha256=ZWmyKvFokRMjqyXjVpZVOnR6LR694GWcbUn2jVEQV14,5170
 numba_cuda/numba/cuda/tests/cudapy/test_cooperative_groups.py,sha256=3OkjhcjPp_P3Pnc1zbteGpAGpoN07cG8Xtdnunx5yWA,5973
-numba_cuda/numba/cuda/tests/cudapy/test_cuda_array_interface.py,sha256=RXCNHAZM35sbUf3Gi-x2E8-a6BmhFb2rhQkBOeiS_fo,15757
+numba_cuda/numba/cuda/tests/cudapy/test_cuda_array_interface.py,sha256=k6pkt63aipYZd2ekYOuXw_GnyGWImcKwIHOkh5PEsr4,15713
 numba_cuda/numba/cuda/tests/cudapy/test_cuda_jit_no_types.py,sha256=8prL2FTiaajW-UHSL9al-nBniygOfpdAOT_Dkej4PWI,2138
 numba_cuda/numba/cuda/tests/cudapy/test_datetime.py,sha256=MnOeDWMz-rL3-07FsswM06Laxmm0KjTmTwhrP3rmchQ,3526
 numba_cuda/numba/cuda/tests/cudapy/test_debug.py,sha256=1P369s02AvGu7fSIEe_YxSgh3c6S72Aw1gRgmepDbQY,3383
@@ -274,8 +274,8 @@ numba_cuda/numba/cuda/tests/test_binary_generation/generate_raw_ltoir.py,sha256=
 numba_cuda/numba/cuda/tests/test_binary_generation/nrt_extern.cu,sha256=T9ubst3fFUK7EXyXXMi73wAban3VFFQ986cY5OcKfvI,157
 numba_cuda/numba/cuda/tests/test_binary_generation/test_device_functions.cu,sha256=IB5t-dVhrKVoue3AbUx3yVMxPG0hBF_yZbzb4642sf0,538
 numba_cuda/numba/cuda/tests/test_binary_generation/undefined_extern.cu,sha256=q3oxZziT8KDodeNcEBiWULH6vMrHCWucmJmtrg8C0d0,128
-numba_cuda-0.15.0.dist-info/licenses/LICENSE,sha256=eHeYE-XjASmwbxfsP5AImgfzRwZurZGqH1f6OFwJ4io,1326
-numba_cuda-0.15.0.dist-info/METADATA,sha256=gSh_itJMZcyqWFtoZNvw0QXPigNFA6x5lbxDvtduBb4,2907
-numba_cuda-0.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-numba_cuda-0.15.0.dist-info/top_level.txt,sha256=C50SsH-8tXDmt7I0Y3nlJYhS5s6pqWflCPdobe9vx2M,11
-numba_cuda-0.15.0.dist-info/RECORD,,
+numba_cuda-0.15.1.dist-info/licenses/LICENSE,sha256=eHeYE-XjASmwbxfsP5AImgfzRwZurZGqH1f6OFwJ4io,1326
+numba_cuda-0.15.1.dist-info/METADATA,sha256=tIHuoF1LHBDRmxYFwmcx6Lgv3Te5Pl539NwfRn21yLk,2907
+numba_cuda-0.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+numba_cuda-0.15.1.dist-info/top_level.txt,sha256=C50SsH-8tXDmt7I0Y3nlJYhS5s6pqWflCPdobe9vx2M,11
+numba_cuda-0.15.1.dist-info/RECORD,,