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 #14712

Merged
merged 29 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f77cfd0
use CUDA 12.2 for building and testing wheels
jameslamb Jan 5, 2024
7840481
empty commit to re-trigger CI
jameslamb Jan 5, 2024
13a5375
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
43693e8
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
819c043
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
881fb7e
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 11, 2024
6fe4742
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 11, 2024
9407755
add conda, update dependencies.yaml
jameslamb Jan 11, 2024
d4bd19e
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cudf into test-…
jameslamb Jan 11, 2024
27f5b66
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 12, 2024
e079803
Merge remote-tracking branch 'upstream/branch-24.02' into test-cuda-12.2
bdice Jan 16, 2024
ee88e9e
Merge branch 'branch-24.02' into test-cuda-12.2
bdice Jan 17, 2024
a470d54
Use libcufile-dev on CUDA 12.2+ for aarch64.
bdice Jan 17, 2024
20ab985
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cudf into test-…
bdice Jan 17, 2024
302efe0
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 22, 2024
6775b50
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 23, 2024
bb0e262
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 23, 2024
d3d9cb0
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 24, 2024
a802dcf
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 25, 2024
30b44aa
Ignore run-exports from CUDA 12 compiler.
bdice Feb 6, 2024
9b289e4
Refactor cuda_spec.
bdice Feb 6, 2024
7e4bde7
Loosen run-exports from -dev libraries.
bdice Feb 6, 2024
e044e30
Merge remote-tracking branch 'upstream/branch-24.04' into test-cuda-12.2
bdice Feb 6, 2024
8090e50
Add back cuda-cudart-dev.
bdice Feb 7, 2024
0a0bcd0
Merge branch 'branch-24.04' into test-cuda-12.2
bdice Feb 9, 2024
8ef962b
Merge branch 'branch-24.04' into test-cuda-12.2
jakirkham Feb 9, 2024
0ce5101
Remove libcufile on aarch64.
bdice Feb 9, 2024
3f42dc2
Use 12.2.2 for publishing dask-cudf wheels.
bdice Feb 9, 2024
22edbcf
Use 12.2.2 instead of 12.0.1 for single-CUDA-version jobs in pr.yaml …
bdice Feb 9, 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
16 changes: 8 additions & 8 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 @@ -37,7 +37,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 @@ -46,7 +46,7 @@ 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 }}
Expand All @@ -57,7 +57,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 @@ -69,7 +69,7 @@ jobs:
sha: ${{ inputs.sha }}
wheel-build-cudf:
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' }}
build-2_28-wheels: "true"
Expand All @@ -80,7 +80,7 @@ jobs:
wheel-publish-cudf:
needs: wheel-build-cudf
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 All @@ -90,7 +90,7 @@ jobs:
wheel-build-dask-cudf:
needs: wheel-publish-cudf
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:
matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
bdice marked this conversation as resolved.
Show resolved Hide resolved
build_type: ${{ inputs.build_type || 'branch' }}
Expand All @@ -101,7 +101,7 @@ jobs:
wheel-publish-dask-cudf:
needs: wheel-build-dask-cudf
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
36 changes: 18 additions & 18 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ jobs:
#- pandas-tests-diff
#- pandas-tests-diff-comment
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
with:
enable_check_generated_files: false
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-cpp-checks:
Expand All @@ -54,34 +54,34 @@ jobs:
conda-cpp-tests:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.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-cudf-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
test_script: "ci/test_python_cudf.sh"
conda-python-other-tests:
# Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
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
test_script: "ci/test_python_other.sh"
conda-java-tests:
needs: conda-cpp-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 @@ -91,7 +91,7 @@ jobs:
conda-notebook-tests:
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 @@ -101,7 +101,7 @@ jobs:
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 @@ -111,37 +111,37 @@ jobs:
wheel-build-cudf:
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
build-2_28-wheels: "true"
script: "ci/build_wheel_cudf.sh"
wheel-tests-cudf:
needs: wheel-build-cudf
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_cudf.sh
wheel-build-dask-cudf:
needs: wheel-build-cudf
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:
matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
build_type: pull-request
script: "ci/build_wheel_dask_cudf.sh"
wheel-tests-dask-cudf:
needs: wheel-build-dask-cudf
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:
matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
build_type: pull-request
script: ci/test_wheel_dask_cudf.sh
devcontainer:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.04
uses: rapidsai/shared-action-workflows/.github/workflows/build-in-devcontainer.yaml@test-cuda-12.2
with:
build_command: |
sccache -z;
Expand All @@ -150,7 +150,7 @@ jobs:
unit-tests-cudf-pandas:
needs: wheel-build-cudf
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:
matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
build_type: pull-request
Expand All @@ -159,7 +159,7 @@ jobs:
# run the Pandas unit tests using PR branch
needs: wheel-build-cudf
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:
matrix_filter: map(select(.ARCH == "amd64")) | max_by(.CUDA_VER) | [.]
build_type: pull-request
Expand All @@ -169,7 +169,7 @@ jobs:
# needs: [pandas-tests-main, pandas-tests-pr]
# secrets: inherit
# # This branch exports a `job_output` output that the downstream job reads.
# 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:
# node_type: cpu4
# build_type: pull-request
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
enable_check_symbols: true
conda-cpp-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
conda-cpp-memcheck-tests:
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: nightly
branch: ${{ inputs.branch }}
Expand All @@ -45,7 +45,7 @@ jobs:
run_script: "ci/test_cpp_memcheck.sh"
conda-python-cudf-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 }}
Expand All @@ -55,7 +55,7 @@ jobs:
conda-python-other-tests:
# Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
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 }}
Expand All @@ -64,7 +64,7 @@ jobs:
test_script: "ci/test_python_other.sh"
conda-java-tests:
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: nightly
branch: ${{ inputs.branch }}
Expand All @@ -76,7 +76,7 @@ jobs:
run_script: "ci/test_java.sh"
conda-notebook-tests:
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: nightly
branch: ${{ inputs.branch }}
Expand All @@ -88,7 +88,7 @@ jobs:
run_script: "ci/test_notebooks.sh"
wheel-tests-cudf:
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 All @@ -97,7 +97,7 @@ jobs:
script: ci/test_wheel_cudf.sh
wheel-tests-dask-cudf:
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:
matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
build_type: nightly
Expand All @@ -107,7 +107,7 @@ jobs:
script: ci/test_wheel_dask_cudf.sh
unit-tests-cudf-pandas:
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 All @@ -117,7 +117,7 @@ jobs:
pandas-tests:
# run the Pandas unit 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:
matrix_filter: map(select(.ARCH == "amd64")) | max_by(.CUDA_VER) | [.]
build_type: nightly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- cuda-nvtx-dev
- cuda-python>=12.0,<13.0a0
- cuda-sanitizer-api
- cuda-version=12.0
- cuda-version=12.2
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.3
Expand Down Expand Up @@ -100,4 +100,4 @@ dependencies:
- zlib>=1.2.13
- pip:
- git+https://github.com/python-streamz/streamz.git@master
name: all_cuda-120_arch-x86_64
name: all_cuda-122_arch-x86_64
6 changes: 5 additions & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- libcufile-dev # [linux64]
bdice marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}

requirements:
Expand Down Expand Up @@ -67,7 +70,6 @@ requirements:
{% if cuda_major == "11" %}
- cudatoolkit
{% else %}
- cuda-cudart-dev
- cuda-nvrtc
- libcufile-dev # [linux64]
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
Expand All @@ -92,6 +94,8 @@ requirements:
- cubinlinker # CUDA enhanced compatibility.
- cuda-python >=11.7.1,<12.0a0
{% else %}
- cuda-cudart
- libcufile # [linux64]
bdice marked this conversation as resolved.
Show resolved Hide resolved
# Needed by Numba for CUDA support
- cuda-nvcc-impl
# TODO: Add nvjitlink here
Expand Down
10 changes: 6 additions & 4 deletions conda/recipes/cudf_kafka/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
# Copyright (c) 2020-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
Expand Down Expand Up @@ -36,6 +36,8 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}

requirements:
Expand All @@ -59,14 +61,14 @@ requirements:
- libcudf_kafka ={{ version }}
- scikit-build-core >=0.7.0
- setuptools
{% if cuda_major == "12" %}
- cuda-cudart-dev
{% endif %}
run:
- python
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- libcudf_kafka ={{ version }}
- cudf ={{ version }}
{% if cuda_major != "11" %}
- cuda-cudart
{% endif %}

test:
requires:
Expand Down
Loading
Loading