From 11a9013d26c7f38a5f8a1e2aaf9f9a02a004b393 Mon Sep 17 00:00:00 2001 From: Vladislav Zhurba Date: Fri, 11 Oct 2024 13:00:16 -0700 Subject: [PATCH] Apply remaining touch ups for patch release - Issue #102: Rename root cuda to cuda_bindings - Issue #145: Explain layout change - Issue #108: Resolve how to run editable builds --- .gitignore | 48 +++++++++---------- README.md | 6 +-- cuda/cuda/bindings/examples/__init__.py | 0 cuda/cuda/bindings/examples/setup.cfg | 3 -- cuda/cuda/bindings/tests/__init__.py | 0 {cuda => cuda_bindings}/LICENSE | 0 {cuda => cuda_bindings}/MANIFEST.in | 0 {cuda => cuda_bindings}/README.md | 0 .../benchmarks}/__init__.py | 0 .../benchmarks/kernels.py | 0 .../benchmarks/perf_test_utils.py | 0 {cuda => cuda_bindings/benchmarks}/pytest.ini | 1 - .../benchmarks/test_cupy.py | 0 .../benchmarks/test_launch_latency.py | 0 .../benchmarks/test_numba.py | 0 .../benchmarks/test_pointer_attributes.py | 0 {cuda => cuda_bindings}/cuda/__init__.pxd | 0 {cuda => cuda_bindings}/cuda/__init__.py | 0 .../cuda/bindings/__init__.pxd | 0 .../cuda/bindings/__init__.py | 0 .../cuda/bindings/_bindings}/__init__.py | 0 .../cuda/bindings/_bindings/cydriver.pxd.in | 0 .../cuda/bindings/_bindings/cydriver.pyx.in | 0 .../cuda/bindings/_bindings/cynvrtc.pxd.in | 0 .../cuda/bindings/_bindings/cynvrtc.pyx.in | 0 .../cuda/bindings/_bindings/loader.cpp | 0 .../cuda/bindings/_bindings/loader.h | 0 .../cuda/bindings/_bindings/loader.pxd | 0 .../cuda/bindings/_lib}/__init__.py | 0 .../cuda/bindings/_lib/cyruntime}/__init__.py | 0 .../bindings/_lib/cyruntime/cyruntime.pxd.in | 0 .../bindings/_lib/cyruntime/cyruntime.pyx.in | 0 .../cuda/bindings/_lib/cyruntime/utils.pxd.in | 0 .../cuda/bindings/_lib/cyruntime/utils.pyx.in | 0 .../cuda/bindings/_lib/dlfcn.pxd | 0 .../cuda/bindings/_lib/param_packer.cpp | 0 .../cuda/bindings/_lib/param_packer.h | 0 .../cuda/bindings/_lib/param_packer.pxd | 0 .../cuda/bindings/_lib/utils.pxd.in | 0 .../cuda/bindings/_lib/utils.pyx.in | 0 .../cuda/bindings/_version.py | 0 .../cuda/bindings/cydriver.pxd.in | 0 .../cuda/bindings/cydriver.pyx.in | 0 .../cuda/bindings/cynvrtc.pxd.in | 0 .../cuda/bindings/cynvrtc.pyx.in | 0 .../cuda/bindings/cyruntime.pxd.in | 0 .../cuda/bindings/cyruntime.pyx.in | 0 .../cuda/bindings/driver.pxd.in | 0 .../cuda/bindings/driver.pyx.in | 0 .../cuda/bindings/nvrtc.pxd.in | 0 .../cuda/bindings/nvrtc.pyx.in | 0 .../cuda/bindings/runtime.pxd.in | 0 .../cuda/bindings/runtime.pyx.in | 0 {cuda => cuda_bindings}/cuda/ccuda.pxd | 0 {cuda => cuda_bindings}/cuda/ccuda.pyx | 0 {cuda => cuda_bindings}/cuda/ccudart.pxd | 0 {cuda => cuda_bindings}/cuda/ccudart.pyx | 0 {cuda => cuda_bindings}/cuda/cnvrtc.pxd | 0 {cuda => cuda_bindings}/cuda/cnvrtc.pyx | 0 {cuda => cuda_bindings}/cuda/cuda.pyx | 0 {cuda => cuda_bindings}/cuda/cudart.pyx | 0 {cuda => cuda_bindings}/cuda/nvrtc.pyx | 0 .../0_Introduction/clock_nvrtc_test.py | 4 +- .../simpleCubemapTexture_test.py | 4 +- .../examples/0_Introduction/simpleP2P_test.py | 4 +- .../0_Introduction/simpleZeroCopy_test.py | 6 +-- .../0_Introduction/systemWideAtomics_test.py | 4 +- .../0_Introduction/vectorAddDrv_test.py | 4 +- .../0_Introduction/vectorAddMMAP_test.py | 4 +- .../streamOrderedAllocation_test.py | 7 +-- .../globalToShmemAsyncCopy_test.py | 6 +-- .../3_CUDA_Features/simpleCudaGraphs_test.py | 4 +- .../conjugateGradientMultiBlockCG_test.py | 4 +- .../examples/common/common.py | 2 +- .../examples/common/helper_cuda.py | 2 +- .../examples/common/helper_string.py | 0 .../examples/extra/isoFDModelling_test.py | 4 +- .../examples/extra/jit_program_test.py | 0 .../examples/extra/numba_emm_plugin.py | 0 cuda_bindings/examples/pytest.ini | 4 ++ {cuda => cuda_bindings}/pyproject.toml | 0 {cuda => cuda_bindings}/requirements.txt | 0 {cuda => cuda_bindings}/setup.py | 10 ++-- .../tests/test_ccuda.pyx | 0 .../tests/test_ccudart.pyx | 0 .../tests/test_cuda.py | 0 .../tests/test_cudart.py | 0 .../tests/test_cython.py | 6 +-- .../tests/test_interoperability.py | 0 .../tests/test_interoperability_cython.pyx | 0 .../tests/test_kernelParams.py | 0 .../tests/test_nvrtc.py | 0 docs/_sources/release/12.6.1-notes.md.txt | 22 ++++++++- docs/release.html | 1 + docs/release/12.6.1-notes.html | 23 ++++++++- docs/searchindex.js | 2 +- docs_src/source/release/12.6.1-notes.md | 22 ++++++++- 97 files changed, 137 insertions(+), 70 deletions(-) delete mode 100644 cuda/cuda/bindings/examples/__init__.py delete mode 100644 cuda/cuda/bindings/examples/setup.cfg delete mode 100644 cuda/cuda/bindings/tests/__init__.py rename {cuda => cuda_bindings}/LICENSE (100%) rename {cuda => cuda_bindings}/MANIFEST.in (100%) rename {cuda => cuda_bindings}/README.md (100%) rename {cuda/cuda/bindings/_bindings => cuda_bindings/benchmarks}/__init__.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/kernels.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/perf_test_utils.py (100%) rename {cuda => cuda_bindings/benchmarks}/pytest.ini (84%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/test_cupy.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/test_launch_latency.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/test_numba.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/benchmarks/test_pointer_attributes.py (100%) rename {cuda => cuda_bindings}/cuda/__init__.pxd (100%) rename {cuda => cuda_bindings}/cuda/__init__.py (100%) rename {cuda => cuda_bindings}/cuda/bindings/__init__.pxd (100%) rename {cuda => cuda_bindings}/cuda/bindings/__init__.py (100%) rename {cuda/cuda/bindings/_lib => cuda_bindings/cuda/bindings/_bindings}/__init__.py (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/cydriver.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/cydriver.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/cynvrtc.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/cynvrtc.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/loader.cpp (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/loader.h (100%) rename {cuda => cuda_bindings}/cuda/bindings/_bindings/loader.pxd (100%) rename {cuda/cuda/bindings/_lib/cyruntime => cuda_bindings/cuda/bindings/_lib}/__init__.py (100%) rename {cuda/cuda/bindings/benchmarks => cuda_bindings/cuda/bindings/_lib/cyruntime}/__init__.py (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/cyruntime/cyruntime.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/cyruntime/cyruntime.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/cyruntime/utils.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/cyruntime/utils.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/dlfcn.pxd (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/param_packer.cpp (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/param_packer.h (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/param_packer.pxd (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/utils.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_lib/utils.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/_version.py (100%) rename {cuda => cuda_bindings}/cuda/bindings/cydriver.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/cydriver.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/cynvrtc.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/cynvrtc.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/cyruntime.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/cyruntime.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/driver.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/driver.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/nvrtc.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/nvrtc.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/runtime.pxd.in (100%) rename {cuda => cuda_bindings}/cuda/bindings/runtime.pyx.in (100%) rename {cuda => cuda_bindings}/cuda/ccuda.pxd (100%) rename {cuda => cuda_bindings}/cuda/ccuda.pyx (100%) rename {cuda => cuda_bindings}/cuda/ccudart.pxd (100%) rename {cuda => cuda_bindings}/cuda/ccudart.pyx (100%) rename {cuda => cuda_bindings}/cuda/cnvrtc.pxd (100%) rename {cuda => cuda_bindings}/cuda/cnvrtc.pyx (100%) rename {cuda => cuda_bindings}/cuda/cuda.pyx (100%) rename {cuda => cuda_bindings}/cuda/cudart.pyx (100%) rename {cuda => cuda_bindings}/cuda/nvrtc.pyx (100%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/clock_nvrtc_test.py (95%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/simpleCubemapTexture_test.py (98%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/simpleP2P_test.py (98%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/simpleZeroCopy_test.py (96%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/systemWideAtomics_test.py (97%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/vectorAddDrv_test.py (96%) rename {cuda/cuda/bindings => cuda_bindings}/examples/0_Introduction/vectorAddMMAP_test.py (98%) rename {cuda/cuda/bindings => cuda_bindings}/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py (97%) rename {cuda/cuda/bindings => cuda_bindings}/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py (99%) rename {cuda/cuda/bindings => cuda_bindings}/examples/3_CUDA_Features/simpleCudaGraphs_test.py (99%) rename {cuda/cuda/bindings => cuda_bindings}/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py (98%) rename {cuda/cuda/bindings => cuda_bindings}/examples/common/common.py (97%) rename {cuda/cuda/bindings => cuda_bindings}/examples/common/helper_cuda.py (94%) rename {cuda/cuda/bindings => cuda_bindings}/examples/common/helper_string.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/examples/extra/isoFDModelling_test.py (99%) rename {cuda/cuda/bindings => cuda_bindings}/examples/extra/jit_program_test.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/examples/extra/numba_emm_plugin.py (100%) create mode 100644 cuda_bindings/examples/pytest.ini rename {cuda => cuda_bindings}/pyproject.toml (100%) rename {cuda => cuda_bindings}/requirements.txt (100%) rename {cuda => cuda_bindings}/setup.py (96%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_ccuda.pyx (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_ccudart.pyx (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_cuda.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_cudart.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_cython.py (85%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_interoperability.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_interoperability_cython.pyx (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_kernelParams.py (100%) rename {cuda/cuda/bindings => cuda_bindings}/tests/test_nvrtc.py (100%) diff --git a/.gitignore b/.gitignore index c45648a52..0f7ad5be4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,32 +11,32 @@ __pycache__/ .pytest_cache/ .benchmarks/ *.cpp -!cuda/cuda/bindings/_lib/param_packer.cpp -!cuda/cuda/bindings/_bindings/loader.cpp +!cuda_bindings/cuda/bindings/_lib/param_packer.cpp +!cuda_bindings/cuda/bindings/_bindings/loader.cpp # CUDA Python specific (auto-generated) -cuda/cuda/bindings/_bindings/cydriver.pxd -cuda/cuda/bindings/_bindings/cydriver.pyx -cuda/cuda/bindings/_bindings/cynvrtc.pxd -cuda/cuda/bindings/_bindings/cynvrtc.pyx -cuda/cuda/bindings/_lib/cyruntime/cyruntime.pxd -cuda/cuda/bindings/_lib/cyruntime/cyruntime.pyx -cuda/cuda/bindings/_lib/cyruntime/utils.pxd -cuda/cuda/bindings/_lib/cyruntime/utils.pyx -cuda/cuda/bindings/_lib/utils.pxd -cuda/cuda/bindings/_lib/utils.pyx -cuda/cuda/bindings/cydriver.pxd -cuda/cuda/bindings/cydriver.pyx -cuda/cuda/bindings/cyruntime.pxd -cuda/cuda/bindings/cyruntime.pyx -cuda/cuda/bindings/cynvrtc.pxd -cuda/cuda/bindings/cynvrtc.pyx -cuda/cuda/bindings/driver.pxd -cuda/cuda/bindings/driver.pyx -cuda/cuda/bindings/runtime.pxd -cuda/cuda/bindings/runtime.pyx -cuda/cuda/bindings/nvrtc.pxd -cuda/cuda/bindings/nvrtc.pyx +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/_lib/cyruntime/cyruntime.pxd +cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pyx +cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pxd +cuda_bindings/cuda/bindings/_lib/cyruntime/utils.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/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 # Distribution / packaging .Python diff --git a/README.md b/README.md index 1cbafb562..0072e062c 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Latest dependencies can be found in [requirements.txt](https://github.com/NVIDIA You can run the included tests with: ``` -python -m pytest +python -m pytest tests/ ``` ### Benchmark @@ -50,7 +50,7 @@ python -m pytest You can run benchmark only tests with: ``` -python -m pytest --benchmark-only +python -m pytest --benchmark-only benchmarks/ ``` ### Samples @@ -58,7 +58,7 @@ python -m pytest --benchmark-only You can run the included tests with: ``` -python -m pytest examples +python -m pytest examples/ ``` ## Examples diff --git a/cuda/cuda/bindings/examples/__init__.py b/cuda/cuda/bindings/examples/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/cuda/cuda/bindings/examples/setup.cfg b/cuda/cuda/bindings/examples/setup.cfg deleted file mode 100644 index ac22d83c1..000000000 --- a/cuda/cuda/bindings/examples/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tool:pytest] -python_files=*_test.py -python_functions=main diff --git a/cuda/cuda/bindings/tests/__init__.py b/cuda/cuda/bindings/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/cuda/LICENSE b/cuda_bindings/LICENSE similarity index 100% rename from cuda/LICENSE rename to cuda_bindings/LICENSE diff --git a/cuda/MANIFEST.in b/cuda_bindings/MANIFEST.in similarity index 100% rename from cuda/MANIFEST.in rename to cuda_bindings/MANIFEST.in diff --git a/cuda/README.md b/cuda_bindings/README.md similarity index 100% rename from cuda/README.md rename to cuda_bindings/README.md diff --git a/cuda/cuda/bindings/_bindings/__init__.py b/cuda_bindings/benchmarks/__init__.py similarity index 100% rename from cuda/cuda/bindings/_bindings/__init__.py rename to cuda_bindings/benchmarks/__init__.py diff --git a/cuda/cuda/bindings/benchmarks/kernels.py b/cuda_bindings/benchmarks/kernels.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/kernels.py rename to cuda_bindings/benchmarks/kernels.py diff --git a/cuda/cuda/bindings/benchmarks/perf_test_utils.py b/cuda_bindings/benchmarks/perf_test_utils.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/perf_test_utils.py rename to cuda_bindings/benchmarks/perf_test_utils.py diff --git a/cuda/pytest.ini b/cuda_bindings/benchmarks/pytest.ini similarity index 84% rename from cuda/pytest.ini rename to cuda_bindings/benchmarks/pytest.ini index a8dcb34cf..a74acd3e2 100644 --- a/cuda/pytest.ini +++ b/cuda_bindings/benchmarks/pytest.ini @@ -1,4 +1,3 @@ -# pytest.ini [pytest] required_plugins = pytest-benchmark addopts = --benchmark-skip diff --git a/cuda/cuda/bindings/benchmarks/test_cupy.py b/cuda_bindings/benchmarks/test_cupy.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/test_cupy.py rename to cuda_bindings/benchmarks/test_cupy.py diff --git a/cuda/cuda/bindings/benchmarks/test_launch_latency.py b/cuda_bindings/benchmarks/test_launch_latency.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/test_launch_latency.py rename to cuda_bindings/benchmarks/test_launch_latency.py diff --git a/cuda/cuda/bindings/benchmarks/test_numba.py b/cuda_bindings/benchmarks/test_numba.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/test_numba.py rename to cuda_bindings/benchmarks/test_numba.py diff --git a/cuda/cuda/bindings/benchmarks/test_pointer_attributes.py b/cuda_bindings/benchmarks/test_pointer_attributes.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/test_pointer_attributes.py rename to cuda_bindings/benchmarks/test_pointer_attributes.py diff --git a/cuda/cuda/__init__.pxd b/cuda_bindings/cuda/__init__.pxd similarity index 100% rename from cuda/cuda/__init__.pxd rename to cuda_bindings/cuda/__init__.pxd diff --git a/cuda/cuda/__init__.py b/cuda_bindings/cuda/__init__.py similarity index 100% rename from cuda/cuda/__init__.py rename to cuda_bindings/cuda/__init__.py diff --git a/cuda/cuda/bindings/__init__.pxd b/cuda_bindings/cuda/bindings/__init__.pxd similarity index 100% rename from cuda/cuda/bindings/__init__.pxd rename to cuda_bindings/cuda/bindings/__init__.pxd diff --git a/cuda/cuda/bindings/__init__.py b/cuda_bindings/cuda/bindings/__init__.py similarity index 100% rename from cuda/cuda/bindings/__init__.py rename to cuda_bindings/cuda/bindings/__init__.py diff --git a/cuda/cuda/bindings/_lib/__init__.py b/cuda_bindings/cuda/bindings/_bindings/__init__.py similarity index 100% rename from cuda/cuda/bindings/_lib/__init__.py rename to cuda_bindings/cuda/bindings/_bindings/__init__.py diff --git a/cuda/cuda/bindings/_bindings/cydriver.pxd.in b/cuda_bindings/cuda/bindings/_bindings/cydriver.pxd.in similarity index 100% rename from cuda/cuda/bindings/_bindings/cydriver.pxd.in rename to cuda_bindings/cuda/bindings/_bindings/cydriver.pxd.in diff --git a/cuda/cuda/bindings/_bindings/cydriver.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cydriver.pyx.in similarity index 100% rename from cuda/cuda/bindings/_bindings/cydriver.pyx.in rename to cuda_bindings/cuda/bindings/_bindings/cydriver.pyx.in diff --git a/cuda/cuda/bindings/_bindings/cynvrtc.pxd.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd.in similarity index 100% rename from cuda/cuda/bindings/_bindings/cynvrtc.pxd.in rename to cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd.in diff --git a/cuda/cuda/bindings/_bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in similarity index 100% rename from cuda/cuda/bindings/_bindings/cynvrtc.pyx.in rename to cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in diff --git a/cuda/cuda/bindings/_bindings/loader.cpp b/cuda_bindings/cuda/bindings/_bindings/loader.cpp similarity index 100% rename from cuda/cuda/bindings/_bindings/loader.cpp rename to cuda_bindings/cuda/bindings/_bindings/loader.cpp diff --git a/cuda/cuda/bindings/_bindings/loader.h b/cuda_bindings/cuda/bindings/_bindings/loader.h similarity index 100% rename from cuda/cuda/bindings/_bindings/loader.h rename to cuda_bindings/cuda/bindings/_bindings/loader.h diff --git a/cuda/cuda/bindings/_bindings/loader.pxd b/cuda_bindings/cuda/bindings/_bindings/loader.pxd similarity index 100% rename from cuda/cuda/bindings/_bindings/loader.pxd rename to cuda_bindings/cuda/bindings/_bindings/loader.pxd diff --git a/cuda/cuda/bindings/_lib/cyruntime/__init__.py b/cuda_bindings/cuda/bindings/_lib/__init__.py similarity index 100% rename from cuda/cuda/bindings/_lib/cyruntime/__init__.py rename to cuda_bindings/cuda/bindings/_lib/__init__.py diff --git a/cuda/cuda/bindings/benchmarks/__init__.py b/cuda_bindings/cuda/bindings/_lib/cyruntime/__init__.py similarity index 100% rename from cuda/cuda/bindings/benchmarks/__init__.py rename to cuda_bindings/cuda/bindings/_lib/cyruntime/__init__.py diff --git a/cuda/cuda/bindings/_lib/cyruntime/cyruntime.pxd.in b/cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pxd.in similarity index 100% rename from cuda/cuda/bindings/_lib/cyruntime/cyruntime.pxd.in rename to cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pxd.in diff --git a/cuda/cuda/bindings/_lib/cyruntime/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pyx.in similarity index 100% rename from cuda/cuda/bindings/_lib/cyruntime/cyruntime.pyx.in rename to cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pyx.in diff --git a/cuda/cuda/bindings/_lib/cyruntime/utils.pxd.in b/cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pxd.in similarity index 100% rename from cuda/cuda/bindings/_lib/cyruntime/utils.pxd.in rename to cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pxd.in diff --git a/cuda/cuda/bindings/_lib/cyruntime/utils.pyx.in b/cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pyx.in similarity index 100% rename from cuda/cuda/bindings/_lib/cyruntime/utils.pyx.in rename to cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pyx.in diff --git a/cuda/cuda/bindings/_lib/dlfcn.pxd b/cuda_bindings/cuda/bindings/_lib/dlfcn.pxd similarity index 100% rename from cuda/cuda/bindings/_lib/dlfcn.pxd rename to cuda_bindings/cuda/bindings/_lib/dlfcn.pxd diff --git a/cuda/cuda/bindings/_lib/param_packer.cpp b/cuda_bindings/cuda/bindings/_lib/param_packer.cpp similarity index 100% rename from cuda/cuda/bindings/_lib/param_packer.cpp rename to cuda_bindings/cuda/bindings/_lib/param_packer.cpp diff --git a/cuda/cuda/bindings/_lib/param_packer.h b/cuda_bindings/cuda/bindings/_lib/param_packer.h similarity index 100% rename from cuda/cuda/bindings/_lib/param_packer.h rename to cuda_bindings/cuda/bindings/_lib/param_packer.h diff --git a/cuda/cuda/bindings/_lib/param_packer.pxd b/cuda_bindings/cuda/bindings/_lib/param_packer.pxd similarity index 100% rename from cuda/cuda/bindings/_lib/param_packer.pxd rename to cuda_bindings/cuda/bindings/_lib/param_packer.pxd diff --git a/cuda/cuda/bindings/_lib/utils.pxd.in b/cuda_bindings/cuda/bindings/_lib/utils.pxd.in similarity index 100% rename from cuda/cuda/bindings/_lib/utils.pxd.in rename to cuda_bindings/cuda/bindings/_lib/utils.pxd.in diff --git a/cuda/cuda/bindings/_lib/utils.pyx.in b/cuda_bindings/cuda/bindings/_lib/utils.pyx.in similarity index 100% rename from cuda/cuda/bindings/_lib/utils.pyx.in rename to cuda_bindings/cuda/bindings/_lib/utils.pyx.in diff --git a/cuda/cuda/bindings/_version.py b/cuda_bindings/cuda/bindings/_version.py similarity index 100% rename from cuda/cuda/bindings/_version.py rename to cuda_bindings/cuda/bindings/_version.py diff --git a/cuda/cuda/bindings/cydriver.pxd.in b/cuda_bindings/cuda/bindings/cydriver.pxd.in similarity index 100% rename from cuda/cuda/bindings/cydriver.pxd.in rename to cuda_bindings/cuda/bindings/cydriver.pxd.in diff --git a/cuda/cuda/bindings/cydriver.pyx.in b/cuda_bindings/cuda/bindings/cydriver.pyx.in similarity index 100% rename from cuda/cuda/bindings/cydriver.pyx.in rename to cuda_bindings/cuda/bindings/cydriver.pyx.in diff --git a/cuda/cuda/bindings/cynvrtc.pxd.in b/cuda_bindings/cuda/bindings/cynvrtc.pxd.in similarity index 100% rename from cuda/cuda/bindings/cynvrtc.pxd.in rename to cuda_bindings/cuda/bindings/cynvrtc.pxd.in diff --git a/cuda/cuda/bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/cynvrtc.pyx.in similarity index 100% rename from cuda/cuda/bindings/cynvrtc.pyx.in rename to cuda_bindings/cuda/bindings/cynvrtc.pyx.in diff --git a/cuda/cuda/bindings/cyruntime.pxd.in b/cuda_bindings/cuda/bindings/cyruntime.pxd.in similarity index 100% rename from cuda/cuda/bindings/cyruntime.pxd.in rename to cuda_bindings/cuda/bindings/cyruntime.pxd.in diff --git a/cuda/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in similarity index 100% rename from cuda/cuda/bindings/cyruntime.pyx.in rename to cuda_bindings/cuda/bindings/cyruntime.pyx.in diff --git a/cuda/cuda/bindings/driver.pxd.in b/cuda_bindings/cuda/bindings/driver.pxd.in similarity index 100% rename from cuda/cuda/bindings/driver.pxd.in rename to cuda_bindings/cuda/bindings/driver.pxd.in diff --git a/cuda/cuda/bindings/driver.pyx.in b/cuda_bindings/cuda/bindings/driver.pyx.in similarity index 100% rename from cuda/cuda/bindings/driver.pyx.in rename to cuda_bindings/cuda/bindings/driver.pyx.in diff --git a/cuda/cuda/bindings/nvrtc.pxd.in b/cuda_bindings/cuda/bindings/nvrtc.pxd.in similarity index 100% rename from cuda/cuda/bindings/nvrtc.pxd.in rename to cuda_bindings/cuda/bindings/nvrtc.pxd.in diff --git a/cuda/cuda/bindings/nvrtc.pyx.in b/cuda_bindings/cuda/bindings/nvrtc.pyx.in similarity index 100% rename from cuda/cuda/bindings/nvrtc.pyx.in rename to cuda_bindings/cuda/bindings/nvrtc.pyx.in diff --git a/cuda/cuda/bindings/runtime.pxd.in b/cuda_bindings/cuda/bindings/runtime.pxd.in similarity index 100% rename from cuda/cuda/bindings/runtime.pxd.in rename to cuda_bindings/cuda/bindings/runtime.pxd.in diff --git a/cuda/cuda/bindings/runtime.pyx.in b/cuda_bindings/cuda/bindings/runtime.pyx.in similarity index 100% rename from cuda/cuda/bindings/runtime.pyx.in rename to cuda_bindings/cuda/bindings/runtime.pyx.in diff --git a/cuda/cuda/ccuda.pxd b/cuda_bindings/cuda/ccuda.pxd similarity index 100% rename from cuda/cuda/ccuda.pxd rename to cuda_bindings/cuda/ccuda.pxd diff --git a/cuda/cuda/ccuda.pyx b/cuda_bindings/cuda/ccuda.pyx similarity index 100% rename from cuda/cuda/ccuda.pyx rename to cuda_bindings/cuda/ccuda.pyx diff --git a/cuda/cuda/ccudart.pxd b/cuda_bindings/cuda/ccudart.pxd similarity index 100% rename from cuda/cuda/ccudart.pxd rename to cuda_bindings/cuda/ccudart.pxd diff --git a/cuda/cuda/ccudart.pyx b/cuda_bindings/cuda/ccudart.pyx similarity index 100% rename from cuda/cuda/ccudart.pyx rename to cuda_bindings/cuda/ccudart.pyx diff --git a/cuda/cuda/cnvrtc.pxd b/cuda_bindings/cuda/cnvrtc.pxd similarity index 100% rename from cuda/cuda/cnvrtc.pxd rename to cuda_bindings/cuda/cnvrtc.pxd diff --git a/cuda/cuda/cnvrtc.pyx b/cuda_bindings/cuda/cnvrtc.pyx similarity index 100% rename from cuda/cuda/cnvrtc.pyx rename to cuda_bindings/cuda/cnvrtc.pyx diff --git a/cuda/cuda/cuda.pyx b/cuda_bindings/cuda/cuda.pyx similarity index 100% rename from cuda/cuda/cuda.pyx rename to cuda_bindings/cuda/cuda.pyx diff --git a/cuda/cuda/cudart.pyx b/cuda_bindings/cuda/cudart.pyx similarity index 100% rename from cuda/cuda/cudart.pyx rename to cuda_bindings/cuda/cudart.pyx diff --git a/cuda/cuda/nvrtc.pyx b/cuda_bindings/cuda/nvrtc.pyx similarity index 100% rename from cuda/cuda/nvrtc.pyx rename to cuda_bindings/cuda/nvrtc.pyx diff --git a/cuda/cuda/bindings/examples/0_Introduction/clock_nvrtc_test.py b/cuda_bindings/examples/0_Introduction/clock_nvrtc_test.py similarity index 95% rename from cuda/cuda/bindings/examples/0_Introduction/clock_nvrtc_test.py rename to cuda_bindings/examples/0_Introduction/clock_nvrtc_test.py index 663cadef2..49a7a1e0a 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/clock_nvrtc_test.py +++ b/cuda_bindings/examples/0_Introduction/clock_nvrtc_test.py @@ -7,8 +7,8 @@ # is strictly prohibited. import numpy as np from cuda import cuda -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice clock_nvrtc = '''\ extern "C" __global__ void timedReduction(const float *hinput, float *output, clock_t *timer) diff --git a/cuda/cuda/bindings/examples/0_Introduction/simpleCubemapTexture_test.py b/cuda_bindings/examples/0_Introduction/simpleCubemapTexture_test.py similarity index 98% rename from cuda/cuda/bindings/examples/0_Introduction/simpleCubemapTexture_test.py rename to cuda_bindings/examples/0_Introduction/simpleCubemapTexture_test.py index dd8f48d2c..adb5a5606 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/simpleCubemapTexture_test.py +++ b/cuda_bindings/examples/0_Introduction/simpleCubemapTexture_test.py @@ -11,8 +11,8 @@ import sys import time from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice simpleCubemapTexture = '''\ extern "C" diff --git a/cuda/cuda/bindings/examples/0_Introduction/simpleP2P_test.py b/cuda_bindings/examples/0_Introduction/simpleP2P_test.py similarity index 98% rename from cuda/cuda/bindings/examples/0_Introduction/simpleP2P_test.py rename to cuda_bindings/examples/0_Introduction/simpleP2P_test.py index 2165851c3..d4d17de1f 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/simpleP2P_test.py +++ b/cuda_bindings/examples/0_Introduction/simpleP2P_test.py @@ -9,8 +9,8 @@ import numpy as np import sys from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors +from common import common +from common.helper_cuda import checkCudaErrors simplep2p = '''\ extern "C" diff --git a/cuda/cuda/bindings/examples/0_Introduction/simpleZeroCopy_test.py b/cuda_bindings/examples/0_Introduction/simpleZeroCopy_test.py similarity index 96% rename from cuda/cuda/bindings/examples/0_Introduction/simpleZeroCopy_test.py rename to cuda_bindings/examples/0_Introduction/simpleZeroCopy_test.py index 8b85173bf..834eb32af 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/simpleZeroCopy_test.py +++ b/cuda_bindings/examples/0_Introduction/simpleZeroCopy_test.py @@ -11,9 +11,9 @@ import random as rnd import sys from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors -from cuda.bindings.examples.common.helper_string import checkCmdLineFlag +from common import common +from common.helper_cuda import checkCudaErrors +from common.helper_string import checkCmdLineFlag simpleZeroCopy = '''\ extern "C" diff --git a/cuda/cuda/bindings/examples/0_Introduction/systemWideAtomics_test.py b/cuda_bindings/examples/0_Introduction/systemWideAtomics_test.py similarity index 97% rename from cuda/cuda/bindings/examples/0_Introduction/systemWideAtomics_test.py rename to cuda_bindings/examples/0_Introduction/systemWideAtomics_test.py index f0fbaf604..f34f31958 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/systemWideAtomics_test.py +++ b/cuda_bindings/examples/0_Introduction/systemWideAtomics_test.py @@ -10,8 +10,8 @@ import sys import os from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice systemWideAtomics = '''\ #define LOOP_NUM 50 diff --git a/cuda/cuda/bindings/examples/0_Introduction/vectorAddDrv_test.py b/cuda_bindings/examples/0_Introduction/vectorAddDrv_test.py similarity index 96% rename from cuda/cuda/bindings/examples/0_Introduction/vectorAddDrv_test.py rename to cuda_bindings/examples/0_Introduction/vectorAddDrv_test.py index 4b8545763..329340406 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/vectorAddDrv_test.py +++ b/cuda_bindings/examples/0_Introduction/vectorAddDrv_test.py @@ -9,8 +9,8 @@ import math import numpy as np from cuda import cuda -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDeviceDRV +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDeviceDRV vectorAddDrv = '''\ /* Vector addition: C = A + B. diff --git a/cuda/cuda/bindings/examples/0_Introduction/vectorAddMMAP_test.py b/cuda_bindings/examples/0_Introduction/vectorAddMMAP_test.py similarity index 98% rename from cuda/cuda/bindings/examples/0_Introduction/vectorAddMMAP_test.py rename to cuda_bindings/examples/0_Introduction/vectorAddMMAP_test.py index c9357da78..8af4a8339 100644 --- a/cuda/cuda/bindings/examples/0_Introduction/vectorAddMMAP_test.py +++ b/cuda_bindings/examples/0_Introduction/vectorAddMMAP_test.py @@ -10,8 +10,8 @@ import numpy as np import sys from cuda import cuda -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDeviceDRV +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDeviceDRV vectorAddMMAP = '''\ /* Vector addition: C = A + B. diff --git a/cuda/cuda/bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py b/cuda_bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py similarity index 97% rename from cuda/cuda/bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py rename to cuda_bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py index d1b1a6760..84af8717f 100644 --- a/cuda/cuda/bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py +++ b/cuda_bindings/examples/2_Concepts_and_Techniques/streamOrderedAllocation_test.py @@ -11,9 +11,9 @@ import random as rnd import sys from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice -from cuda.bindings.examples.common.helper_string import checkCmdLineFlag +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice +from common.helper_string import checkCmdLineFlag streamOrderedAllocation = '''\ /* Add two vectors on the GPU */ @@ -166,6 +166,7 @@ def streamOrderedAllocationPostSync(dev, nelem, a, b, c) : return errorNorm/refNorm < 1.e-6 def main(): + cuda.cuInit(0) if checkCmdLineFlag("help"): print("Usage: streamOrderedAllocation [OPTION]\n"); print("Options:"); diff --git a/cuda/cuda/bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py b/cuda_bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py similarity index 99% rename from cuda/cuda/bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py rename to cuda_bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py index 8121a1433..bb6b5cb04 100644 --- a/cuda/cuda/bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py +++ b/cuda_bindings/examples/3_CUDA_Features/globalToShmemAsyncCopy_test.py @@ -12,9 +12,9 @@ import pytest from cuda import cuda, cudart from enum import Enum -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice -from cuda.bindings.examples.common.helper_string import checkCmdLineFlag, getCmdLineArgumentInt +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice +from common.helper_string import checkCmdLineFlag, getCmdLineArgumentInt blockSize = 16 class kernels(Enum): diff --git a/cuda/cuda/bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py b/cuda_bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py similarity index 99% rename from cuda/cuda/bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py rename to cuda_bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py index 86c1c4c8f..7a895acb8 100644 --- a/cuda/cuda/bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py +++ b/cuda_bindings/examples/3_CUDA_Features/simpleCudaGraphs_test.py @@ -10,8 +10,8 @@ import pytest import random as rnd from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice THREADS_PER_BLOCK = 512 GRAPH_LAUNCH_ITERATIONS = 3 diff --git a/cuda/cuda/bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py b/cuda_bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py similarity index 98% rename from cuda/cuda/bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py rename to cuda_bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py index 604d7d0dd..6f64066f8 100644 --- a/cuda/cuda/bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py +++ b/cuda_bindings/examples/4_CUDA_Libraries/conjugateGradientMultiBlockCG_test.py @@ -10,8 +10,8 @@ import numpy as np import sys from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors, findCudaDevice +from common import common +from common.helper_cuda import checkCudaErrors, findCudaDevice from random import random conjugateGradientMultiBlockCG = '''\ diff --git a/cuda/cuda/bindings/examples/common/common.py b/cuda_bindings/examples/common/common.py similarity index 97% rename from cuda/cuda/bindings/examples/common/common.py rename to cuda_bindings/examples/common/common.py index 638160542..c24322f94 100644 --- a/cuda/cuda/bindings/examples/common/common.py +++ b/cuda_bindings/examples/common/common.py @@ -9,7 +9,7 @@ import numpy as np import os from cuda import cuda, cudart, nvrtc -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors +from common.helper_cuda import checkCudaErrors class KernelHelper: def __init__(self, code, devID): diff --git a/cuda/cuda/bindings/examples/common/helper_cuda.py b/cuda_bindings/examples/common/helper_cuda.py similarity index 94% rename from cuda/cuda/bindings/examples/common/helper_cuda.py rename to cuda_bindings/examples/common/helper_cuda.py index b38e7a939..cbd0d2da4 100644 --- a/cuda/cuda/bindings/examples/common/helper_cuda.py +++ b/cuda_bindings/examples/common/helper_cuda.py @@ -6,7 +6,7 @@ # this software and related documentation outside the terms of the EULA # is strictly prohibited. from cuda import cuda, cudart, nvrtc -from cuda.bindings.examples.common.helper_string import getCmdLineArgumentInt, checkCmdLineFlag +from common.helper_string import getCmdLineArgumentInt, checkCmdLineFlag def _cudaGetErrorEnum(error): if isinstance(error, cuda.CUresult): diff --git a/cuda/cuda/bindings/examples/common/helper_string.py b/cuda_bindings/examples/common/helper_string.py similarity index 100% rename from cuda/cuda/bindings/examples/common/helper_string.py rename to cuda_bindings/examples/common/helper_string.py diff --git a/cuda/cuda/bindings/examples/extra/isoFDModelling_test.py b/cuda_bindings/examples/extra/isoFDModelling_test.py similarity index 99% rename from cuda/cuda/bindings/examples/extra/isoFDModelling_test.py rename to cuda_bindings/examples/extra/isoFDModelling_test.py index 73d822c3b..dd4781824 100644 --- a/cuda/cuda/bindings/examples/extra/isoFDModelling_test.py +++ b/cuda_bindings/examples/extra/isoFDModelling_test.py @@ -8,8 +8,8 @@ import numpy as np import time from cuda import cuda, cudart -from cuda.bindings.examples.common import common -from cuda.bindings.examples.common.helper_cuda import checkCudaErrors +from common import common +from common.helper_cuda import checkCudaErrors isoPropagator = '''\ extern "C" diff --git a/cuda/cuda/bindings/examples/extra/jit_program_test.py b/cuda_bindings/examples/extra/jit_program_test.py similarity index 100% rename from cuda/cuda/bindings/examples/extra/jit_program_test.py rename to cuda_bindings/examples/extra/jit_program_test.py diff --git a/cuda/cuda/bindings/examples/extra/numba_emm_plugin.py b/cuda_bindings/examples/extra/numba_emm_plugin.py similarity index 100% rename from cuda/cuda/bindings/examples/extra/numba_emm_plugin.py rename to cuda_bindings/examples/extra/numba_emm_plugin.py diff --git a/cuda_bindings/examples/pytest.ini b/cuda_bindings/examples/pytest.ini new file mode 100644 index 000000000..e105585d5 --- /dev/null +++ b/cuda_bindings/examples/pytest.ini @@ -0,0 +1,4 @@ +[pytest] +python_files = *_test.py +python_functions = main +pythonpath = . diff --git a/cuda/pyproject.toml b/cuda_bindings/pyproject.toml similarity index 100% rename from cuda/pyproject.toml rename to cuda_bindings/pyproject.toml diff --git a/cuda/requirements.txt b/cuda_bindings/requirements.txt similarity index 100% rename from cuda/requirements.txt rename to cuda_bindings/requirements.txt diff --git a/cuda/setup.py b/cuda_bindings/setup.py similarity index 96% rename from cuda/setup.py rename to cuda_bindings/setup.py index ec5236261..fb9d7b953 100644 --- a/cuda/setup.py +++ b/cuda_bindings/setup.py @@ -95,6 +95,10 @@ cache='./cache_{}'.format(library.split('.')[0]) if PARSER_CACHING else None, replace=replace) + if library == 'driver': + CUDA_VERSION = parser.defs['macros']['CUDA_VERSION'] if 'CUDA_VERSION' in parser.defs['macros'] else 'Unknown' + print(f'Found CUDA_VERSION: {CUDA_VERSION}') + # Combine types with others since they sometimes get tangled found_types += {key for key in parser.defs['types']} found_types += {key for key in parser.defs['structs']} @@ -225,7 +229,7 @@ def do_cythonize(extensions): # public (deprecated, to be removed) ["cuda/*.pyx"], # tests - ["cuda/bindings/tests/*.pyx"], + ["tests/*.pyx"], ] for sources in sources_list: @@ -256,9 +260,9 @@ 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.tests"]), + packages=find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "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.tests"]), + find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "tests"]), ["*.pxd", "*.pyx", "*.py", "*.h", "*.cpp"], ), cmdclass=cmdclass, diff --git a/cuda/cuda/bindings/tests/test_ccuda.pyx b/cuda_bindings/tests/test_ccuda.pyx similarity index 100% rename from cuda/cuda/bindings/tests/test_ccuda.pyx rename to cuda_bindings/tests/test_ccuda.pyx diff --git a/cuda/cuda/bindings/tests/test_ccudart.pyx b/cuda_bindings/tests/test_ccudart.pyx similarity index 100% rename from cuda/cuda/bindings/tests/test_ccudart.pyx rename to cuda_bindings/tests/test_ccudart.pyx diff --git a/cuda/cuda/bindings/tests/test_cuda.py b/cuda_bindings/tests/test_cuda.py similarity index 100% rename from cuda/cuda/bindings/tests/test_cuda.py rename to cuda_bindings/tests/test_cuda.py diff --git a/cuda/cuda/bindings/tests/test_cudart.py b/cuda_bindings/tests/test_cudart.py similarity index 100% rename from cuda/cuda/bindings/tests/test_cudart.py rename to cuda_bindings/tests/test_cudart.py diff --git a/cuda/cuda/bindings/tests/test_cython.py b/cuda_bindings/tests/test_cython.py similarity index 85% rename from cuda/cuda/bindings/tests/test_cython.py rename to cuda_bindings/tests/test_cython.py index e5577ede3..439d7aa07 100644 --- a/cuda/cuda/bindings/tests/test_cython.py +++ b/cuda_bindings/tests/test_cython.py @@ -22,9 +22,9 @@ def wrapped(*args, **kwargs): return wrapped -cython_test_modules = ["cuda.bindings.tests.test_ccuda", - "cuda.bindings.tests.test_ccudart", - "cuda.bindings.tests.test_interoperability_cython"] +cython_test_modules = ["test_ccuda", + "test_ccudart", + "test_interoperability_cython"] for mod in cython_test_modules: diff --git a/cuda/cuda/bindings/tests/test_interoperability.py b/cuda_bindings/tests/test_interoperability.py similarity index 100% rename from cuda/cuda/bindings/tests/test_interoperability.py rename to cuda_bindings/tests/test_interoperability.py diff --git a/cuda/cuda/bindings/tests/test_interoperability_cython.pyx b/cuda_bindings/tests/test_interoperability_cython.pyx similarity index 100% rename from cuda/cuda/bindings/tests/test_interoperability_cython.pyx rename to cuda_bindings/tests/test_interoperability_cython.pyx diff --git a/cuda/cuda/bindings/tests/test_kernelParams.py b/cuda_bindings/tests/test_kernelParams.py similarity index 100% rename from cuda/cuda/bindings/tests/test_kernelParams.py rename to cuda_bindings/tests/test_kernelParams.py diff --git a/cuda/cuda/bindings/tests/test_nvrtc.py b/cuda_bindings/tests/test_nvrtc.py similarity index 100% rename from cuda/cuda/bindings/tests/test_nvrtc.py rename to cuda_bindings/tests/test_nvrtc.py diff --git a/docs/_sources/release/12.6.1-notes.md.txt b/docs/_sources/release/12.6.1-notes.md.txt index d5fe82ac6..bf1962136 100644 --- a/docs/_sources/release/12.6.1-notes.md.txt +++ b/docs/_sources/release/12.6.1-notes.md.txt @@ -3,7 +3,27 @@ Released on October 7, 2024 ## Hightlights -- Resolve [Issue #90](https://github.com/NVIDIA/cuda-python/issues/90): Use new layout in preperation for cuda-python becoming a metapackage +- 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 + +## 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 diff --git a/docs/release.html b/docs/release.html index 28cee66fe..4b4b97ef0 100644 --- a/docs/release.html +++ b/docs/release.html @@ -236,6 +236,7 @@

Release Notes 12.6.1