Move cuda_bindings to a src/ layout

Author: mdboom

.gitignore

@@ -12,45 +12,45 @@ __pycache__/
 .benchmarks/
 *.cpp
 !*_impl.cpp
-!cuda_bindings/cuda/bindings/_lib/param_packer.cpp
-!cuda_bindings/cuda/bindings/_bindings/loader.cpp
+!cuda_bindings/src/cuda/bindings/_lib/param_packer.cpp
+!cuda_bindings/src/cuda/bindings/_bindings/loader.cpp
 cache_driver
 cache_runtime
 cache_nvrtc
-cuda_bindings/cuda/bindings/_lib/utils.pxi
+cuda_bindings/src/cuda/bindings/_lib/utils.pxi
 
 # CUDA Python specific (auto-generated)
-cuda_bindings/cuda/bindings/_bindings/cydriver.pxd
-cuda_bindings/cuda/bindings/_bindings/cydriver.pyx
-cuda_bindings/cuda/bindings/_bindings/cyruntime.pxd
-cuda_bindings/cuda/bindings/_bindings/cyruntime.pyx
-cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pxd
-cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pyx
-cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd
-cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx
-cuda_bindings/cuda/bindings/_internal/_nvml.pyx
-cuda_bindings/cuda/bindings/_internal/cufile.pyx
-cuda_bindings/cuda/bindings/_internal/nvfatbin.pyx
-cuda_bindings/cuda/bindings/_internal/nvjitlink.pyx
-cuda_bindings/cuda/bindings/_internal/nvml.pyx
-cuda_bindings/cuda/bindings/_internal/nvvm.pyx
-cuda_bindings/cuda/bindings/_lib/utils.pxd
-cuda_bindings/cuda/bindings/_lib/utils.pyx
-cuda_bindings/cuda/bindings/cydriver.pxd
-cuda_bindings/cuda/bindings/cydriver.pyx
-cuda_bindings/cuda/bindings/cyruntime.pxd
-cuda_bindings/cuda/bindings/cyruntime.pyx
-cuda_bindings/cuda/bindings/cyruntime_functions.pxi
-cuda_bindings/cuda/bindings/cyruntime_types.pxi
-cuda_bindings/cuda/bindings/cynvrtc.pxd
-cuda_bindings/cuda/bindings/cynvrtc.pyx
-cuda_bindings/cuda/bindings/driver.pxd
-cuda_bindings/cuda/bindings/driver.pyx
-cuda_bindings/cuda/bindings/runtime.pxd
-cuda_bindings/cuda/bindings/runtime.pyx
-cuda_bindings/cuda/bindings/nvrtc.pxd
-cuda_bindings/cuda/bindings/nvrtc.pyx
-cuda_bindings/cuda/bindings/utils/_get_handle.pyx
+cuda_bindings/src/cuda/bindings/_bindings/cydriver.pxd
+cuda_bindings/src/cuda/bindings/_bindings/cydriver.pyx
+cuda_bindings/src/cuda/bindings/_bindings/cyruntime.pxd
+cuda_bindings/src/cuda/bindings/_bindings/cyruntime.pyx
+cuda_bindings/src/cuda/bindings/_bindings/cyruntime_ptds.pxd
+cuda_bindings/src/cuda/bindings/_bindings/cyruntime_ptds.pyx
+cuda_bindings/src/cuda/bindings/_bindings/cynvrtc.pxd
+cuda_bindings/src/cuda/bindings/_bindings/cynvrtc.pyx
+cuda_bindings/src/cuda/bindings/_internal/_nvml.pyx
+cuda_bindings/src/cuda/bindings/_internal/cufile.pyx
+cuda_bindings/src/cuda/bindings/_internal/nvfatbin.pyx
+cuda_bindings/src/cuda/bindings/_internal/nvjitlink.pyx
+cuda_bindings/src/cuda/bindings/_internal/nvml.pyx
+cuda_bindings/src/cuda/bindings/_internal/nvvm.pyx
+cuda_bindings/src/cuda/bindings/_lib/utils.pxd
+cuda_bindings/src/cuda/bindings/_lib/utils.pyx
+cuda_bindings/src/cuda/bindings/cydriver.pxd
+cuda_bindings/src/cuda/bindings/cydriver.pyx
+cuda_bindings/src/cuda/bindings/cyruntime.pxd
+cuda_bindings/src/cuda/bindings/cyruntime.pyx
+cuda_bindings/src/cuda/bindings/cyruntime_functions.pxi
+cuda_bindings/src/cuda/bindings/cyruntime_types.pxi
+cuda_bindings/src/cuda/bindings/cynvrtc.pxd
+cuda_bindings/src/cuda/bindings/cynvrtc.pyx
+cuda_bindings/src/cuda/bindings/driver.pxd
+cuda_bindings/src/cuda/bindings/driver.pyx
+cuda_bindings/src/cuda/bindings/runtime.pxd
+cuda_bindings/src/cuda/bindings/runtime.pyx
+cuda_bindings/src/cuda/bindings/nvrtc.pxd
+cuda_bindings/src/cuda/bindings/nvrtc.pyx
+cuda_bindings/src/cuda/bindings/utils/_get_handle.pyx
 
 # Version files from setuptools_scm
 _version.py

cuda_bindings/MANIFEST.in

@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-recursive-include cuda/ *.pyx *.pxd *.pxi *.pyx.in *.pxd.in *.pxi.in *.h
+recursive-include src/cuda/ *.pyx *.pxd *.pxi *.pyx.in *.pxd.in *.pxi.in *.h
 # at least with setuptools 75.0.0 this folder was added erroneously
 # to the payload, causing file copying to the build environment failed
-exclude cuda/bindings cuda?bindings
-exclude cuda/bindings/_bindings cuda?bindings?_bindings
+exclude src/cuda/bindings src?cuda?bindings
+exclude src/cuda/bindings/_bindings src?cuda?bindings?_bindings

cuda_bindings/build_hooks.py

@@ -33,40 +33,10 @@
 _extensions = None
 
 
-# Please keep in sync with the copy in cuda_core/build_hooks.py.
-def _import_get_cuda_path_or_home():
-    """Import get_cuda_path_or_home, working around PEP 517 namespace shadowing.
-
-    See https://github.com/NVIDIA/cuda-python/issues/1824 for why this helper is needed.
-    """
-    try:
-        import cuda.pathfinder
-    except ModuleNotFoundError as exc:
-        if exc.name not in ("cuda", "cuda.pathfinder"):
-            raise
-        try:
-            import cuda
-        except ModuleNotFoundError:
-            cuda = None
-
-        for p in sys.path:
-            sp_cuda = os.path.join(p, "cuda")
-            if os.path.isdir(os.path.join(sp_cuda, "pathfinder")):
-                cuda.__path__ = list(cuda.__path__) + [sp_cuda]
-                break
-        else:
-            raise ModuleNotFoundError(
-                "cuda-pathfinder is not installed in the build environment. "
-                "Ensure 'cuda-pathfinder>=1.5' is in build-system.requires."
-            )
-        import cuda.pathfinder
-
-    return cuda.pathfinder.get_cuda_path_or_home
-
-
 @functools.cache
 def _get_cuda_path() -> str:
-    get_cuda_path_or_home = _import_get_cuda_path_or_home()
+    from cuda.pathfinder import get_cuda_path_or_home
+
     cuda_path = get_cuda_path_or_home()
     if not cuda_path:
         raise RuntimeError("Environment variable CUDA_PATH or CUDA_HOME is not set")
@@ -266,7 +236,7 @@ def _generate_output(infile, template_vars):
 
 
 def _rename_architecture_specific_files():
-    path = os.path.join("cuda", "bindings", "_internal")
+    path = os.path.join("src", "cuda", "bindings", "_internal")
     if sys.platform == "linux":
         src_files = glob.glob(os.path.join(path, "*_linux.pyx"))
     elif sys.platform == "win32":
@@ -290,7 +260,10 @@ def _prep_extensions(sources, libraries, include_dirs, library_dirs, extra_compi
     libraries = libraries if libraries else []
     exts = []
     for pyx in files:
-        mod_name = pyx.replace(".pyx", "").replace(os.sep, ".").replace("/", ".")
+        mod_path = pyx.replace(".pyx", "").replace(os.sep, "/")
+        if mod_path.startswith("src/"):
+            mod_path = mod_path[len("src/") :]
+        mod_name = mod_path.replace("/", ".")
         exts.append(
             Extension(
                 mod_name,
@@ -346,12 +319,12 @@ def _build_cuda_bindings(strip=False):
 
     # Generate code from .in templates
     path_list = [
-        os.path.join("cuda"),
-        os.path.join("cuda", "bindings"),
-        os.path.join("cuda", "bindings", "_bindings"),
-        os.path.join("cuda", "bindings", "_internal"),
-        os.path.join("cuda", "bindings", "_lib"),
-        os.path.join("cuda", "bindings", "utils"),
+        os.path.join("src", "cuda"),
+        os.path.join("src", "cuda", "bindings"),
+        os.path.join("src", "cuda", "bindings", "_bindings"),
+        os.path.join("src", "cuda", "bindings", "_internal"),
+        os.path.join("src", "cuda", "bindings", "_lib"),
+        os.path.join("src", "cuda", "bindings", "utils"),
     ]
     input_files = []
     for path in path_list:
@@ -375,6 +348,7 @@ def _build_cuda_bindings(strip=False):
     # Prepare compile/link arguments
     include_dirs = [
         os.path.dirname(sysconfig.get_path("include")),
+        "src",
     ] + include_path_list
     library_dirs = [sysconfig.get_path("platlib"), os.path.join(os.sys.prefix, "lib")]
     cudalib_subdirs = [r"lib\x64"] if sys.platform == "win32" else ["lib64", "lib"]
@@ -415,21 +389,21 @@ def _cleanup_dst_files():
     # Build extension list
     extensions = []
     static_runtime_libraries = ["cudart_static", "rt"] if sys.platform == "linux" else ["cudart_static"]
-    cuda_bindings_files = glob.glob("cuda/bindings/*.pyx")
+    cuda_bindings_files = glob.glob("src/cuda/bindings/*.pyx")
     if sys.platform == "win32":
         cuda_bindings_files = [f for f in cuda_bindings_files if "cufile" not in f]
     sources_list = [
         # private
-        (["cuda/bindings/_bindings/cydriver.pyx", "cuda/bindings/_bindings/loader.cpp"], None),
-        (["cuda/bindings/_bindings/cynvrtc.pyx"], None),
-        (["cuda/bindings/_bindings/cyruntime.pyx"], static_runtime_libraries),
-        (["cuda/bindings/_bindings/cyruntime_ptds.pyx"], static_runtime_libraries),
+        (["src/cuda/bindings/_bindings/cydriver.pyx", "src/cuda/bindings/_bindings/loader.cpp"], None),
+        (["src/cuda/bindings/_bindings/cynvrtc.pyx"], None),
+        (["src/cuda/bindings/_bindings/cyruntime.pyx"], static_runtime_libraries),
+        (["src/cuda/bindings/_bindings/cyruntime_ptds.pyx"], static_runtime_libraries),
         # utils
-        (["cuda/bindings/utils/*.pyx"], None),
+        (["src/cuda/bindings/utils/*.pyx"], None),
         # public
         *(([f], None) for f in cuda_bindings_files),
         # internal files used by generated bindings
-        (["cuda/bindings/_internal/utils.pyx"], None),
+        (["src/cuda/bindings/_internal/utils.pyx"], None),
         *(([f], None) for f in dst_files if f.endswith(".pyx")),
     ]
 
@@ -446,6 +420,7 @@ def _cleanup_dst_files():
     _extensions = cythonize(
         extensions,
         nthreads=nthreads,
+        include_path=["src"],
         build_dir="." if compile_for_coverage else "build/cython",
         compiler_directives=cython_directives,
         **extra_cythonize_kwargs,

cuda_bindings/pyproject.toml

@@ -58,6 +58,7 @@ Repository = "https://github.com/NVIDIA/cuda-python"
 Documentation = "https://nvidia.github.io/cuda-python/"
 
 [tool.setuptools.packages.find]
+where = ["src"]
 include = ["cuda*"]
 
 [tool.setuptools]
@@ -92,7 +93,7 @@ xfail_strict = true
 
 [tool.setuptools_scm]
 root = ".."
-version_file = "cuda/bindings/_version.py"
+version_file = "src/cuda/bindings/_version.py"
 # Preserve a/b pre-release suffixes, but intentionally strip rc suffixes.
 tag_regex = "^(?P<version>v\\d+\\.\\d+\\.\\d+(?:[ab]\\d+)?)"
 git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v*[0-9]*"]

cuda_bindings/setup.py

@@ -59,6 +59,7 @@ def finalize_options(self):
 
 setup(
     ext_modules=build_hooks._extensions,
+    package_dir={"": "src"},
     cmdclass={
         "build_ext": build_ext,
         "build_py": build_py,

cuda_bindings/cuda/bindings/__init__.pxd …_bindings/src/cuda/bindings/__init__.pxdcuda_bindings/cuda/bindings/__init__.pxd renamed to cuda_bindings/src/cuda/bindings/__init__.pxd cuda_bindings/cuda/bindings/__init__.pxd renamed to cuda_bindings/src/cuda/bindings/__init__.pxd

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 from cuda.bindings import utils

cuda_bindings/cuda/bindings/__init__.py …a_bindings/src/cuda/bindings/__init__.pycuda_bindings/cuda/bindings/__init__.py renamed to cuda_bindings/src/cuda/bindings/__init__.py cuda_bindings/cuda/bindings/__init__.py renamed to cuda_bindings/src/cuda/bindings/__init__.py

@@ -2458,4 +2458,3 @@ cdef CUresult _cuGraphicsVDPAURegisterVideoSurface(CUgraphicsResource* pCudaReso
 
 cdef CUresult _cuGraphicsVDPAURegisterOutputSurface(CUgraphicsResource* pCudaResource, VdpOutputSurface vdpSurface, unsigned int flags) except ?CUDA_ERROR_NOT_FOUND nogil
 {{endif}}
-