numba-cuda 0.1.0__tar.gz → 0.2.0__tar.gz

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/PKG-INFO

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

numba_cuda-0.2.0/numba_cuda/VERSION

@@ -0,0 +1 @@
+0.2.0

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/numba_cuda/numba/cuda/cudadecl.py

@@ -508,6 +508,11 @@ class Cuda_atomic_cas(AbstractTemplate):
             return signature(dty, ary, idx, dty, dty)
 
 
+@register_global(breakpoint)
+class Cuda_breakpoint(ConcreteTemplate):
+    cases = [signature(types.none)]
+
+
 @register
 class Cuda_nanosleep(ConcreteTemplate):
     key = cuda.nanosleep

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/numba_cuda/numba/cuda/cudadrv/driver.py

@@ -42,6 +42,11 @@ from .mappings import FILE_EXTENSION_MAP
 from .linkable_code import LinkableCode, LTOIR, Fatbin, Object
 from numba.cuda.cudadrv import enums, drvapi, nvrtc
 
+try:
+    from pynvjitlink.api import NvJitLinker, NvJitLinkError
+except ImportError:
+    NvJitLinker, NvJitLinkError = None, None
+
 USE_NV_BINDING = config.CUDA_USE_NVIDIA_BINDING
 
 if USE_NV_BINDING:
@@ -92,20 +97,6 @@ ENABLE_PYNVJITLINK = (
 if not hasattr(config, "CUDA_ENABLE_PYNVJITLINK"):
     config.CUDA_ENABLE_PYNVJITLINK = ENABLE_PYNVJITLINK
 
-if ENABLE_PYNVJITLINK:
-    try:
-        from pynvjitlink.api import NvJitLinker, NvJitLinkError
-    except ImportError:
-        raise ImportError(
-            "Using pynvjitlink requires the pynvjitlink package to be available"
-        )
-
-    if config.CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY:
-        raise ValueError(
-            "Can't set CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY and "
-            "CUDA_ENABLE_PYNVJITLINK at the same time"
-        )
-
 
 def make_logger():
     logger = logging.getLogger(__name__)
@@ -3061,6 +3052,17 @@ class PyNvJitLinker(Linker):
         lto=False,
         additional_flags=None,
     ):
+        if NvJitLinker is None:
+            raise ImportError(
+                "Using pynvjitlink requires the pynvjitlink package to be "
+                "available"
+            )
+
+        if config.CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY:
+            raise ValueError(
+                "Can't set CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY and "
+                "CUDA_ENABLE_PYNVJITLINK at the same time"
+            )
 
         if cc is None:
             raise RuntimeError("PyNvJitLinker requires CC to be specified")

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/numba_cuda/numba/cuda/cudaimpl.py

@@ -934,6 +934,14 @@ def ptx_atomic_cas(context, builder, sig, args):
 
 # -----------------------------------------------------------------------------
 
+
+@lower(breakpoint)
+def ptx_brkpt(context, builder, sig, args):
+    brkpt = ir.InlineAsm(ir.FunctionType(ir.VoidType(), []),
+                         "brkpt;", '', side_effect=True)
+    builder.call(brkpt, ())
+
+
 @lower(stubs.nanosleep, types.uint32)
 def ptx_nanosleep(context, builder, sig, args):
     nanosleep = ir.InlineAsm(ir.FunctionType(ir.VoidType(), [ir.IntType(32)]),

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/numba_cuda/numba/cuda/tests/cudadrv/test_nvjitlink.py

@@ -2,6 +2,18 @@ from numba.cuda.testing import unittest
 from numba.cuda.testing import skip_on_cudasim
 from numba.cuda.testing import CUDATestCase
 from numba.cuda.cudadrv.driver import PyNvJitLinker
+from numba.cuda import get_current_device
+
+from numba import cuda
+from numba import config
+from numba.tests.support import run_in_subprocess, override_config
+
+try:
+    import pynvjitlink  # noqa: F401
+    PYNVJITLINK_INSTALLED = True
+except ImportError:
+    PYNVJITLINK_INSTALLED = False
+
 
 import itertools
 import os
@@ -9,9 +21,6 @@ import io
 import contextlib
 import warnings
 
-from numba.cuda import get_current_device
-from numba import cuda
-from numba import config
 
 TEST_BIN_DIR = os.getenv("NUMBA_CUDA_TEST_BIN_DIR")
 if TEST_BIN_DIR:
@@ -251,5 +260,69 @@ class TestLinker(CUDATestCase):
                 pass
 
 
+@unittest.skipIf(
+    not PYNVJITLINK_INSTALLED, reason="Pynvjitlink is not installed"
+)
+class TestLinkerUsage(CUDATestCase):
+    """Test that whether pynvjitlink can be enabled by both environment variable
+    and modification of config at runtime.
+    """
+
+    src = """if 1:
+        import os
+        from numba import cuda, config
+
+        {config}
+
+        TEST_BIN_DIR = os.getenv("NUMBA_CUDA_TEST_BIN_DIR")
+        if TEST_BIN_DIR:
+            test_device_functions_cubin = os.path.join(
+                TEST_BIN_DIR, "test_device_functions.cubin"
+            )
+
+        sig = "uint32(uint32, uint32)"
+        add_from_numba = cuda.declare_device("add_from_numba", sig)
+
+        @cuda.jit(link=[test_device_functions_cubin], lto=True)
+        def kernel(result):
+            result[0] = add_from_numba(1, 2)
+
+        result = cuda.device_array(1)
+        kernel[1, 1](result)
+        assert result[0] == 3
+        """
+
+    def test_linker_enabled_envvar(self):
+        env = os.environ.copy()
+        env['NUMBA_CUDA_ENABLE_PYNVJITLINK'] = "1"
+        run_in_subprocess(self.src.format(config=""), env=env)
+
+    def test_linker_disabled_envvar(self):
+        env = os.environ.copy()
+        env.pop('NUMBA_CUDA_ENABLE_PYNVJITLINK', None)
+        with self.assertRaisesRegex(
+            AssertionError, "LTO and additional flags require PyNvJitLinker"
+        ):
+            # Actual error raised is `ValueError`, but `run_in_subprocess`
+            # reraises as AssertionError.
+            run_in_subprocess(self.src.format(config=""), env=env)
+
+    def test_linker_enabled_config(self):
+        env = os.environ.copy()
+        env.pop('NUMBA_CUDA_ENABLE_PYNVJITLINK', None)
+        run_in_subprocess(self.src.format(
+            config="config.CUDA_ENABLE_PYNVJITLINK = True"), env=env)
+
+    def test_linker_disabled_config(self):
+        env = os.environ.copy()
+        env.pop('NUMBA_CUDA_ENABLE_PYNVJITLINK', None)
+        with override_config("CUDA_ENABLE_PYNVJITLINK", False):
+            with self.assertRaisesRegex(
+                AssertionError, "LTO and additional flags require PyNvJitLinker"
+            ):
+                run_in_subprocess(self.src.format(
+                    config="config.CUDA_ENABLE_PYNVJITLINK = False"), env=env)
+
+
 if __name__ == "__main__":
     unittest.main()

{numba_cuda-0.1.0 → numba_cuda-0.2.0}/numba_cuda.egg-info/PKG-INFO

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

numba_cuda-0.1.0/numba_cuda/VERSION

@@ -1 +0,0 @@
-0.1.0