Merge branch 'main' into move-test-files

Author: brandon-b-miller

numba_cuda/numba/cuda/tests/benchmarks/test_kernel_launch.py

@@ -3,11 +3,18 @@
 
 import string
 from numba import cuda
+from numba.cuda.core import config
 import numpy as np
 import pytest
 from pytest import param
 
 
+pytestmark = pytest.mark.skipif(
+    condition=config.ENABLE_CUDASIM,
+    reason="no reason to run benchmarks in the simulator",
+)
+
+
 @pytest.mark.parametrize(
     "array_func",
     [

numba_cuda/numba/cuda/tests/cudapy/test_ipc.py

@@ -225,17 +225,12 @@ def test_staged(self):
 
         # Test on every CUDA devices
         ngpus = len(cuda.gpus)
-        futures = [
-            self.exe.submit(
+
+        for device_num in range(ngpus):
+            future = self.exe.submit(
                 staged_ipc_handle_test, ipch, device_num, parent_pid=os.getpid()
             )
-            for device_num in range(ngpus)
-        ]
-
-        for fut in concurrent.futures.as_completed(
-            futures, timeout=FUTURE_TIMEOUT * ngpus
-        ):
-            np.testing.assert_equal(arr, fut.result())
+            np.testing.assert_equal(arr, future.result(timeout=FUTURE_TIMEOUT))
 
     def test_ipc_array(self):
         for device_num in range(len(cuda.gpus)):