Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support CUDA 12.2 #672

Merged
merged 23 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d74e254
use CUDA 12.2 for building and testing wheels and conda packages
jameslamb Jan 11, 2024
9ba0dea
update dependencies.yaml
jameslamb Jan 11, 2024
44ea0f4
remove 1.20 env file
jameslamb Jan 11, 2024
b311a8b
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 22, 2024
b03f694
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 22, 2024
ffb0c47
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 22, 2024
a856724
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 23, 2024
7176701
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cucim into test…
jameslamb Jan 23, 2024
ccdcae9
Merge branch 'branch-24.04' into test-cuda-12.2
jakirkham Jan 24, 2024
d4cab19
try adding cuda_version to py_build
jameslamb Jan 24, 2024
03e2253
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cucim into test…
jameslamb Jan 24, 2024
651adce
Pin `cuda-version` during `*cucim` install
jakirkham Jan 25, 2024
38856c4
Merge rapidsai/branch-24.04 into jameslamb/test-cuda-12.2
jakirkham Jan 29, 2024
2bed0b3
Drop `cuda-version` install workaround
jakirkham Jan 29, 2024
a378184
Remove leftover CUDA 11.8 workaround attempt
jakirkham Jan 29, 2024
e075700
Run ci/release/update-version.sh 24.04.00.
bdice Jan 29, 2024
3081630
Merge rapidsai/branch-24.04 into jameslamb/test-cuda-12.2
jakirkham Jan 30, 2024
e703868
Merge branch 'branch-24.04' into test-cuda-12.2
jakirkham Jan 30, 2024
b318986
Ignore run-exports from CUDA 12 compiler.
bdice Feb 6, 2024
eca560e
Loosen run-exports from -dev libraries.
bdice Feb 6, 2024
6e837c9
Merge branch 'branch-24.04' into test-cuda-12.2
bdice Feb 6, 2024
b56a9ac
Add cuda-cudart-dev with run-exports ignored.
bdice Feb 8, 2024
cd71cc9
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cucim into test…
bdice Feb 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -38,7 +38,7 @@ jobs:
if: github.ref_type == 'branch'
needs: [python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand All @@ -51,7 +51,7 @@ jobs:
python-build:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-cuda-12.2
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -60,15 +60,15 @@ jobs:
upload-conda:
needs: [cpp-build, python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -78,7 +78,7 @@ jobs:
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@test-cuda-12.2
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,32 @@ jobs:
- wheel-build
- wheel-tests
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@test-cuda-12.2
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@test-cuda-12.2
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2
with:
build_type: pull-request
conda-python-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-cuda-12.2
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2
with:
build_type: pull-request
docs-build:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2
with:
build_type: pull-request
node_type: "gpu-v100-latest-1"
Expand All @@ -55,14 +55,14 @@ jobs:
wheel-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2
with:
build_type: pull-request
script: ci/build_wheel.sh
wheel-tests:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2
with:
build_type: pull-request
script: ci/test_wheel.sh
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ on:
jobs:
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- cmake>=3.23.1,!=3.25.0
- cuda-cudart-dev
- cuda-nvcc
- cuda-version=12.0
- cuda-version=12.2
- cupy>=12.0.0
- cxx-compiler
- gcc_linux-64=11.*
Expand Down Expand Up @@ -53,4 +53,4 @@ dependencies:
- zstd
- pip:
- opencv-python-headless>=4.6
name: all_cuda-120_arch-x86_64
name: all_cuda-122_arch-x86_64
9 changes: 9 additions & 0 deletions conda/recipes/cucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- cuda-cudart-dev
{% endif %}
script_env:
- AWS_ACCESS_KEY_ID
Expand Down Expand Up @@ -55,6 +58,9 @@ requirements:
host:
- click
- cuda-version ={{ cuda_version }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
{% endif %}
- cupy >=12.0.0
- libcucim ={{ version }}
- numpy 1.21
Expand All @@ -63,6 +69,9 @@ requirements:
- scipy
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major != "11" %}
- cuda-cudart
{% endif %}
- {{ pin_compatible('numpy') }}
- click
- cupy >=12.0.0
Expand Down
12 changes: 11 additions & 1 deletion conda/recipes/libcucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- cuda-cudart-dev
- libcufile-dev # [linux64]
- libnvjpeg-dev
{% endif %}
script_env:
- AWS_ACCESS_KEY_ID
Expand Down Expand Up @@ -64,6 +69,7 @@ requirements:
- libnvjpeg {{ cuda11_libnvjpeg_host_version }}
- libnvjpeg-dev {{ cuda11_libnvjpeg_host_version }}
{% else %}
- cuda-cudart-dev
- libcufile-dev # [linux64]
- libnvjpeg-dev
- libnvjpeg-static
Expand All @@ -79,7 +85,11 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
- libcufile {{ cuda11_libcufile_run_version }} # [linux64]
- libcufile {{ cuda11_libcufile_run_version }} # [linux64]
{% else %}
- cuda-cudart
- libcufile # [linux64]
- libnvjpeg
{% endif %}
- {{ pin_compatible('libwebp-base', max_pin='x.x') }}
- jbig
Expand Down
11 changes: 6 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: conda
matrix:
cuda: ["11.8", "12.0"]
cuda: ["11.8", "12.2"]
arch: [x86_64]
includes:
- build
Expand Down Expand Up @@ -114,7 +114,6 @@ dependencies:
arch: x86_64
cuda: "11.8"
packages:
- cuda-version=11.8
- nvcc_linux-64=11.8
- libcufile=1.4.0.31
- libcufile-dev=1.4.0.31
Expand All @@ -124,14 +123,12 @@ dependencies:
arch: aarch64
cuda: "11.8"
packages:
- cuda-version=11.8
- nvcc_linux-aarch64=11.8
- libnvjpeg=11.6.0.55
- libnvjpeg-dev=11.6.0.55
- matrix:
cuda: "12.0"
cuda: "12.*"
packages:
- cuda-version=12.0
- cuda-nvcc
- libcufile-dev
- libnvjpeg-dev
Expand Down Expand Up @@ -165,6 +162,10 @@ dependencies:
cuda: "12.0"
packages:
- cuda-version=12.0
- matrix:
cuda: "12.2"
packages:
- cuda-version=12.2
cuda:
specific:
- output_types: conda
Expand Down
Loading