Move dependencies from requirements.txt to an optional packaging extra (#638)

* Move dependencies from requirements.txt to an optional packaging extra

Signed-off-by: Keith Kraus <[email protected]>

* move cuda_core test requirements to pyproject.toml optional dependencies as well

Signed-off-by: Keith Kraus <[email protected]>

* Need to expand wildcard to use the bracket syntax

Co-authored-by: Leo Fang <[email protected]>

* Add cython to test dependencies for now

* add missing distutils dependency, used in cython files directives

* distutils is part of setuptools

---------

Signed-off-by: Keith Kraus <[email protected]>
Co-authored-by: Leo Fang <[email protected]>

Author: kkraus14

.github/workflows/test-wheel-linux.yml

@@ -318,14 +318,13 @@ jobs:
           pushd "${CUDA_BINDINGS_ARTIFACTS_DIR}"
           if [[ "${{ matrix.LOCAL_CTK }}" == 1 ]]; then
             ls $CUDA_PATH
-            pip install *.whl
+            pip install $(ls *.whl)[test]
           else
-            pip install $(ls *.whl)[all]
+            pip install $(ls *.whl)[all,test]
           fi
           popd
 
           pushd ./cuda_bindings
-          pip install -r requirements.txt
           ${SANITIZER_CMD} pytest -rxXs -v tests/
 
           # It is a bit convoluted to run the Cython tests against CTK wheels,
@@ -356,11 +355,10 @@ jobs:
           fi
           TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${{ matrix.CUDA_VER }})"
           pushd "${CUDA_CORE_ARTIFACTS_DIR}"
-          pip install $(ls *.whl)["cu${TEST_CUDA_MAJOR}"]
+          pip install $(ls *.whl)["cu${TEST_CUDA_MAJOR}","test-cu${TEST_CUDA_MAJOR}"]
           popd
 
           pushd ./cuda_core
-          pip install -r "tests/requirements-cu${TEST_CUDA_MAJOR}.txt"
           ${SANITIZER_CMD} pytest -rxXs -v tests/
 
           # It is a bit convoluted to run the Cython tests against CTK wheels,

.github/workflows/test-wheel-windows.yml

@@ -246,14 +246,13 @@ jobs:
           if ('${{ matrix.LOCAL_CTK }}' -eq '1') {
             Get-ChildItem $env:CUDA_PATH
             echo $PATH
-            pip install (Get-ChildItem -Filter *.whl).FullName
+            pip install "$((Get-ChildItem -Filter *.whl).FullName)[test]"
           } else {
-            pip install "$((Get-ChildItem -Filter *.whl).FullName)[all]"
+            pip install "$((Get-ChildItem -Filter *.whl).FullName)[all,test]"
           }
           Pop-Location
 
           Push-Location ./cuda_bindings
-          pip install -r requirements.txt
           pytest -rxXs -v tests/
           # skip Cython tests for now (NVIDIA/cuda-python#466)
           Pop-Location
@@ -273,11 +272,10 @@ jobs:
           }
           $TEST_CUDA_MAJOR = '${{ matrix.CUDA_VER }}' -split '\.' | Select-Object -First 1
           Push-Location $env:CUDA_CORE_ARTIFACTS_DIR
-          pip install "$((Get-ChildItem -Filter *.whl).FullName)[cu${TEST_CUDA_MAJOR}]"
+          pip install "$((Get-ChildItem -Filter *.whl).FullName)[cu${TEST_CUDA_MAJOR},test-cu${TEST_CUDA_MAJOR}]"
           Pop-Location
 
           Push-Location ./cuda_core
-          pip install -r "tests/requirements-cu${TEST_CUDA_MAJOR}.txt"
           pytest -rxXs -v tests/
           Pop-Location
 

cuda_bindings/README.md

@@ -12,7 +12,7 @@ This subpackage adheres to the developing practices described in the parent meta
 
 ## Testing
 
-Latest dependencies can be found in [requirements.txt](https://github.com/NVIDIA/cuda-python/blob/main/cuda_bindings/requirements.txt).
+Testing dependencies can be installed using the `[test]` optional dependency identifier. For example, `pip install -v -e .[test]`.
 
 Multiple testing options are available:
 

cuda_bindings/pyproject.toml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 [build-system]
-requires = ["setuptools>=77.0.0", "cython", "pyclibrary"]
+requires = ["setuptools>=77.0.0", "cython>=3.0", "pyclibrary>=0.1.7"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -37,6 +37,15 @@ all = [
     "nvidia-nvjitlink-cu12>=12.3",
 ]
 
+test = [
+    "cython>=3.0",
+    "setuptools",
+    "numpy>=1.21.1",
+    "pytest>=6.2.4",
+    "pytest-benchmark>=3.4.1",
+    "llvmlite"
+]
+
 [project.urls]
 Repository = "https://github.com/NVIDIA/cuda-python"
 Documentation = "https://nvidia.github.io/cuda-python/"

cuda_bindings/requirements.txt

@@ -48,6 +48,9 @@ dependencies = [
 [project.optional-dependencies]
 cu11 = ["cuda-bindings==11.8.*"]
 cu12 = ["cuda-bindings==12.*"]
+test = ["cython>=3.0", "setuptools", "pytest>=6.2.4"]
+test-cu11 = ["cuda-core[test]", "cupy-cuda11x", "nvidia-cuda-runtime-cu11"]  # runtime headers needed by CuPy
+test-cu12 = ["cuda-core[test]", "cupy-cuda12x", "nvidia-cuda-runtime-cu12"]  # runtime headers needed by CuPy
 
 [project.urls]
 homepage = "https://nvidia.github.io/cuda-python/"