diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 3021414e9..74dc0c1ba 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -70,7 +70,7 @@ jobs: echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}" tests: - name: ${{ matrix.CUDA_VER }}, ${{ matrix.PY_VER }}, ${{ matrix.ARCH }}, ${{ matrix.LINUX_VER }}, ${{ matrix.GPU }}, ${{ matrix.DRIVER }}-driver, numba@${{ matrix.NUMBA_VERSION }} + name: ${{ matrix.CUDA_VER }}, ${{ matrix.PY_VER }}, ${{ matrix.ARCH }}, ${{ matrix.LINUX_VER }}, ${{ matrix.GPU }}, ${{ matrix.DRIVER }}-driver, numba@${{ matrix.NUMBA_VERSION }}, cuda-core@${{ matrix.CUDA_CORE_VERSION }} needs: compute-matrix strategy: fail-fast: false @@ -110,6 +110,8 @@ jobs: env: GH_TOKEN: ${{ github.token }} CUDA_VER: ${{ matrix.CUDA_VER }} + NUMBA_VERSION: ${{ matrix.NUMBA_VERSION }} + CUDA_CORE_VERSION: ${{ matrix.CUDA_CORE_VERSION }} - name: Run codecov if: inputs.run_codecov env: diff --git a/.github/workflows/wheels-test.yaml b/.github/workflows/wheels-test.yaml index 23adcf83d..00b46f09f 100644 --- a/.github/workflows/wheels-test.yaml +++ b/.github/workflows/wheels-test.yaml @@ -84,11 +84,12 @@ jobs: echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}" test: - name: ${{ matrix.CUDA_VER }}, ${{ matrix.PY_VER }}, ${{ matrix.ARCH }}, ${{ matrix.LINUX_VER }}, ${{ matrix.GPU }}, ${{ matrix.DRIVER }}-driver, numba@${{ matrix.NUMBA_VERSION }} + name: ${{ matrix.CUDA_VER }}, ${{ matrix.PY_VER }}, ${{ matrix.ARCH }}, ${{ matrix.LINUX_VER }}, ${{ matrix.GPU }}, ${{ matrix.DRIVER }}-driver, numba@${{ matrix.NUMBA_VERSION }}, cuda-core@${{ matrix.CUDA_CORE_VERSION }} needs: compute-matrix env: RAPIDS_ARTIFACTS_DIR: ${{ github.workspace }}/artifacts NUMBA_VERSION: ${{ matrix.NUMBA_VERSION }} + CUDA_CORE_VERSION: ${{ matrix.CUDA_CORE_VERSION }} RAPIDS_TESTS_DIR: ${{ github.workspace }}/test-results strategy: fail-fast: false @@ -137,6 +138,8 @@ jobs: run: ${{ inputs.script }} env: CUDA_VER: ${{ matrix.CUDA_VER }} + NUMBA_VERSION: ${{ matrix.NUMBA_VERSION }} + CUDA_CORE_VERSION: ${{ matrix.CUDA_CORE_VERSION }} GH_TOKEN: ${{ github.token }} - name: Generate test report uses: test-summary/action@v2.4 diff --git a/ci/matrix.yml b/ci/matrix.yml index c482e3263..d5dffaefe 100644 --- a/ci/matrix.yml +++ b/ci/matrix.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause # Please keep the matrices sorted in ascending order by the following: # -# [ARCH, PY_VER, CUDA_VER, LINUX_VER, GPU, DRIVER, NUMBA_VERSION] +# [ARCH, PY_VER, CUDA_VER, LINUX_VER, GPU, DRIVER, NUMBA_VERSION, CUDA_CORE_VERSION] # build-matrix: - { ARCH: 'amd64', PY_VER: '3.10', CUDA_VER: '12.8.0', LINUX_VER: 'rockylinux8' } @@ -20,17 +20,17 @@ simulator-matrix: # We test "oldest" dependencies with the oldest supported Python version and # the second-newest Python version. test-matrix: - - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '0.60' } - - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '*' } - - { CUDA_VER: '12.2.2', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '12.9.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '0.60' } - - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '0.60' } - - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '*' } - - { CUDA_VER: '12.2.2', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '12.9.1', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '0.60' } - - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' } - - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' } + - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '0.60', CUDA_CORE_VERSION: '0.5.1' } + - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '12.2.2', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '12.9.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '0.60', CUDA_CORE_VERSION: '0.5.1' } + - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '0.60', CUDA_CORE_VERSION: '0.5.1' } + - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '12.2.2', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '12.9.1', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '0.60', CUDA_CORE_VERSION: '0.5.1' } + - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } + - { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*', CUDA_CORE_VERSION: '*' } diff --git a/ci/test_conda.sh b/ci/test_conda.sh index 40dae27ec..1d97d3fd0 100755 --- a/ci/test_conda.sh +++ b/ci/test_conda.sh @@ -10,6 +10,10 @@ if [ "${NUMBA_VERSION:-*}" != "*" ]; then pixi add --feature "${PY_VER_PART}" "numba=${NUMBA_VERSION}" fi +if [ "${CUDA_CORE_VERSION:-*}" != "*" ]; then + pixi add --feature "${PY_VER_PART}" "cuda-core=${CUDA_CORE_VERSION}" +fi + nvidia-smi EXITCODE=0