From 656a7099e680f9107484b6604361ee527c336729 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 15:50:37 -0400 Subject: [PATCH 01/12] Update rapids-cmake ci to support conda-forge CUDA 12 --- .github/workflows/build.yaml | 6 +++--- dependencies.yaml | 38 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b2de1180..2185560f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: cpp-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -46,7 +46,7 @@ jobs: docs-build: if: github.ref_type == 'branch' secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 with: arch: "amd64" branch: ${{ inputs.branch }} diff --git a/dependencies.yaml b/dependencies.yaml index 4421ff28..ab2d13ce 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -32,6 +32,24 @@ dependencies: - c-compiler - cxx-compiler - make + specific: + - output_types: conda + matrices: + - matrix: + arch: x86_64 + cuda: "11.8" + packages: + - nvcc_linux-64=11.8 + - matrix: + arch: aarch64 + cuda: "11.8" + packages: + - nvcc_linux-aarch64=11.8 + - matrix: + cuda: "12.0" + packages: + - cuda-version=12.0 + - cuda-nvcc cudatoolkit: specific: - output_types: conda @@ -39,29 +57,39 @@ dependencies: - matrix: cuda: "11.2" packages: - - cudatoolkit=11.2 + - cuda-version=11.2 + - cudatoolkit - gcc<11.0.0 - sysroot_linux-64==2.17 - matrix: cuda: "11.4" packages: - - cudatoolkit=11.4 + - cuda-version=11.4 + - cudatoolkit - gcc<11.0.0 - sysroot_linux-64==2.17 - matrix: cuda: "11.5" packages: - - cudatoolkit=11.5 + - cuda-version=11.5 + - cudatoolkit - sysroot_linux-64==2.17 - matrix: cuda: "11.6" packages: - - cudatoolkit=11.6 + - cuda-version=11.6 + - cudatoolkit - sysroot_linux-64==2.17 - matrix: cuda: "11.8" packages: - - cudatoolkit=11.8 + - cuda-version=11.8 + - cudatoolkit + - sysroot_linux-64==2.17 + - matrix: + cuda: "12.0" + packages: + - cuda-version=12.0 - sysroot_linux-64==2.17 docs: common: From 022409845df127230d0332e970b4b6b2bfd4deeb Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 16:05:15 -0400 Subject: [PATCH 02/12] Update test and pr yaml --- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2977ce28..450b0499 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,26 +17,26 @@ jobs: - conda-cpp-tests - docs-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 checks: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120 conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: pull-request docs-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 with: build_type: pull-request node_type: "cpu4" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fba047b1..e433745a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: cpp-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: nightly branch: ${{ inputs.branch }} From e34181fc06cda5f8fe09eb0334c3685efa955566 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 16:09:53 -0400 Subject: [PATCH 03/12] Add explicit rapids-dependency matrix value to style env --- ci/check_style.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check_style.sh b/ci/check_style.sh index 82dc1b68..e077046e 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -9,7 +9,7 @@ rapids-logger "Create checks conda environment" rapids-dependency-file-generator \ --output conda \ --file_key checks \ - --matrix "" | tee env.yaml + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --force -f env.yaml -n checks From f04edccea0ef9909cf8b7655d446f0268cfef2c4 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 16:18:33 -0400 Subject: [PATCH 04/12] Update the rapids_core_dependencies/meta.yaml for cuda 12 --- conda/recipes/rapids_core_dependencies/meta.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index 6362829b..3df6c9ea 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -22,12 +22,17 @@ requirements: build: - cmake>=3.23.1,!=3.25.0 - {{ compiler('cxx') }} - - {{ compiler('cuda') }} {{ cuda_version }} + {% if cuda_major == "11" %} + - {{ compiler('cuda11') }} {{ cuda_version }} + {% else %} + - {{ compiler('cuda') }} + {% endif %} + - cuda-version ={{ cuda_version }} - make - ninja - sysroot_{{ target_platform }} {{ sysroot_version }} host: - - cudatoolkit ={{ cuda_version }} + - cuda-version ={{ cuda_version }} about: home: https://rapids.ai/ From 008a68f99f23c3ec5522622cfb7b4f8a0643b173 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 16:29:06 -0400 Subject: [PATCH 05/12] Update the rapids_core_dependencies/meta.yaml for cuda 12 --- .../rapids_core_dependencies/conda_build_config.yaml | 6 ++++++ conda/recipes/rapids_core_dependencies/meta.yaml | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids_core_dependencies/conda_build_config.yaml b/conda/recipes/rapids_core_dependencies/conda_build_config.yaml index 9f90f6f0..c65bc4f3 100644 --- a/conda/recipes/rapids_core_dependencies/conda_build_config.yaml +++ b/conda/recipes/rapids_core_dependencies/conda_build_config.yaml @@ -2,7 +2,13 @@ cxx_compiler_version: - 11 cuda_compiler: + - cuda-nvcc + +cuda11_compiler: - nvcc +cmake_version: + - ">=3.26.4" + sysroot_version: - "2.17" diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index 3df6c9ea..ceef3c35 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -16,11 +16,13 @@ build: number: {{ GIT_DESCRIBE_NUMBER }} string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} ignore_run_exports_from: - - {{ compiler('cuda') }} + {% if cuda_major == "11" %} + - {{ compiler('cuda11') }} + {% endif %} requirements: build: - - cmake>=3.23.1,!=3.25.0 + - cmake {{ cmake_version }} - {{ compiler('cxx') }} {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} From fa319ab3ec199fbf8adaa9ed3f3299534eb26fc3 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 17:03:38 -0400 Subject: [PATCH 06/12] Update conda/recipes/rapids_core_dependencies/meta.yaml Co-authored-by: Bradley Dice --- conda/recipes/rapids_core_dependencies/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index ceef3c35..f71b18b7 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -35,6 +35,8 @@ requirements: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - cuda-version ={{ cuda_version }} + run: + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} about: home: https://rapids.ai/ From 861ac8fcb291cb8e76923cfef2fdc14e3f5131c8 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 17:03:52 -0400 Subject: [PATCH 07/12] Update ci/check_style.sh Co-authored-by: Bradley Dice --- ci/check_style.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check_style.sh b/ci/check_style.sh index e077046e..db39e738 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -9,7 +9,7 @@ rapids-logger "Create checks conda environment" rapids-dependency-file-generator \ --output conda \ --file_key checks \ - --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --force -f env.yaml -n checks From 93e22a2fd8ff09900ec692570886beb11265e6c1 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 17:09:56 -0400 Subject: [PATCH 08/12] Add gcc constraints based on the CUDA version --- dependencies.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index ab2d13ce..75afdc08 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -73,23 +73,27 @@ dependencies: packages: - cuda-version=11.5 - cudatoolkit + - gcc<12.0.0 - sysroot_linux-64==2.17 - matrix: cuda: "11.6" packages: - cuda-version=11.6 - cudatoolkit + - gcc<12.0.0 - sysroot_linux-64==2.17 - matrix: cuda: "11.8" packages: - cuda-version=11.8 - cudatoolkit + - gcc<12.0.0 - sysroot_linux-64==2.17 - matrix: cuda: "12.0" packages: - cuda-version=12.0 + - gcc<13.0.0 - sysroot_linux-64==2.17 docs: common: From 8dfbd703180d122aa7ba1a34d5c9b76794804912 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 17:18:56 -0400 Subject: [PATCH 09/12] Update dependencies.yaml Co-authored-by: Bradley Dice --- dependencies.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index 75afdc08..86bd0b5a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -35,6 +35,26 @@ dependencies: specific: - output_types: conda matrices: + - matrix: + arch: x86_64 + cuda: "11.2" + packages: + - nvcc_linux-64=11.2 + - matrix: + arch: aarch64 + cuda: "11.2" + packages: + - nvcc_linux-aarch64=11.2 + - matrix: + arch: x86_64 + cuda: "11.4" + packages: + - nvcc_linux-64=11.4 + - matrix: + arch: aarch64 + cuda: "11.4" + packages: + - nvcc_linux-aarch64=11.4 - matrix: arch: x86_64 cuda: "11.8" From c78274b5a1adb5db34787610aa121deb104167b4 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 12 Jul 2023 17:41:58 -0400 Subject: [PATCH 10/12] Correct typo in meta.yaml --- conda/recipes/rapids_core_dependencies/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index f71b18b7..b6a0af72 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -25,7 +25,7 @@ requirements: - cmake {{ cmake_version }} - {{ compiler('cxx') }} {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} {{ cuda_version }} + - {{ compiler('cuda11') }} ={{ cuda_version }} {% else %} - {{ compiler('cuda') }} {% endif %} From 2745b4696a49393ac1e8a508d5086bab70717ca9 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 12 Jul 2023 16:51:02 -0500 Subject: [PATCH 11/12] Fix indentation. --- conda/recipes/rapids_core_dependencies/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index b6a0af72..efa54215 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -35,7 +35,7 @@ requirements: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - cuda-version ={{ cuda_version }} - run: + run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} about: From 82fe2322747ebfb7e710464f6e363ab1a3d32d08 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 13 Jul 2023 09:11:33 -0400 Subject: [PATCH 12/12] Ensure we have cupti in our cuda-12 env --- dependencies.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.yaml b/dependencies.yaml index 86bd0b5a..4625261f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -113,6 +113,7 @@ dependencies: cuda: "12.0" packages: - cuda-version=12.0 + - cuda-cupti-dev - gcc<13.0.0 - sysroot_linux-64==2.17 docs: