From f77cfd03990c107984fa22eec8c13c18d6261b3e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 5 Jan 2024 13:09:48 -0600 Subject: [PATCH 01/11] use CUDA 12.2 for building and testing wheels --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 12 ++++++------ .github/workflows/test.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 36cca8b6161..1ba438942f3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,7 +69,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build-cudf: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + 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" @@ -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.02 + 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: ${{ inputs.build_type || 'branch' }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5a77c6749fe..5412662bee5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -103,7 +103,7 @@ jobs: wheel-build-cudf: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-cuda-12.2 with: build_type: pull-request build-2_28-wheels: "true" @@ -111,14 +111,14 @@ jobs: wheel-tests-cudf: needs: wheel-build-cudf secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + 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-tests-cudf secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + 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 @@ -126,7 +126,7 @@ jobs: wheel-tests-dask-cudf: needs: wheel-build-dask-cudf secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + 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 @@ -142,7 +142,7 @@ jobs: unit-tests-cudf-pandas: needs: wheel-build-cudf secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + 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 @@ -151,7 +151,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.02 + 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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index df26a8c5916..c929c7c355a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -79,7 +79,7 @@ jobs: run_script: "ci/test_notebooks.sh" wheel-tests-cudf: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -88,7 +88,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.02 + 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 @@ -98,7 +98,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.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -108,7 +108,7 @@ jobs: pandas-tests: # run the Pandas unit tests secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + 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 From 784048114a893e320aa274d23c57804c8ff3a882 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 5 Jan 2024 14:08:30 -0600 Subject: [PATCH 02/11] empty commit to re-trigger CI From 940775575e38a32ab05d66bb5f766a097f0e7f5e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 16:11:18 -0600 Subject: [PATCH 03/11] add conda, update dependencies.yaml --- .github/workflows/build.yaml | 12 +++++----- .github/workflows/pr.yaml | 24 +++++++++---------- .github/workflows/test.yaml | 12 +++++----- ..._64.yaml => all_cuda-122_arch-x86_64.yaml} | 4 ++-- dependencies.yaml | 24 +++++-------------- 5 files changed, 32 insertions(+), 44 deletions(-) rename conda/environments/{all_cuda-120_arch-x86_64.yaml => all_cuda-122_arch-x86_64.yaml} (97%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1ba438942f3..5813274f549 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: cpp-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: python-build: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -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.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -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.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: arch: "amd64" branch: ${{ inputs.branch }} @@ -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.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -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.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ab4bc234aa2..297ce6353d5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -31,34 +31,34 @@ jobs: #- pandas-tests-diff #- pandas-tests-diff-comment secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 + 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.02 + 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.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 + 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.02 + 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.02 + 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" @@ -66,14 +66,14 @@ jobs: # 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.02 + 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.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -83,7 +83,7 @@ jobs: conda-notebook-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -93,7 +93,7 @@ jobs: docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -133,7 +133,7 @@ jobs: script: ci/test_wheel_dask_cudf.sh devcontainer: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.02 + uses: rapidsai/shared-action-workflows/.github/workflows/build-in-devcontainer.yaml@test-cuda-12.2 with: build_command: | sccache -z; @@ -161,7 +161,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.02 + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 # with: # node_type: cpu4 # build_type: pull-request diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c929c7c355a..b32df7c3c36 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-cpp-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -24,7 +24,7 @@ jobs: sha: ${{ inputs.sha }} conda-cpp-memcheck-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -36,7 +36,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.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -46,7 +46,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.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -55,7 +55,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.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} @@ -67,7 +67,7 @@ jobs: run_script: "ci/test_java.sh" conda-notebook-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml similarity index 97% rename from conda/environments/all_cuda-120_arch-x86_64.yaml rename to conda/environments/all_cuda-122_arch-x86_64.yaml index c109dcca625..1239d472ed1 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -24,7 +24,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 @@ -98,4 +98,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 diff --git a/dependencies.yaml b/dependencies.yaml index 28b3afd7bbc..ba24ee6ca60 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["11.8", "12.0"] + cuda: ["11.8", "12.2"] arch: [x86_64] includes: - build_all @@ -231,14 +231,6 @@ dependencies: cuda: "11.8" packages: - nvcc_linux-aarch64=11.8 - - output_types: conda - matrices: - - matrix: - cuda: "12.0" - packages: - - cuda-version=12.0 - - matrix: # Fallback for CUDA 11 or no matrix - packages: build_cpp: common: - output_types: conda @@ -360,6 +352,10 @@ dependencies: cuda: "12.0" packages: - cuda-version=12.0 + - matrix: + cuda: "12.2" + packages: + - cuda-version=12.2 cuda: specific: - output_types: conda @@ -583,19 +579,11 @@ dependencies: cuda: "12.*" packages: - cuda-sanitizer-api - - matrix: # Fallback for CUDA 11 or no matrix - packages: - - output_types: conda - matrices: - - matrix: - cuda: "12.0" - packages: - - cuda-version=12.0 - matrix: cuda: "11.8" packages: - cuda-sanitizer-api=11.8.86 - - matrix: + - matrix: # Fallback for CUDA 11 or no matrix packages: test_java: common: From a470d547ca19bb4686ac77cc634b954187c0fd4e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 17 Jan 2024 06:40:08 -0800 Subject: [PATCH 04/11] Use libcufile-dev on CUDA 12.2+ for aarch64. --- dependencies.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c5241b9492b..a93e3e7c75f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -402,9 +402,18 @@ dependencies: - *libcurand114 - output_types: conda matrices: + - matrix: + cuda: "11.*" + arch: aarch64 + packages: + # libcufile requires CUDA 12.2+ on aarch64 + - matrix: + cuda: "12.0" + arch: aarch64 + packages: + # libcufile requires CUDA 12.2+ on aarch64 - matrix: cuda: "12.*" - arch: x86_64 packages: - libcufile-dev - matrix: @@ -433,9 +442,6 @@ dependencies: # so 11.2 uses 11.4 packages (the oldest available). - *libcufile_114 - *libcufile_dev114 - # Fallback matrix for aarch64, which doesn't support libcufile. - - matrix: - packages: develop: common: - output_types: [conda, requirements] From 30b44aad8c25a0dad4ffa09af80a92bdddc0992c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 08:06:34 -0600 Subject: [PATCH 05/11] Ignore run-exports from CUDA 12 compiler. --- conda/recipes/cudf/meta.yaml | 2 ++ conda/recipes/cudf_kafka/meta.yaml | 4 +++- conda/recipes/libcudf/meta.yaml | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 4f39a9fe452..50671d00d82 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -39,6 +39,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 872324d3f73..0d0ac23f74a 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -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] %} @@ -36,6 +36,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 0459908fd00..615b7c4c012 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2023, NVIDIA CORPORATION. +# Copyright (c) 2018-2024, NVIDIA CORPORATION. {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} @@ -87,6 +87,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -127,6 +129,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -155,6 +159,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -194,6 +200,8 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: From 9b289e49bdf47f4ab23c54ecf9c995bcf0407dde Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 09:12:11 -0600 Subject: [PATCH 06/11] Refactor cuda_spec. --- conda/recipes/libcudf/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 615b7c4c012..f2763deb3ea 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -4,7 +4,6 @@ {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} -{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0 {% set date_string = environ['RAPIDS_DATE_STRING'] %} package: @@ -94,8 +93,10 @@ outputs: build: - cmake {{ cmake_version }} host: + - cuda-version ={{ cuda_version }} - libarrow {{ libarrow_version }} run: + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit - libcufile {{ cuda11_libcufile_run_version }} # [linux64] @@ -103,7 +104,6 @@ outputs: - cuda-nvrtc - libcufile # [linux64] {% endif %} - - cuda-version {{ cuda_spec }} - nvcomp {{ nvcomp_version }} - librmm ={{ minor_version }} - libkvikio ={{ minor_version }} @@ -185,6 +185,7 @@ outputs: - cuda-version ={{ cuda_version }} run: - {{ pin_subpackage('libcudf', exact=True) }} + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} about: home: https://rapids.ai/ license: Apache-2.0 @@ -209,7 +210,7 @@ outputs: host: - {{ pin_subpackage('libcudf', exact=True) }} - {{ pin_subpackage('libcudf_kafka', exact=True) }} - - cuda-version {{ cuda_spec }} + - cuda-version ={{ cuda_version }} {% if cuda_major == "11" %} - libcurand {{ cuda11_libcurand_run_version }} {% else %} @@ -219,9 +220,9 @@ outputs: - gtest {{ gtest_version }} - gmock {{ gtest_version }} run: + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - {{ pin_subpackage('libcudf', exact=True) }} - {{ pin_subpackage('libcudf_kafka', exact=True) }} - - cuda-version {{ cuda_spec }} {% if cuda_major == "11" %} - libcurand {{ cuda11_libcurand_run_version }} {% endif %} From 7e4bde763ad2cdd72a6effe8624fd6e7e102e773 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 6 Feb 2024 09:12:52 -0600 Subject: [PATCH 07/11] Loosen run-exports from -dev libraries. --- conda/recipes/cudf/meta.yaml | 4 +++- conda/recipes/cudf_kafka/meta.yaml | 6 +++--- conda/recipes/libcudf/meta.yaml | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 50671d00d82..30f104d96df 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -41,6 +41,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcufile-dev # [linux64] {% endif %} requirements: @@ -69,7 +70,6 @@ requirements: {% if cuda_major == "11" %} - cudatoolkit {% else %} - - cuda-cudart-dev - cuda-nvrtc - libcufile-dev # [linux64] {% endif %} @@ -94,6 +94,8 @@ requirements: - cubinlinker # CUDA enhanced compatibility. - cuda-python >=11.7.1,<12.0a0 {% else %} + - cuda-cudart + - libcufile # [linux64] # Needed by Numba for CUDA support - cuda-nvcc-impl # TODO: Add nvjitlink here diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 0d0ac23f74a..73aef2e0d64 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -61,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: diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index f2763deb3ea..63eb83084dd 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -161,6 +161,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-nvtx-dev {% endif %} requirements: build: @@ -186,6 +187,9 @@ outputs: run: - {{ pin_subpackage('libcudf', exact=True) }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} + {% if cuda_major != "11" %} + - cuda-nvtx + {% endif %} about: home: https://rapids.ai/ license: Apache-2.0 @@ -203,6 +207,7 @@ outputs: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - libcurand-dev {% endif %} requirements: build: @@ -225,6 +230,8 @@ outputs: - {{ pin_subpackage('libcudf_kafka', exact=True) }} {% if cuda_major == "11" %} - libcurand {{ cuda11_libcurand_run_version }} + {% else %} + - libcurand {% endif %} - benchmark {{ gbench_version }} - gtest {{ gtest_version }} From 8090e502bf3680142d68898036a2efe28d82da33 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 7 Feb 2024 15:36:18 -0600 Subject: [PATCH 08/11] Add back cuda-cudart-dev. --- conda/recipes/cudf/meta.yaml | 2 ++ conda/recipes/cudf_kafka/meta.yaml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index d043fbe6d21..85eff55b2c6 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -41,6 +41,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev - libcufile-dev # [linux64] {% endif %} @@ -70,6 +71,7 @@ requirements: {% if cuda_major == "11" %} - cudatoolkit {% else %} + - cuda-cudart-dev - cuda-nvrtc - libcufile-dev # [linux64] {% endif %} diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 73aef2e0d64..45e41bf8de7 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -38,6 +38,7 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev {% endif %} requirements: @@ -61,6 +62,9 @@ requirements: - libcudf_kafka ={{ version }} - scikit-build-core >=0.7.0 - setuptools + {% if cuda_major != "11" %} + - cuda-cudart-dev + {% endif %} run: - python - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} From 0ce510126122c2d52b1f6d0264515ddf58217afa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Feb 2024 15:11:30 -0600 Subject: [PATCH 09/11] Remove libcufile on aarch64. --- dependencies.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 2a51cd1bb69..c4c2cd3c764 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -402,17 +402,11 @@ dependencies: - output_types: conda matrices: - matrix: - cuda: "11.*" arch: aarch64 packages: - # libcufile requires CUDA 12.2+ on aarch64 - - matrix: - cuda: "12.0" - arch: aarch64 - packages: - # libcufile requires CUDA 12.2+ on aarch64 - matrix: cuda: "12.*" + arch: x86_64 packages: - libcufile-dev - matrix: From 3f42dc22eb9e9e113f1845355dc05cb34f881155 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Feb 2024 15:59:24 -0600 Subject: [PATCH 10/11] Use 12.2.2 for publishing dask-cudf wheels. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5813274f549..b92e0a53b46 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -92,7 +92,7 @@ jobs: secrets: inherit 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"))) + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.2.2"))) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} From 22edbcf5105fe507c9519be739964011c573d6e9 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Feb 2024 16:02:13 -0600 Subject: [PATCH 11/11] Use 12.2.2 instead of 12.0.1 for single-CUDA-version jobs in pr.yaml and test.yaml. --- .github/workflows/pr.yaml | 6 +++--- .github/workflows/test.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a35c4fd060d..57923dca5d9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -128,7 +128,7 @@ jobs: secrets: inherit 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"))) + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.2.2"))) build_type: pull-request script: "ci/build_wheel_dask_cudf.sh" wheel-tests-dask-cudf: @@ -136,7 +136,7 @@ jobs: secrets: inherit 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"))) + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.2.2"))) build_type: pull-request script: ci/test_wheel_dask_cudf.sh devcontainer: @@ -152,7 +152,7 @@ jobs: secrets: inherit 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"))) + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.2.2"))) build_type: pull-request script: ci/cudf_pandas_scripts/run_tests.sh pandas-tests: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 510873cd4be..e7eef4de1b3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -99,7 +99,7 @@ jobs: secrets: inherit 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"))) + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.2.2"))) build_type: nightly branch: ${{ inputs.branch }} date: ${{ inputs.date }}