Merge branch 'main' into ksimpson/fix_device_from_ctx

NVIDIA · Nov 12, 2024 · 8f357c7 · 8f357c7
2 parents 1f4e5cd + a855762
commit 8f357c7
Show file tree

Hide file tree

Showing 50 changed files with 745 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ cuda_bindings/cuda/bindings/_bindings/cydriver.pxd
 cuda_bindings/cuda/bindings/_bindings/cydriver.pyx
 cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd
 cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx
+cuda_bindings/cuda/bindings/_internal/nvjitlink.pyx
 cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pxd
 cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pyx
 cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pxd

diff --git a/cuda_bindings/MANIFEST.in b/cuda_bindings/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-include cuda/ *.pyx *.pxd
 # 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
+exclude cuda/bindings cuda?bindings
diff --git a/cuda_bindings/cuda/ccuda.pyx b/cuda_bindings/cuda/ccuda.pyx
@@ -5,3 +5,8 @@ cdef extern from *:
     #pragma message ( "The cuda.ccuda module is deprecated and will be removed in a future release, " \
                       "please switch to use the cuda.bindings.cydriver module instead." )
     """
+
+
+from cuda.bindings import cydriver
+__pyx_capi__ = cydriver.__pyx_capi__
+del cydriver
diff --git a/cuda_bindings/cuda/ccudart.pyx b/cuda_bindings/cuda/ccudart.pyx
@@ -5,3 +5,8 @@ cdef extern from *:
     #pragma message ( "The cuda.ccudart module is deprecated and will be removed in a future release, " \
                       "please switch to use the cuda.bindings.cyruntime module instead." )
     """
+
+
+from cuda.bindings import cyruntime
+__pyx_capi__ = cyruntime.__pyx_capi__
+del cyruntime
diff --git a/cuda_bindings/cuda/cnvrtc.pyx b/cuda_bindings/cuda/cnvrtc.pyx
@@ -5,3 +5,8 @@ cdef extern from *:
     #pragma message ( "The cuda.cnvrtc module is deprecated and will be removed in a future release, " \
                       "please switch to use the cuda.bindings.cynvrtc module instead." )
     """
+
+
+from cuda.bindings import cynvrtc
+__pyx_capi__ = cynvrtc.__pyx_capi__
+del cynvrtc
diff --git a/cuda_bindings/docs/source/release.md b/cuda_bindings/docs/source/release.md
@@ -5,6 +5,7 @@
 maxdepth: 3
 ---
 
+    12.6.2 <release/12.6.2-notes>
     12.6.1 <release/12.6.1-notes>
     12.6.0 <release/12.6.0-notes>
     12.5.0 <release/12.5.0-notes>
@@ -14,6 +15,7 @@ maxdepth: 3
     12.2.0 <release/12.2.0-notes>
     12.1.0 <release/12.1.0-notes>
     12.0.0 <release/12.0.0-notes>
+    11.8.5 <release/11.8.5-notes>
     11.8.4 <release/11.8.4-notes>
     11.8.3 <release/11.8.3-notes>
     11.8.2 <release/11.8.2-notes>

diff --git a/cuda_bindings/docs/source/release/11.4.0-notes.md b/cuda_bindings/docs/source/release/11.4.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on August 16, 2021
 
-## Hightlights
+## Highlights
 - Initial EA release for CUDA Python
 - Supports all platforms that CUDA is supported
 - Supports all CUDA 11.x releases

diff --git a/cuda_bindings/docs/source/release/11.5.0-notes.md b/cuda_bindings/docs/source/release/11.5.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on October 18, 2021
 
-## Hightlights
+## Highlights
 - PyPi support
 - Conda support
 - GA release for CUDA Python

diff --git a/cuda_bindings/docs/source/release/11.6.0-notes.md b/cuda_bindings/docs/source/release/11.6.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on Januray 12, 2022
 
-## Hightlights
+## Highlights
 - Support CUDA Toolkit 11.6
 - Support Profiler APIs
 - Support Graphic APIs (EGL, GL, VDPAU)

diff --git a/cuda_bindings/docs/source/release/11.6.1-notes.md b/cuda_bindings/docs/source/release/11.6.1-notes.md
@@ -2,7 +2,7 @@
 
 Released on March 18, 2022
 
-## Hightlights
+## Highlights
 - Fix string decomposition for WSL library load
 
 ## Limitations

diff --git a/cuda_bindings/docs/source/release/11.7.0-notes.md b/cuda_bindings/docs/source/release/11.7.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on May 11, 2022
 
-## Hightlights
+## Highlights
 - Support CUDA Toolkit 11.7
 
 ## Limitations

diff --git a/cuda_bindings/docs/source/release/11.7.1-notes.md b/cuda_bindings/docs/source/release/11.7.1-notes.md
@@ -2,7 +2,7 @@
 
 Released on June 29, 2022
 
-## Hightlights
+## Highlights
 - Fix error propagation in CUDA Runtime bindings
 - Resolves [issue #22](https://github.com/NVIDIA/cuda-python/issues/22)
 

diff --git a/cuda_bindings/docs/source/release/11.8.0-notes.md b/cuda_bindings/docs/source/release/11.8.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on October 3, 2022
 
-## Hightlights
+## Highlights
 - Support CUDA Toolkit 11.8
 - Source builds allow for missing types and APIs
 - Resolves source builds for mobile platforms

diff --git a/cuda_bindings/docs/source/release/11.8.1-notes.md b/cuda_bindings/docs/source/release/11.8.1-notes.md
@@ -2,7 +2,7 @@
 
 Released on November 4, 2022
 
-## Hightlights
+## Highlights
 - Resolves [issue #27](https://github.com/NVIDIA/cuda-python/issues/27)
 - Update install instructions to use latest CTK
 

diff --git a/cuda_bindings/docs/source/release/11.8.2-notes.md b/cuda_bindings/docs/source/release/11.8.2-notes.md
@@ -2,7 +2,7 @@
 
 Released on May 18, 2023
 
-## Hightlights
+## Highlights
 - Open libcuda.so.1 instead of libcuda.so
 
 ## Limitations

diff --git a/cuda_bindings/docs/source/release/11.8.3-notes.md b/cuda_bindings/docs/source/release/11.8.3-notes.md
@@ -2,7 +2,7 @@
 
 Released on October 23, 2023
 
-## Hightlights
+## Highlights
 - Compatability with Cython 3
 - New API cudart.getLocalRuntimeVersion()
 - Modernize build config

diff --git a/cuda_bindings/docs/source/release/11.8.4-notes.md b/cuda_bindings/docs/source/release/11.8.4-notes.md
@@ -2,12 +2,34 @@
 
 Released on October 7, 2024
 
-## Hightlights
+## Highlights
 - Resolve [Issue #89](https://github.com/NVIDIA/cuda-python/issues/89): Fix getLocalRuntimeVersion searching for wrong libcudart version
 - Resolve [Issue #90](https://github.com/NVIDIA/cuda-python/issues/90): Use new layout in preperation for cuda-python becoming a metapackage
 
+## CUDA namespace cleanup with a new module layout
+
+[Issue #75](https://github.com/NVIDIA/cuda-python/issues/75) explains in detail what the new module layout is, what problem it fixes and how it impacts the users. However for the sake of completeness, this release notes will highlight key points of this change.
+
+Before this change, `cuda-python` was tightly coupled to CUDA Toolkit releases and all new features would inherit this coupling regardless of their applicability. As we develop new features, this coupling was becoming overly restrictive and motivated a new solution: Convert `cuda-python` into a metapackage where we use `cuda` as a namespace with existing bindings code moved to a `cuda_bindings` subpackage.
+
+This patch release applies the new module layout for the bindings as follows:
+- `cuda.cuda` -> `cuda.bindings.driver`
+- `cuda.ccuda` -> `cuda.bindings.cydriver`
+- `cuda.cudart` -> `cuda.bindings.runtime`
+- `cuda.ccudart` -> `cuda.bindings.cyruntime`
+- `cuda.nvrtc` -> `cuda.bindings.nvrtc`
+- `cuda.cnvrtc` -> `cuda.bindings.cynvrtc`
+
+Deprecation warnings are turned on as a notice to switch to the new module layout.
+
+```{note} This is non-breaking, backwards compatible change. All old module path will continue work as they "forward" user calls towards the new layout.
+```
+
 ## Limitations
 
+### Know issues
+- [Issue #215](https://github.com/NVIDIA/cuda-python/issues/215)
+
 ### CUDA Functions Not Supported in this Release
 
 - Symbol APIs

diff --git a/cuda_bindings/docs/source/release/11.8.5-notes.md b/cuda_bindings/docs/source/release/11.8.5-notes.md
@@ -0,0 +1,31 @@
+# CUDA Python 11.8.5 Release notes
+
+Released on November 5, 2024
+
+## Highlights
+- Resolve [Issue #215](https://github.com/NVIDIA/cuda-python/issues/215): module 'cuda.ccudart' has no attribute '__pyx_capi__'
+
+## Limitations
+
+### CUDA Functions Not Supported in this Release
+
+- Symbol APIs
+    - cudaGraphExecMemcpyNodeSetParamsFromSymbol
+    - cudaGraphExecMemcpyNodeSetParamsToSymbol
+    - cudaGraphAddMemcpyNodeToSymbol
+    - cudaGraphAddMemcpyNodeFromSymbol
+    - cudaGraphMemcpyNodeSetParamsToSymbol
+    - cudaGraphMemcpyNodeSetParamsFromSymbol
+    - cudaMemcpyToSymbol
+    - cudaMemcpyFromSymbol
+    - cudaMemcpyToSymbolAsync
+    - cudaMemcpyFromSymbolAsync
+    - cudaGetSymbolAddress
+    - cudaGetSymbolSize
+    - cudaGetFuncBySymbol
+- Launch Options
+    - cudaLaunchKernel
+    - cudaLaunchCooperativeKernel
+    - cudaLaunchCooperativeKernelMultiDevice
+- cudaSetValidDevices
+- cudaVDPAUSetVDPAUDevice
diff --git a/cuda_bindings/docs/source/release/12.0.0-notes.md b/cuda_bindings/docs/source/release/12.0.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on December 8, 2022
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.0
 - Fix example from [MR28](https://github.com/NVIDIA/cuda-python/pull/28)
 - Apply [MR35](https://github.com/NVIDIA/cuda-python/pull/35)

diff --git a/cuda_bindings/docs/source/release/12.1.0-notes.md b/cuda_bindings/docs/source/release/12.1.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on February 28, 2023
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.1
 - Resolve [Issue #41](https://github.com/NVIDIA/cuda-python/issues/41): Add support for Python 3.11
 - Resolve [Issue #42](https://github.com/NVIDIA/cuda-python/issues/42): Dropping Python 3.7

diff --git a/cuda_bindings/docs/source/release/12.2.0-notes.md b/cuda_bindings/docs/source/release/12.2.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on June 28, 2023
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.2
 - Resolve [Issue #44](https://github.com/NVIDIA/cuda-python/issues/44): nogil must be at the end of the function signature line
 - Resolve [Issue #45](https://github.com/NVIDIA/cuda-python/issues/45): Error with pyparsing when no CUDA is found

diff --git a/cuda_bindings/docs/source/release/12.2.1-notes.md b/cuda_bindings/docs/source/release/12.2.1-notes.md
@@ -2,7 +2,7 @@
 
 Released on January 8, 2024
 
-## Hightlights
+## Highlights
 - Compatibility with Cython 3
 
 ## Limitations

diff --git a/cuda_bindings/docs/source/release/12.3.0-notes.md b/cuda_bindings/docs/source/release/12.3.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on October 19, 2023
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.3
 - Resolve [Issue #16](https://github.com/NVIDIA/cuda-python/issues/16): cuda.cudart.cudaRuntimeGetVersion() hard-codes the runtime version, rather than querying the runtime
     - New API cudart.getLocalRuntimeVersion()

diff --git a/cuda_bindings/docs/source/release/12.4.0-notes.md b/cuda_bindings/docs/source/release/12.4.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on March 5, 2024
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.4
 - Add PyPI/Conda support for Python 12
 

diff --git a/cuda_bindings/docs/source/release/12.5.0-notes.md b/cuda_bindings/docs/source/release/12.5.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on May 21, 2024
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.5
 - Resolve [Issue #58](https://github.com/NVIDIA/cuda-python/issues/58): Interop between CUdeviceptr and Runtime
 

diff --git a/cuda_bindings/docs/source/release/12.6.0-notes.md b/cuda_bindings/docs/source/release/12.6.0-notes.md
@@ -2,7 +2,7 @@
 
 Released on August 1, 2024
 
-## Hightlights
+## Highlights
 - Rebase to CUDA Toolkit 12.6
 - Resolve [Issue #32](https://github.com/NVIDIA/cuda-python/issues/32): Add 'pywin32' as Windows requirement
 - Resolve [Issue #72](https://github.com/NVIDIA/cuda-python/issues/72): Allow both lists and tuples as parameter

diff --git a/cuda_bindings/docs/source/release/12.6.1-notes.md b/cuda_bindings/docs/source/release/12.6.1-notes.md
@@ -2,7 +2,7 @@
 
 Released on October 7, 2024
 
-## Hightlights
+## Highlights
 - Resolve [Issue #90](https://github.com/NVIDIA/cuda-python/issues/90): Use new layout in preparation for cuda-python becoming a metapackage
 - Resolve [Issue #75](https://github.com/NVIDIA/cuda-python/issues/75): CUDA namespace cleanup
 
@@ -27,6 +27,9 @@ Deprecation warnings are turned on as a notice to switch to the new module layou
 
 ## Limitations
 
+### Know issues
+- [Issue #215](https://github.com/NVIDIA/cuda-python/issues/215)
+
 ### CUDA Functions Not Supported in this Release
 
 - Symbol APIs

diff --git a/cuda_bindings/docs/source/release/12.6.2-notes.md b/cuda_bindings/docs/source/release/12.6.2-notes.md
@@ -0,0 +1,33 @@
+# CUDA Python 12.6.2 Release notes
+
+Released on November 5, 2024
+
+## Highlights
+- Resolve [Issue #215](https://github.com/NVIDIA/cuda-python/issues/215): module 'cuda.ccudart' has no attribute '__pyx_capi__'
+
+## Limitations
+
+### CUDA Functions Not Supported in this Release
+
+- Symbol APIs
+    - cudaGraphExecMemcpyNodeSetParamsFromSymbol
+    - cudaGraphExecMemcpyNodeSetParamsToSymbol
+    - cudaGraphAddMemcpyNodeToSymbol
+    - cudaGraphAddMemcpyNodeFromSymbol
+    - cudaGraphMemcpyNodeSetParamsToSymbol
+    - cudaGraphMemcpyNodeSetParamsFromSymbol
+    - cudaMemcpyToSymbol
+    - cudaMemcpyFromSymbol
+    - cudaMemcpyToSymbolAsync
+    - cudaMemcpyFromSymbolAsync
+    - cudaGetSymbolAddress
+    - cudaGetSymbolSize
+    - cudaGetFuncBySymbol
+- Launch Options
+    - cudaLaunchKernel
+    - cudaLaunchCooperativeKernel
+    - cudaLaunchCooperativeKernelMultiDevice
+- cudaSetValidDevices
+- cudaVDPAUSetVDPAUDevice
+- cudaFuncGetName
+- cudaFuncGetParamInfo
diff --git a/cuda_bindings/pyproject.toml b/cuda_bindings/pyproject.toml
@@ -36,18 +36,8 @@ dependencies = [
 Repository = "https://github.com/NVIDIA/cuda-python"
 Documentation = "https://nvidia.github.io/cuda-python/"
 
-# BETA
-# [tool.setuptools]
-# zip-safe = false
-
-# BETA
-# [tool.setuptools.packages.find]
-# where = ["cuda"]
-# include = ["cuda", "cuda.*"]
-
-# BETA
-# [tool.setuptools.package-data]
-# "*" = ["*.pxd", "*.pyx", "*.h", "*.cpp"]
+[tool.setuptools.packages.find]
+include = ["cuda*"]
 
 [tool.versioneer]
 VCS = "git"

diff --git a/cuda_bindings/setup.py b/cuda_bindings/setup.py
@@ -269,8 +269,6 @@ def do_cythonize(extensions):
     ["cuda/bindings/*.pyx"],
     # public (deprecated, to be removed)
     ["cuda/*.pyx"],
-    # tests
-    ["tests/*.pyx"],
     # interal files used by generated bindings
     ['cuda/bindings/_internal/nvjitlink.pyx'],
     ['cuda/bindings/_internal/utils.pyx'],
@@ -304,11 +302,6 @@ def finalize_options(self):
 setup(
     version=versioneer.get_version(),
     ext_modules=do_cythonize(extensions),
-    packages=find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "cuda.cuda.bindings._internal", "tests"]),
-    package_data=dict.fromkeys(
-        find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "cuda.cuda.bindings._internal", "tests"]),
-        ["*.pxd", "*.pyx", "*.py", "*.h", "*.cpp"],
-    ),
     cmdclass=cmdclass,
     zip_safe=False,
 )
diff --git a/cuda_bindings/tests/test_ccuda.pyx → cuda_bindings/tests_cython/test_ccuda.pyx b/cuda_bindings/tests/test_ccuda.pyx → cuda_bindings/tests_cython/test_ccuda.pyx
diff --git a/cuda_bindings/tests/test_ccudart.pyx → cuda_bindings/tests_cython/test_ccudart.pyx b/cuda_bindings/tests/test_ccudart.pyx → cuda_bindings/tests_cython/test_ccudart.pyx
diff --git a/cuda_bindings/tests/test_cython.py → cuda_bindings/tests_cython/test_cython.py b/cuda_bindings/tests/test_cython.py → cuda_bindings/tests_cython/test_cython.py
diff --git a/...gs/tests/test_interoperability_cython.pyx → ...s_cython/test_interoperability_cython.pyx b/...gs/tests/test_interoperability_cython.pyx → ...s_cython/test_interoperability_cython.pyx