Skip to content

Commit 126c386

Browse files
committed
Rename ENABLE_PYNVJITLINK for consistency
- As a config variable, it is called `CUDA_ENABLE_PYNVJITLINK` - As an environment variable, it is `NUMBA_CUDA_ENABLE_PYNVJITLINK`
1 parent 197c80b commit 126c386

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

ci/test_conda_pynvjitlink.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ popd
6969

7070

7171
rapids-logger "Run Tests"
72-
ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
72+
NUMBA_CUDA_ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
7373

7474
popd
7575

ci/test_wheel_pynvjitlink.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ rapids-logger "Show Numba system info"
4242
python -m numba --sysinfo
4343

4444
rapids-logger "Run Tests"
45-
ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
45+
NUMBA_CUDA_ENABLE_PYNVJITLINK=1 NUMBA_CUDA_TEST_BIN_DIR=$NUMBA_CUDA_TEST_BIN_DIR python -m numba.runtests numba.cuda.tests -v
4646

4747
popd

numba_cuda/numba/cuda/cudadrv/driver.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ def _readenv(name, ctor, default):
8383
)
8484

8585
ENABLE_PYNVJITLINK = (
86-
_readenv("ENABLE_PYNVJITLINK", bool, False)
87-
or getattr(config, "ENABLE_PYNVJITLINK", False)
86+
_readenv("NUMBA_CUDA_ENABLE_PYNVJITLINK", bool, False)
87+
or getattr(config, "CUDA_ENABLE_PYNVJITLINK", False)
8888
)
89-
if not hasattr(config, "ENABLE_PYNVJITLINK"):
90-
config.ENABLE_PYNVJITLINK = ENABLE_PYNVJITLINK
89+
if not hasattr(config, "CUDA_ENABLE_PYNVJITLINK"):
90+
config.CUDA_ENABLE_PYNVJITLINK = ENABLE_PYNVJITLINK
9191

9292
if ENABLE_PYNVJITLINK:
9393
try:
@@ -100,7 +100,7 @@ def _readenv(name, ctor, default):
100100
if config.CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY:
101101
raise ValueError(
102102
"Can't set CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY and "
103-
"ENABLE_PYNVJITLINK at the same time"
103+
"CUDA_ENABLE_PYNVJITLINK at the same time"
104104
)
105105

106106

@@ -2612,13 +2612,13 @@ def new(cls,
26122612
and driver_ver >= (12, 0)
26132613
):
26142614
raise ValueError(
2615-
"Use ENABLE_PYNVJITLINK for CUDA >= 12.0 MVC"
2615+
"Use CUDA_ENABLE_PYNVJITLINK for CUDA >= 12.0 MVC"
26162616
)
2617-
if config.ENABLE_PYNVJITLINK and driver_ver < (12, 0):
2617+
if config.CUDA_ENABLE_PYNVJITLINK and driver_ver < (12, 0):
26182618
raise ValueError(
26192619
"Enabling pynvjitlink requires CUDA 12."
26202620
)
2621-
if config.ENABLE_PYNVJITLINK:
2621+
if config.CUDA_ENABLE_PYNVJITLINK:
26222622
linker = PyNvJitLinker
26232623

26242624
elif config.CUDA_ENABLE_MINOR_VERSION_COMPATIBILITY:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636

3737
@unittest.skipIf(
38-
not config.ENABLE_PYNVJITLINK or not TEST_BIN_DIR,
38+
not config.CUDA_ENABLE_PYNVJITLINK or not TEST_BIN_DIR,
3939
"pynvjitlink not enabled"
4040
)
4141
@skip_on_cudasim("Linking unsupported in the simulator")

0 commit comments

Comments
 (0)