pass test bin dir as an env var

Author: brandon-b-miller

ci/test_conda_pynvjitlink.sh

@@ -53,7 +53,7 @@ set +u
 conda install -c rapidsai pynvjitlink
 set -u
 
-rapids_logger "Build tests"
+rapids-logger "Build tests"
 
 PY_SCRIPT="
 import numba_cuda
@@ -62,14 +62,14 @@ test_dir = root + \"numba/cuda/tests/test_binary_generation/\"
 print(test_dir)
 "
 
-TEST_DIR=$(python -c "$PY_SCRIPT")
-pushd $TEST_DIR
+NUMBA_CUDA_TEST_BIN_DIR=$(python -c "$PY_SCRIPT")
+pushd $NUMBA_CUDA_TEST_BIN_DIR
 make
 popd
 
 
 rapids-logger "Run Tests"
-ENABLE_PYNVJITLINK=1 python -m numba.runtests numba.cuda.tests -v
+ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
 
 popd
 

ci/test_wheel_pynvjitlink.sh

@@ -21,8 +21,8 @@ test_dir = root + \"numba/cuda/tests/test_binary_generation/\"
 print(test_dir)
 "
 
-TEST_DIR=$(python -c "$PY_SCRIPT")
-pushd $TEST_DIR
+NUMBA_CUDA_TEST_BIN_DIR=$(python -c "$PY_SCRIPT")
+pushd $NUMBA_CUDA_TEST_BIN_DIR
 make
 popd
 
@@ -42,6 +42,6 @@ rapids-logger "Show Numba system info"
 python -m numba --sysinfo
 
 rapids-logger "Run Tests"
-ENABLE_PYNVJITLINK=1 python -m numba.runtests numba.cuda.tests -v
+ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
 
 popd

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

@@ -4,12 +4,39 @@
 from numba.cuda.cudadrv.driver import PyNvJitLinker
 
 import itertools
+import os
 from numba.cuda import get_current_device
 from numba import cuda
 from numba import config
 
-
-@unittest.skipIf(not config.ENABLE_PYNVJITLINK, "pynvjitlink not enabled")
+TEST_BIN_DIR = os.getenv("NUMBA_CUDA_TEST_BIN_DIR")
+test_device_functions_a = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.a"
+)
+test_device_functions_cubin = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.cubin"
+)
+test_device_functions_cu = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.cu"
+)
+test_device_functions_fatbin = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.fatbin"
+)
+test_device_functions_o = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.o"
+)
+test_device_functions_ptx = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.ptx"
+)
+test_device_functions_ltoir = os.path.join(
+    TEST_BIN_DIR, "test_device_functions.ltoir"
+)
+
+
+@unittest.skipIf(
+    not config.ENABLE_PYNVJITLINK or not TEST_BIN_DIR,
+    "pynvjitlink not enabled"
+)
 @skip_on_cudasim("Linking unsupported in the simulator")
 class TestLinker(CUDATestCase):
     _NUMBA_NVIDIA_BINDING_0_ENV = {"NUMBA_CUDA_USE_NVIDIA_BINDING": "0"}
@@ -91,12 +118,12 @@ def test_nvjitlink_ptx_compile_options(self):
 
     def test_nvjitlink_add_file_guess_ext_linkable_code(self):
         files = (
-            "test_device_functions.a",
-            "test_device_functions.cubin",
-            "test_device_functions.cu",
-            "test_device_functions.fatbin",
-            "test_device_functions.o",
-            "test_device_functions.ptx",
+            test_device_functions_a,
+            test_device_functions_cubin,
+            test_device_functions_cu,
+            test_device_functions_fatbin,
+            test_device_functions_o,
+            test_device_functions_ptx,
         )
         for file in files:
             with self.subTest(file=file):
@@ -106,7 +133,7 @@ def test_nvjitlink_add_file_guess_ext_linkable_code(self):
                 patched_linker.add_file_guess_ext(file)
 
     def test_nvjitlink_test_add_file_guess_ext_invalid_input(self):
-        with open("test_device_functions.cubin", "rb") as f:
+        with open(test_device_functions_cubin, "rb") as f:
             content = f.read()
 
         patched_linker = PyNvJitLinker(
@@ -121,12 +148,12 @@ def test_nvjitlink_test_add_file_guess_ext_invalid_input(self):
 
     def test_nvjitlink_jit_with_linkable_code(self):
         files = (
-            "test_device_functions.a",
-            "test_device_functions.cubin",
-            "test_device_functions.cu",
-            "test_device_functions.fatbin",
-            "test_device_functions.o",
-            "test_device_functions.ptx",
+            test_device_functions_a,
+            test_device_functions_cubin,
+            test_device_functions_cu,
+            test_device_functions_fatbin,
+            test_device_functions_o,
+            test_device_functions_ptx,
         )
         for file in files:
             with self.subTest(file=file):
@@ -142,7 +169,7 @@ def kernel(result):
                 assert result[0] == 3
 
     def test_nvjitlink_jit_with_linkable_code_lto(self):
-        file = "test_device_functions.ltoir"
+        file = test_device_functions_ltoir
 
         sig = "uint32(uint32, uint32)"
         add_from_numba = cuda.declare_device("add_from_numba", sig)
@@ -156,7 +183,7 @@ def kernel(result):
         assert result[0] == 3
 
     def test_nvjitlink_jit_with_invalid_linkable_code(self):
-        with open("test_device_functions.cubin", "rb") as f:
+        with open(test_device_functions_cubin, "rb") as f:
             content = f.read()
         with self.assertRaisesRegex(
             TypeError, "Expected path to file or a LinkableCode"

numba_cuda/numba/cuda/tests/test_binary_generation/Makefile

@@ -32,7 +32,7 @@ LIBRARY_FLAGS := $(GENCODE) -lib
 FATBIN_FLAGS := $(FATBIN_GENCODE) --fatbin
 LTOIR_FLAGS := $(LTOIR_GENCODE) -dc
 
-OUTPUT_DIR := ../cudadrv
+OUTPUT_DIR := ./
 
 all:
 	@echo "GPU CC: $(GPU_CC)"