lazy import fix

Author: rparolin

cuda_bindings/tests/helpers.py

@@ -22,13 +22,14 @@
     import cuda_python_test_helpers
 except ImportError:
     # Import shared platform helpers for tests across repos
-    sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[2] / "cuda_python_test_helpers"))
-    import cuda_python_test_helpers
-
-# If we imported the package instead of the module, get the actual module
-if hasattr(cuda_python_test_helpers, "__path__"):
-    # We imported the package, need to get the actual module
-    import cuda_python_test_helpers.cuda_python_test_helpers as cuda_python_test_helpers
+    test_helpers_path = str(pathlib.Path(__file__).resolve().parents[2] / "cuda_python_test_helpers")
+    try:
+        sys.path.insert(0, test_helpers_path)
+        import cuda_python_test_helpers
+    finally:
+        # Clean up sys.path modification
+        if test_helpers_path in sys.path:
+            sys.path.remove(test_helpers_path)
 
 
 IS_WSL = cuda_python_test_helpers.IS_WSL

cuda_core/tests/helpers.py

@@ -22,8 +22,14 @@
     import cuda_python_test_helpers
 except ImportError:
     # Import shared platform helpers for tests across repos
-    sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[2] / "cuda_python_test_helpers"))
-    import cuda_python_test_helpers
+    test_helpers_path = str(pathlib.Path(__file__).resolve().parents[2] / "cuda_python_test_helpers")
+    try:
+        sys.path.insert(0, test_helpers_path)
+        import cuda_python_test_helpers
+    finally:
+        # Clean up sys.path modification
+        if test_helpers_path in sys.path:
+            sys.path.remove(test_helpers_path)
 
 
 IS_WSL = cuda_python_test_helpers.IS_WSL

cuda_python_test_helpers/cuda_python_test_helpers/__init__.py

@@ -6,8 +6,6 @@
 from contextlib import suppress
 from typing import Union
 
-from cuda.core.experimental._utils.cuda_utils import handle_return
-
 
 def _detect_wsl() -> bool:
     data = ""
@@ -39,6 +37,9 @@ def supports_ipc_mempool(device_id: Union[int, object]) -> bool:
         except Exception:
             from cuda import cuda as driver  # type: ignore
 
+        # Lazy import handle_return to avoid hard dependency on cuda.core
+        from cuda.core.experimental._utils.cuda_utils import handle_return
+
         # Initialize CUDA
         handle_return(driver.cuInit(0))