Update testing for TEST_DEVICE

Author: ggeorgakoudis

.github/workflows/build-upload-wheels.yml

@@ -104,10 +104,10 @@ jobs:
           python -c "import numba; assert numba.__version__ == '${{ matrix.numba-version }}'"
 
           # Run host OpenMP tests.
-          TEST_DEVICES=0 RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp
+          RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp
 
           # Run device (cpu target) OpenMP tests.
-          OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 \
+          OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=host RUN_TARGET=1 \
             python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget
 
   # Only on pre-release: Publish to TestPyPI for testing.

buildscripts/conda-recipes/pyomp/run_test.sh

@@ -47,20 +47,19 @@ fi
 # library is inited/de-inited.
 
 echo "=> Run OpenMP CPU parallelism tests"
-echo "=> Running: TEST_DEVICES=0 RUN_TARGET=0 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp"
-# TODO: remove requiring the unused TEST_DEVICES.
-TEST_DEVICES=0 RUN_TARGET=0 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp 2>&1
+echo "=> Running: RUN_TARGET=0 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp"
+RUN_TARGET=0 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp 2>&1
 
 echo "=> Run OpenMP offloading tests on CPU (device 1)"
-echo "=> Running: TEST_DEVICES=1 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
-OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
+echo "=> Running: TEST_DEVICE=host RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
+OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=host RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
 # Check if NVIDIA GPU is present.
 if command -v nvidia-smi >/dev/null 2>&1; then
   # `nvidia-smi --list-gpus` exits non-zero when no GPUs are present; run
   # it in a conditional so `set -e` does not cause the script to exit.
   if nvidia-smi --list-gpus >/dev/null 2>&1; then
     echo "=> Found NVIDIA GPU, Run OpenMP offloading tests on GPU (device 0)"
-    echo "=> Running: TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
-    OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=0 RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
+    echo "=> Running: TEST_DEVICE=gpu RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget"
+    OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=gpu RUN_TARGET=1 $SEGVCATCH python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget 2>&1
   fi
 fi

buildscripts/gitlab/build-and-test.sh

@@ -41,8 +41,8 @@ git checkout ${CI_COMMIT_SHA}
 CC=clang CXX=clang++ python -m pip install -v .
 
 # Run host OpenMP tests.
-TEST_DEVICES=0 RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp
+RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp
 # Run device (cpu target) OpenMP tests.
-OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget
+OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=host RUN_TARGET=1 python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget
 
 popd

pyproject.toml

@@ -46,9 +46,9 @@ before-build = ["rm -rf build dist src/*.egg-info"]
 skip = ["*-musllinux_*", "cp38-*", "cp314t-*"]
 test-command = [
     # Run host OpenMP tests.
-    "TEST_DEVICES=0 RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp",
+    "RUN_TARGET=0 python -m numba.runtests -v -- numba.openmp.tests.test_openmp",
     # Run device (cpu target) OpenMP tests.
-    "OMP_TARGET_OFFLOAD=mandatory TEST_DEVICES=1 RUN_TARGET=1 python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget",
+    "OMP_TARGET_OFFLOAD=mandatory TEST_DEVICE=host RUN_TARGET=1 python -m numba.runtests -v -- numba.openmp.tests.test_openmp.TestOpenmpTarget",
 ]
 
 [tool.cibuildwheel.environment]

src/numba/openmp/tests/test_openmp.py

@@ -3146,19 +3146,20 @@ class TestOpenmpTarget(TestOpenmpBase):
     and uses OpenMP offloading info to find the device id for the target.
     """
 
-    devices = []
-    assert TestOpenmpBase.test_device, (
-        "Expected env var TEST_DEVICE to specify the test target device (e.g. 'host' or 'gpu')"
-    )
+    if TestOpenmpBase.run_target:
+        devices = []
+        assert TestOpenmpBase.test_device, (
+            "Expected env var TEST_DEVICE to specify the test target device (e.g. 'host' or 'gpu')"
+        )
 
-    devices = find_device_ids(type=TestOpenmpBase.test_device)
-    assert devices, (
-        f"Expected non-empty test devices list, no device with type {TestOpenmpBase.test_device} found"
-    )
+        devices = find_device_ids(type=TestOpenmpBase.test_device)
+        assert devices, (
+            f"Expected non-empty test devices list, no device with type {TestOpenmpBase.test_device} found"
+        )
 
-    # Use only the first device.
-    devices = [int(devices[0])]
-    print(f"Testing OpenMP target offloading on device: {devices}")
+        # Use only the first device.
+        devices = [int(devices[0])]
+        print(f"Testing OpenMP target offloading on device: {devices}")
 
     def __init__(self, *args):
         TestOpenmpBase.__init__(self, *args)