more minor fixes

NVIDIA · Oct 9, 2024 · 5097bcf · 5097bcf
1 parent d65f80d
commit 5097bcf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/numba_cuda/numba/cuda/tests/cudadrv/test_nvjitlink.py b/numba_cuda/numba/cuda/tests/cudadrv/test_nvjitlink.py
@@ -10,27 +10,28 @@
 from numba import config
 
 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"
-)
+if 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(

diff --git a/numba_cuda/numba/cuda/tests/test_binary_generation/Makefile b/numba_cuda/numba/cuda/tests/test_binary_generation/Makefile
@@ -49,6 +49,4 @@ all:
 	nvcc $(NVCC_FLAGS) $(LTOIR_FLAGS) -o $(OUTPUT_DIR)/test_device_functions.ltoir.o test_device_functions.cu
 	# Generate LTO-IR in a "raw" LTO-IR container
 	python generate_raw_ltoir.py --arch sm_$(GPU_CC) -o $(OUTPUT_DIR)/test_device_functions.ltoir test_device_functions.cu
-	# We also want to test linking a .cu file; this needs no compilation,
-	# so copy it instead
-	cp test_device_functions.cu $(OUTPUT_DIR)
+