From dad5175262372488cd552621ac375c1457c08519 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 23 Feb 2023 16:44:49 -0600 Subject: [PATCH 01/55] Add draft of CUDA 12 custom job. --- .github/workflows/pr.yaml | 11 +++++++++++ conda/recipes/librmm/meta.yaml | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 240344bc1..4677ae65a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -14,6 +14,7 @@ jobs: needs: - checks - conda-cpp-build + - conda-cpp-build-cuda12 - conda-cpp-tests - conda-python-build - conda-python-tests @@ -31,6 +32,16 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04 with: build_type: pull-request + conda-cpp-build-cuda12: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 + with: + build_type: pull-request + node_type: "gpu-v100-525-1" + arch: "amd64" + container_image: "rapidsai/ci:cuda12.0.0-ubuntu22.04-py3.10" + run_script: "ci/build_cpp.sh" conda-cpp-tests: needs: conda-cpp-build secrets: inherit diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index dd3e58b62..8974351e5 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -21,7 +21,11 @@ requirements: - {{ compiler('cuda') }} {{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: + {% if cuda_major == 12 %} + - cuda-nvcc ={{ cuda_version }} + {% else %} - cudatoolkit ={{ cuda_version }} + {% endif %} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not # pulled by CPM and installed as a part of the rmm packages. However, @@ -60,7 +64,11 @@ outputs: build: - cmake {{ cmake_version }} run: + {% if cuda_major == 12 %} + - cuda-nvcc {{ cuda_spec }} + {% else %} - cudatoolkit {{ cuda_spec }} + {% endif %} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} test: @@ -113,7 +121,11 @@ outputs: build: - cmake {{ cmake_version }} run: + {% if cuda_major == 12 %} + - cuda-nvcc {{ cuda_spec }} + {% else %} - cudatoolkit {{ cuda_spec }} + {% endif %} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} - gmock {{ gtest_version }} From 587149810041501a9f6a34485f5f620db50a990e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 23 Feb 2023 16:47:56 -0600 Subject: [PATCH 02/55] Fix needs. --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4677ae65a..6ded07955 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -33,7 +33,6 @@ jobs: with: build_type: pull-request conda-cpp-build-cuda12: - needs: conda-python-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 with: From 2bd733cad390775628c08dd1c5849574716abc8c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 23 Feb 2023 17:12:47 -0600 Subject: [PATCH 03/55] Update compiler package names. --- conda/recipes/librmm/conda_build_config.yaml | 5 ++++- conda/recipes/librmm/meta.yaml | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 39dec9e5c..1aae5f358 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -4,7 +4,10 @@ c_compiler_version: cxx_compiler_version: - 9 -cuda_compiler: +cuda12_compiler: + - cuda-nvcc + +cuda11_compiler: - nvcc cmake_version: diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 8974351e5..1905e96a1 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -18,7 +18,11 @@ requirements: - ninja - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} {{ cuda_version }} + {% if cuda_major == 12 %} + - {{ compiler('cuda12') }} {{ cuda_version }} + {% else %} + - {{ compiler('cuda11') }} {{ cuda_version }} + {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == 12 %} @@ -59,7 +63,11 @@ outputs: run_exports: - {{ pin_subpackage("librmm", max_pin="x.x") }} ignore_run_exports_from: - - {{ compiler('cuda') }} + {% if cuda_major == 12 %} + - {{ compiler('cuda12') }} + {% else %} + - {{ compiler('cuda11') }} + {% endif %} requirements: build: - cmake {{ cmake_version }} @@ -116,7 +124,11 @@ outputs: 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 == 12 %} + - {{ compiler('cuda12') }} + {% else %} + - {{ compiler('cuda11') }} + {% endif %} requirements: build: - cmake {{ cmake_version }} From f66899ebe0b5a82509ecd0b08846f63d801f5949 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 23 Feb 2023 17:25:24 -0600 Subject: [PATCH 04/55] Use quotes. --- conda/recipes/librmm/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 1905e96a1..5cc104591 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -18,14 +18,14 @@ requirements: - ninja - {{ compiler('c') }} - {{ compiler('cxx') }} - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - {{ compiler('cuda12') }} {{ cuda_version }} {% else %} - {{ compiler('cuda11') }} {{ cuda_version }} {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} {% else %} - cudatoolkit ={{ cuda_version }} @@ -63,7 +63,7 @@ outputs: run_exports: - {{ pin_subpackage("librmm", max_pin="x.x") }} ignore_run_exports_from: - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - {{ compiler('cuda12') }} {% else %} - {{ compiler('cuda11') }} @@ -72,7 +72,7 @@ outputs: build: - cmake {{ cmake_version }} run: - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - cuda-nvcc {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} @@ -124,7 +124,7 @@ outputs: number: {{ GIT_DESCRIBE_NUMBER }} string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} ignore_run_exports_from: - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - {{ compiler('cuda12') }} {% else %} - {{ compiler('cuda11') }} @@ -133,7 +133,7 @@ outputs: build: - cmake {{ cmake_version }} run: - {% if cuda_major == 12 %} + {% if cuda_major == "12" %} - cuda-nvcc {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} From 45417d776524f9a047f8aa525be79d2e2a73475a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 24 Feb 2023 16:34:22 -0600 Subject: [PATCH 05/55] Build on CPU node. --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6ded07955..a7c5ae98a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -37,7 +37,7 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 with: build_type: pull-request - node_type: "gpu-v100-525-1" + node_type: "cpu8" arch: "amd64" container_image: "rapidsai/ci:cuda12.0.0-ubuntu22.04-py3.10" run_script: "ci/build_cpp.sh" From 2dfc9a038668d95d95b1d2cba36ba9d87178014b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 24 Feb 2023 16:35:10 -0600 Subject: [PATCH 06/55] Add cuda-cudart. --- conda/recipes/librmm/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 5cc104591..a348a4859 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -27,6 +27,7 @@ requirements: host: {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} + - cuda-cudart ={{ cuda_version }} {% else %} - cudatoolkit ={{ cuda_version }} {% endif %} From c3fca69cc844a78b5a82a856fd5dd778042e854a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 24 Feb 2023 16:36:04 -0600 Subject: [PATCH 07/55] Require cuda-cudart to run, not cuda-nvcc. --- conda/recipes/librmm/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index a348a4859..e892e4a7a 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -74,7 +74,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} - - cuda-nvcc {{ cuda_spec }} + - cuda-cudart {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} {% endif %} @@ -135,7 +135,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} - - cuda-nvcc {{ cuda_spec }} + - cuda-cudart {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} {% endif %} From 871c420bb804a3558e4f92ffb3b3da3939683a1b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 24 Feb 2023 16:45:10 -0600 Subject: [PATCH 08/55] Use cuda-cudart-dev for building. --- conda/recipes/librmm/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index e892e4a7a..c1ea13f64 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -27,7 +27,7 @@ requirements: host: {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} - - cuda-cudart ={{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} {% else %} - cudatoolkit ={{ cuda_version }} {% endif %} From d9f07156c15f33fc1aa7a53a811f76c1478588e8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 24 Feb 2023 20:31:33 -0600 Subject: [PATCH 09/55] Update to gcc 11. --- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 1aae5f358..8374fab89 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -1,8 +1,8 @@ c_compiler_version: - - 9 + - 11 cxx_compiler_version: - - 9 + - 11 cuda12_compiler: - cuda-nvcc From 83207fb98301e42f25a863da68fbdf71fb08909c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 27 Feb 2023 14:03:02 -0600 Subject: [PATCH 10/55] Add CUDAHOSTCXX before invoking CMake. --- conda/recipes/librmm/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/librmm/build.sh b/conda/recipes/librmm/build.sh index 8bf1cb7e3..daeb8bdf8 100644 --- a/conda/recipes/librmm/build.sh +++ b/conda/recipes/librmm/build.sh @@ -1,3 +1,4 @@ # Copyright (c) 2018-2022, NVIDIA CORPORATION. +export CUDAHOSTCXX=${CXX} # Needed for CUDA 12 nvidia channel compilers ./build.sh -n -v clean librmm tests benchmarks --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\" From b3f60715c83d1a4533b1d1a21ba50e9468ffba73 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 12:34:34 -0600 Subject: [PATCH 11/55] Try adding cuda-cudart. --- conda/recipes/librmm/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index c1ea13f64..e87722896 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -28,6 +28,7 @@ requirements: {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart ={{ cuda_version }} {% else %} - cudatoolkit ={{ cuda_version }} {% endif %} From 859692fc629c5aee10efaed97e2fe93f9ec5f95a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 13:13:45 -0600 Subject: [PATCH 12/55] Add cuda-cudart-dev in more places until I understand what sections actually need it. --- conda/recipes/librmm/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index e87722896..97e186dd6 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -20,6 +20,8 @@ requirements: - {{ compiler('cxx') }} {% if cuda_major == "12" %} - {{ compiler('cuda12') }} {{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart ={{ cuda_version }} {% else %} - {{ compiler('cuda11') }} {{ cuda_version }} {% endif %} @@ -75,6 +77,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} + - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} @@ -136,6 +139,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} + - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} From f0446c202948f0c00014cafd8378c06c90ebc585 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 13:54:56 -0600 Subject: [PATCH 13/55] Add cuda-cudart-static. --- conda/recipes/librmm/meta.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 97e186dd6..8a4596c98 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -20,8 +20,9 @@ requirements: - {{ compiler('cxx') }} {% if cuda_major == "12" %} - {{ compiler('cuda12') }} {{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart-static ={{ cuda_version }} {% else %} - {{ compiler('cuda11') }} {{ cuda_version }} {% endif %} @@ -29,8 +30,9 @@ requirements: host: {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart-static ={{ cuda_version }} {% else %} - cudatoolkit ={{ cuda_version }} {% endif %} @@ -77,8 +79,9 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} - - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart {{ cuda_spec }} + - cuda-cudart-dev {{ cuda_spec }} + - cuda-cudart-static {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} {% endif %} @@ -139,8 +142,9 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "12" %} - - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart {{ cuda_spec }} + - cuda-cudart-dev {{ cuda_spec }} + - cuda-cudart-static {{ cuda_spec }} {% else %} - cudatoolkit {{ cuda_spec }} {% endif %} From 5baa99e5169cc56dfdb316bc19538c9203ec4165 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 15:19:05 -0600 Subject: [PATCH 14/55] Update to GCC 11. --- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- conda/recipes/rmm/conda_build_config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 39dec9e5c..be4758d36 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -1,8 +1,8 @@ c_compiler_version: - - 9 + - 11 cxx_compiler_version: - - 9 + - 11 cuda_compiler: - nvcc diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index 322fe6faa..ad733ac69 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -1,8 +1,8 @@ c_compiler_version: - - 9 + - 11 cxx_compiler_version: - - 9 + - 11 cuda_compiler: - nvcc From c1b6f9981d90014d888e5c6e6a270f2b16732808 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 15:24:44 -0600 Subject: [PATCH 15/55] Use NVCC_PREPEND_FLAGS instead of CUDAHOSTCXX. --- conda/recipes/librmm/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/build.sh b/conda/recipes/librmm/build.sh index daeb8bdf8..6c794eeeb 100644 --- a/conda/recipes/librmm/build.sh +++ b/conda/recipes/librmm/build.sh @@ -1,4 +1,4 @@ # Copyright (c) 2018-2022, NVIDIA CORPORATION. -export CUDAHOSTCXX=${CXX} # Needed for CUDA 12 nvidia channel compilers +export NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -ccbin ${CXX}" # Needed for CUDA 12 nvidia channel compilers ./build.sh -n -v clean librmm tests benchmarks --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\" From 67f9424f3bef1212d92bb73d52d92ffc2608142e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 17:11:35 -0600 Subject: [PATCH 16/55] Use CUDA 12 shared-action-workflows branch. --- .github/workflows/build.yaml | 12 ++++++------ .github/workflows/pr.yaml | 28 +++++++++------------------- .github/workflows/test.yaml | 6 +++--- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e5256cfe0..19ccb8958 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.04 + 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: python-build: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 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-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -56,7 +56,7 @@ jobs: if: github.ref_type == 'branch' && github.event_name == 'push' needs: python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 with: build_type: branch node_type: "gpu-latest-1" @@ -65,7 +65,7 @@ jobs: run_script: "ci/build_docs.sh" wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -78,7 +78,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b252552b0..da98f1679 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -14,7 +14,6 @@ jobs: needs: - checks - conda-cpp-build - - conda-cpp-build-cuda12 - conda-cpp-tests - conda-python-build - conda-python-tests @@ -22,49 +21,40 @@ jobs: - wheel-build - wheel-tests secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.04 + 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.04 + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120 with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120 with: build_type: pull-request - conda-cpp-build-cuda12: - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 - with: - build_type: pull-request - node_type: "cpu8" - arch: "amd64" - container_image: "rapidsai/ci:cuda12.0.0-ubuntu22.04-py3.10" - run_script: "ci/build_cpp.sh" conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 with: build_type: pull-request conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 with: build_type: pull-request docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 with: build_type: pull-request node_type: "gpu-latest-1" @@ -74,7 +64,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: pull-request package-dir: python @@ -84,7 +74,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: pull-request package-name: rmm diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f4ef540fe..569ffad10 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.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: nightly branch: ${{ inputs.branch }} @@ -24,7 +24,7 @@ jobs: sha: ${{ inputs.sha }} python-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 with: build_type: nightly branch: ${{ inputs.branch }} @@ -32,7 +32,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.04 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: nightly branch: ${{ inputs.branch }} From 5abb2ee2cccf203091b5e0b65e95bc3d8fcec9fa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 17:37:19 -0600 Subject: [PATCH 17/55] Add CUDA 12.0 to dependencies.yaml. --- dependencies.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index e6fde1b98..9c2e1e480 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -81,6 +81,13 @@ dependencies: cuda: "11.8" packages: - cudatoolkit=11.8 + - matrix: + cuda: "12.0" + packages: + - cuda-nvcc=12.0 + - cuda-cudart=12.0 + - cuda-cudart-dev=12.0 + - cuda-cudart-static=12.0 develop: common: - output_types: [conda, requirements] From 504e56f799226e519dcb15f1fa5235523207b4de Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Feb 2023 17:40:29 -0600 Subject: [PATCH 18/55] Attempt at rmm Python CUDA 12 support. --- conda/recipes/rmm/meta.yaml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index b816e24c5..72ae73999 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -37,11 +37,26 @@ requirements: - ninja - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} {{ cuda_version }} + {% if cuda_major == "12" %} + - {{ compiler('cuda12') }} {{ cuda_version }} + - cuda-cudart ={{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart-static ={{ cuda_version }} + {% else %} + - {{ compiler('cuda11') }} {{ cuda_version }} + {% endif %} + - sysroot_{{ target_platform }} {{ sysroot_version }} host: - cuda-python >=11.7.1,<12.0 + {% if cuda_major == "12" %} + - cuda-nvcc ={{ cuda_version }} + - cuda-cudart ={{ cuda_version }} + - cuda-cudart-dev ={{ cuda_version }} + - cuda-cudart-static ={{ cuda_version }} + {% else %} - cudatoolkit ={{ cuda_version }} + {% endif %} - cython >=0.29,<0.30 - librmm ={{ version }} - python @@ -49,10 +64,15 @@ requirements: - setuptools >=61.0.0 - tomli # [py<311] run: + {% if cuda_major == "12" %} + - cuda-python >=12.1,<13.0 + - cuda-cudart ={{ cuda_version }} + {% else %} - cuda-python >=11.7.1,<12.0 + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + {% endif %} - numba >=0.49 - numpy >=1.19 - - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: imports: From 41bd81482700d4b4ce568e3ad0f7b67630d73ac9 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 2 Mar 2023 13:01:45 -0600 Subject: [PATCH 19/55] Update conda_build_config.yaml. --- conda/recipes/rmm/conda_build_config.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index ad733ac69..24e67757b 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -4,7 +4,10 @@ c_compiler_version: cxx_compiler_version: - 11 -cuda_compiler: +cuda12_compiler: + - cuda-nvcc + +cuda11_compiler: - nvcc sysroot_version: From 923e479e7a095abdd8e81f9a9c21229307176684 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Sat, 4 Mar 2023 15:25:44 -0600 Subject: [PATCH 20/55] Fix host requirements for cuda-python. --- conda/recipes/rmm/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 72ae73999..3bf2f1b9b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -48,14 +48,15 @@ requirements: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - - cuda-python >=11.7.1,<12.0 {% if cuda_major == "12" %} - cuda-nvcc ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} + - cuda-python >=12.1,<13.0 {% else %} - cudatoolkit ={{ cuda_version }} + - cuda-python >=11.7.1,<12.0 {% endif %} - cython >=0.29,<0.30 - librmm ={{ version }} From 1375e40f10a5969d65224a00101e5d9170c07a0a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 8 Mar 2023 14:42:45 -0600 Subject: [PATCH 21/55] Fix compiler. --- conda/recipes/rmm/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 3bf2f1b9b..6e52d2f7a 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -49,7 +49,7 @@ requirements: - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "12" %} - - cuda-nvcc ={{ cuda_version }} + - {{ compiler('cuda12') }} {{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} From 5be8b3f74779e7f32348a0aa9b64bdd85eb87bb1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 8 Mar 2023 14:46:00 -0600 Subject: [PATCH 22/55] Make cuda11 the special case and cuda12 the default case. --- conda/recipes/librmm/conda_build_config.yaml | 2 +- conda/recipes/librmm/meta.yaml | 38 ++++++++++---------- conda/recipes/rmm/conda_build_config.yaml | 2 +- conda/recipes/rmm/meta.yaml | 26 +++++++------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 8374fab89..0c8eca79c 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -4,7 +4,7 @@ c_compiler_version: cxx_compiler_version: - 11 -cuda12_compiler: +cuda_compiler: - cuda-nvcc cuda11_compiler: diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 8a4596c98..e94419e51 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -18,23 +18,23 @@ requirements: - ninja - {{ compiler('c') }} - {{ compiler('cxx') }} - {% if cuda_major == "12" %} - - {{ compiler('cuda12') }} {{ cuda_version }} + {% if cuda_major == "11" %} + - {{ compiler('cuda11') }} {{ cuda_version }} + {% else %} + - {{ compiler('cuda') }} {{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} - {% else %} - - {{ compiler('cuda11') }} {{ cuda_version }} {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {% if cuda_major == "12" %} + {% if cuda_major == "11" %} + - cudatoolkit ={{ cuda_version }} + {% else %} - cuda-nvcc ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} - {% else %} - - cudatoolkit ={{ cuda_version }} {% endif %} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not @@ -69,21 +69,21 @@ outputs: run_exports: - {{ pin_subpackage("librmm", max_pin="x.x") }} ignore_run_exports_from: - {% if cuda_major == "12" %} - - {{ compiler('cuda12') }} - {% else %} + {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: - cmake {{ cmake_version }} run: - {% if cuda_major == "12" %} + {% if cuda_major == "11" %} + - cudatoolkit {{ cuda_spec }} + {% else %} - cuda-cudart {{ cuda_spec }} - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart-static {{ cuda_spec }} - {% else %} - - cudatoolkit {{ cuda_spec }} {% endif %} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} @@ -132,21 +132,21 @@ outputs: number: {{ GIT_DESCRIBE_NUMBER }} string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} ignore_run_exports_from: - {% if cuda_major == "12" %} - - {{ compiler('cuda12') }} - {% else %} + {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: build: - cmake {{ cmake_version }} run: - {% if cuda_major == "12" %} + {% if cuda_major == "11" %} + - cudatoolkit {{ cuda_spec }} + {% else %} - cuda-cudart {{ cuda_spec }} - cuda-cudart-dev {{ cuda_spec }} - cuda-cudart-static {{ cuda_spec }} - {% else %} - - cudatoolkit {{ cuda_spec }} {% endif %} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index 24e67757b..fb04ce5c8 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -4,7 +4,7 @@ c_compiler_version: cxx_compiler_version: - 11 -cuda12_compiler: +cuda_compiler: - cuda-nvcc cuda11_compiler: diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 6e52d2f7a..e87310e4b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -37,26 +37,26 @@ requirements: - ninja - {{ compiler('c') }} - {{ compiler('cxx') }} - {% if cuda_major == "12" %} - - {{ compiler('cuda12') }} {{ cuda_version }} + {% if cuda_major == "11" %} + - {{ compiler('cuda11') }} {{ cuda_version }} + {% else %} + - {{ compiler('cuda') }} {{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} - {% else %} - - {{ compiler('cuda11') }} {{ cuda_version }} {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {% if cuda_major == "12" %} - - {{ compiler('cuda12') }} {{ cuda_version }} + {% if cuda_major == "11" %} + - cudatoolkit ={{ cuda_version }} + - cuda-python >=11.7.1,<12.0 + {% else %} + - {{ compiler('cuda') }} {{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} - cuda-python >=12.1,<13.0 - {% else %} - - cudatoolkit ={{ cuda_version }} - - cuda-python >=11.7.1,<12.0 {% endif %} - cython >=0.29,<0.30 - librmm ={{ version }} @@ -65,12 +65,12 @@ requirements: - setuptools >=61.0.0 - tomli # [py<311] run: - {% if cuda_major == "12" %} - - cuda-python >=12.1,<13.0 - - cuda-cudart ={{ cuda_version }} - {% else %} + {% if cuda_major == "11" %} - cuda-python >=11.7.1,<12.0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + {% else %} + - cuda-python >=12.1,<13.0 + - cuda-cudart ={{ cuda_version }} {% endif %} - numba >=0.49 - numpy >=1.19 From e342c622cae7fa68559e4143986a0b919053b30e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 8 Mar 2023 14:54:20 -0600 Subject: [PATCH 23/55] Update cuda-python in dependencies.yaml. --- dependencies.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 9c2e1e480..d5574ad96 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -42,7 +42,6 @@ dependencies: - output_types: [conda, requirements] packages: - cmake>=3.23.1,!=3.25.0 - - cuda-python>=11.7.1,<12.0 - cython>=0.29,<0.30 - ninja - python>=3.8,<3.11 @@ -52,6 +51,16 @@ dependencies: packages: - fmt>=9.1.0,<10 - spdlog>=1.11.0,<1.12 + specific: + - output_types: [conda, requirements] + matrices: + - matrix: + cuda: "12.0" + packages: + - cuda-python>=12.1,<13.0 + - matrix: # All CUDA 11 versions + packages: + - cuda-python>=11.7.1,<12.0 checks: common: - output_types: [conda, requirements] From b4f77a2700867b9ee1d3698776860b7998edfc06 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 10 Mar 2023 00:38:17 -0600 Subject: [PATCH 24/55] Remove compiler (shouldn't be needed in host?). --- conda/recipes/librmm/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index e94419e51..649f80c7f 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -31,7 +31,6 @@ requirements: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} {% else %} - - cuda-nvcc ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} - cuda-cudart-dev ={{ cuda_version }} - cuda-cudart-static ={{ cuda_version }} From c3cf48a417a18b577d2974743bbf8be27a0987d6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 23 Mar 2023 12:01:27 -0500 Subject: [PATCH 25/55] Add pyproject. --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index c7bc4f488..7fae0be40 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -76,7 +76,7 @@ dependencies: - wheel - setuptools>=61.0.0 specific: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] matrices: - matrix: cuda: "12.0" From f02665516d5700942f2b126fe0809a164a2a0ba1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Mar 2023 15:45:54 -0500 Subject: [PATCH 26/55] Require nvcc at build time. --- .../environments/all_cuda-118_arch-x86_64.yaml | 1 + dependencies.yaml | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a001756a2..7ebbce254 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -13,6 +13,7 @@ dependencies: - ninja - numba>=0.49 - numpy>=1.19 +- nvcc_linux-64=11.8 - pre-commit - pytest - pytest-cov diff --git a/dependencies.yaml b/dependencies.yaml index 7fae0be40..36d5fd599 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -76,6 +76,22 @@ dependencies: - wheel - setuptools>=61.0.0 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-nvcc=12.0 - output_types: [conda, requirements, pyproject] matrices: - matrix: @@ -117,7 +133,6 @@ dependencies: - matrix: cuda: "12.0" packages: - - cuda-nvcc=12.0 - cuda-cudart=12.0 - cuda-cudart-dev=12.0 - cuda-cudart-static=12.0 From 99e92ea9628614b9e4b235f5284e5d7ee60537a1 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 19 Apr 2023 15:09:18 -0700 Subject: [PATCH 27/55] Hard pin the nvcc and cudart versions for now. --- conda/recipes/librmm/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 62333d0e5..f9da31afa 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -21,19 +21,19 @@ requirements: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} - - {{ compiler('cuda') }} {{ cuda_version }} - - cuda-cudart ={{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - - cuda-cudart-static ={{ cuda_version }} + - {{ compiler('cuda') }} 12.0.76 + - cuda-cudart =12.0.107 + - cuda-cudart-dev =12.0.107 + - cuda-cudart-static =12.0.107 {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} {% else %} - - cuda-cudart ={{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - - cuda-cudart-static ={{ cuda_version }} + - cuda-cudart =12.0.107 + - cuda-cudart-dev =12.0.107 + - cuda-cudart-static =12.0.107 {% endif %} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not From 9a74395c7115c32a23ebd68701ab1a76a35564a8 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 21 Apr 2023 10:08:59 -0700 Subject: [PATCH 28/55] Comment out unnecessary builds --- .github/workflows/pr.yaml | 90 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b3a3998e8..b17669682 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -15,11 +15,11 @@ jobs: - checks - conda-cpp-build - conda-cpp-tests - - conda-python-build - - conda-python-tests - - docs-build - - wheel-build - - wheel-tests + #- conda-python-build + #- conda-python-tests + #- docs-build + #- wheel-build + #- wheel-tests secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 checks: @@ -39,43 +39,43 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: pull-request - conda-python-build: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 - with: - build_type: pull-request - conda-python-tests: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 - with: - build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 - with: - build_type: pull-request - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci:latest" - run_script: "ci/build_docs.sh" - wheel-build: - needs: checks - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 - with: - build_type: pull-request - package-dir: python - package-name: rmm - skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" - wheel-tests: - needs: wheel-build - secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 - with: - build_type: pull-request - package-name: rmm - test-unittest: "python -m pytest ./python/rmm/tests" - test-smoketest: "python ./ci/wheel_smoke_test.py" + #conda-python-build: + # needs: conda-cpp-build + # secrets: inherit + # uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 + # with: + # build_type: pull-request + #conda-python-tests: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 + # with: + # build_type: pull-request + #docs-build: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + # with: + # build_type: pull-request + # node_type: "gpu-v100-latest-1" + # arch: "amd64" + # container_image: "rapidsai/ci:latest" + # run_script: "ci/build_docs.sh" + #wheel-build: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + # with: + # build_type: pull-request + # package-dir: python + # package-name: rmm + # skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" + #wheel-tests: + # needs: wheel-build + # secrets: inherit + # uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + # with: + # build_type: pull-request + # package-name: rmm + # test-unittest: "python -m pytest ./python/rmm/tests" + # test-smoketest: "python ./ci/wheel_smoke_test.py" From 5a588574b786edf22fcc6e67d9b2fa509b506ec3 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 21 Apr 2023 10:40:34 -0700 Subject: [PATCH 29/55] Try pinning cuda_version instead of cudart --- conda/recipes/librmm/meta.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index f9da31afa..f917bb4ca 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -21,19 +21,21 @@ requirements: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} + - cuda-version {{ cuda_version }} - {{ compiler('cuda') }} 12.0.76 - - cuda-cudart =12.0.107 - - cuda-cudart-dev =12.0.107 - - cuda-cudart-static =12.0.107 + - cuda-cudart + - cuda-cudart-dev + - cuda-cudart-static {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} {% else %} - - cuda-cudart =12.0.107 - - cuda-cudart-dev =12.0.107 - - cuda-cudart-static =12.0.107 + - cuda-version {{ cuda_version }} + - cuda-cudart + - cuda-cudart-dev + - cuda-cudart-static {% endif %} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not From e67075dffa77ecc1a86f5352bacdad9e48379943 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 21 Apr 2023 10:56:00 -0700 Subject: [PATCH 30/55] Try removing prepend flags --- conda/recipes/librmm/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/librmm/build.sh b/conda/recipes/librmm/build.sh index 6c794eeeb..8bf1cb7e3 100644 --- a/conda/recipes/librmm/build.sh +++ b/conda/recipes/librmm/build.sh @@ -1,4 +1,3 @@ # Copyright (c) 2018-2022, NVIDIA CORPORATION. -export NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -ccbin ${CXX}" # Needed for CUDA 12 nvidia channel compilers ./build.sh -n -v clean librmm tests benchmarks --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\" From 5900a4290dac1e3c699104716614353ffc9cfd98 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 26 May 2023 11:51:08 -0500 Subject: [PATCH 31/55] Simplify CUDA 12 packaging using conda-forge channel. --- conda/recipes/librmm/meta.yaml | 18 +++--------------- conda/recipes/rmm/meta.yaml | 13 +++---------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index f531a31be..a3795d31f 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -22,20 +22,12 @@ requirements: - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} - cuda-version {{ cuda_version }} - - {{ compiler('cuda') }} 12.0.76 - - cuda-cudart - - cuda-cudart-dev - - cuda-cudart-static + - {{ compiler('cuda') }} {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} - {% else %} - - cuda-version {{ cuda_version }} - - cuda-cudart - - cuda-cudart-dev - - cuda-cudart-static {% endif %} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not @@ -87,9 +79,7 @@ outputs: {% if cuda_major == "11" %} - cudatoolkit {{ cuda_spec }} {% else %} - - cuda-cudart {{ cuda_spec }} - - cuda-cudart-dev {{ cuda_spec }} - - cuda-cudart-static {{ cuda_spec }} + - cuda-version {{ cuda_spec }} {% endif %} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} @@ -150,9 +140,7 @@ outputs: {% if cuda_major == "11" %} - cudatoolkit {{ cuda_spec }} {% else %} - - cuda-cudart {{ cuda_spec }} - - cuda-cudart-dev {{ cuda_spec }} - - cuda-cudart-static {{ cuda_spec }} + - cuda-version { cuda_spec }} {% endif %} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 116b2b0d7..204351bd5 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -43,10 +43,8 @@ requirements: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} - - {{ compiler('cuda') }} {{ cuda_version }} - - cuda-cudart ={{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - - cuda-cudart-static ={{ cuda_version }} + - cuda-version {{ cuda_version }} + - {{ compiler('cuda') }} {% endif %} - sysroot_{{ target_platform }} {{ sysroot_version }} @@ -55,14 +53,10 @@ requirements: - cudatoolkit ={{ cuda_version }} - cuda-python >=11.7.1,<12.0 {% else %} - - {{ compiler('cuda') }} {{ cuda_version }} - - cuda-cudart ={{ cuda_version }} - - cuda-cudart-dev ={{ cuda_version }} - - cuda-cudart-static ={{ cuda_version }} - cuda-python >=12.1,<13.0 {% endif %} - cython >=0.29,<0.30 - - librmm ={{ version }} + - librmm ={{ version }}*=cuda{{ cuda_major }}* - python - scikit-build >=0.13.1,<0.17.2 - setuptools >=61.0.0 @@ -73,7 +67,6 @@ requirements: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} {% else %} - cuda-python >=12.1,<13.0 - - cuda-cudart ={{ cuda_version }} {% endif %} - numba >=0.49 - numpy >=1.19 From 23aab3bcb97b75e14d7a2e9b7ecfee4cfcf839fa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 26 May 2023 12:34:42 -0500 Subject: [PATCH 32/55] Fix typo. --- conda/recipes/librmm/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index a3795d31f..489f370f5 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -140,7 +140,7 @@ outputs: {% if cuda_major == "11" %} - cudatoolkit {{ cuda_spec }} {% else %} - - cuda-version { cuda_spec }} + - cuda-version {{ cuda_spec }} {% endif %} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} From aca55adc9557a7d21d9653594a345d5180ef074e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 26 May 2023 12:36:23 -0500 Subject: [PATCH 33/55] Use cuda-version. --- dependencies.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index acced7e3c..2ca6f8215 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -91,7 +91,8 @@ dependencies: - matrix: cuda: "12.0" packages: - - cuda-nvcc=12.0 + - cuda-version=12.0 + - cuda-nvcc - output_types: [conda, requirements, pyproject] matrices: - matrix: @@ -133,9 +134,7 @@ dependencies: - matrix: cuda: "12.0" packages: - - cuda-cudart=12.0 - - cuda-cudart-dev=12.0 - - cuda-cudart-static=12.0 + - cuda-version=12.0 develop: common: - output_types: [conda, requirements] From 585254575b5ca5c026b8e14e7d1ea8037514fe25 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 26 May 2023 16:25:29 -0500 Subject: [PATCH 34/55] Bump to numba>=0.57 for CUDA 12 support, with numpy>=1.21 to match numba's lower bound. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/rmm/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 5b54e3f40..59de4e796 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -11,8 +11,8 @@ dependencies: - fmt>=9.1.0,<10 - gcovr>=5.0 - ninja -- numba>=0.49 -- numpy>=1.19 +- numba>=0.57 +- numpy>=1.21 - nvcc_linux-64=11.8 - pre-commit - pytest diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 204351bd5..10e2b2d26 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -68,7 +68,7 @@ requirements: {% else %} - cuda-python >=12.1,<13.0 {% endif %} - - numba >=0.49 + - numba >=0.57 - numpy >=1.19 test: diff --git a/dependencies.yaml b/dependencies.yaml index 2ca6f8215..d9c2e58c9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,8 +169,8 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: - - numba>=0.49 - - numpy>=1.19 + - numba>=0.57 + - numpy>=1.21 specific: - output_types: [conda, requirements, pyproject] matrices: diff --git a/python/pyproject.toml b/python/pyproject.toml index 3977314ee..a9b2867aa 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -37,8 +37,8 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "cuda-python>=11.7.1,<12.0", - "numba>=0.49", - "numpy>=1.19", + "numba>=0.57", + "numpy>=1.21", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", From 44dc0dbca5ddd78aecf235213f5378b821506b27 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 30 May 2023 13:51:12 -0500 Subject: [PATCH 35/55] Pin cuda-version for both CUDA 11 and 12. --- conda/recipes/librmm/meta.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 489f370f5..1c5d040c5 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -77,10 +77,9 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "11" %} - - cudatoolkit {{ cuda_spec }} - {% else %} - - cuda-version {{ cuda_spec }} + - cudatoolkit {% endif %} + - cuda-version {{ cuda_spec }} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} test: @@ -138,10 +137,9 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "11" %} - - cudatoolkit {{ cuda_spec }} - {% else %} - - cuda-version {{ cuda_spec }} + - cudatoolkit {% endif %} + - cuda-version {{ cuda_spec }} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} - gmock {{ gtest_version }} From 4703e2b2c5a2db2f1bae72a1dc73ba18d16189aa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Jun 2023 10:02:34 -0500 Subject: [PATCH 36/55] Add back workflows for Python, etc. --- .github/workflows/pr.yaml | 90 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b17669682..b3a3998e8 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -15,11 +15,11 @@ jobs: - checks - conda-cpp-build - conda-cpp-tests - #- conda-python-build - #- conda-python-tests - #- docs-build - #- wheel-build - #- wheel-tests + - conda-python-build + - conda-python-tests + - docs-build + - wheel-build + - wheel-tests secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 checks: @@ -39,43 +39,43 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120 with: build_type: pull-request - #conda-python-build: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 - # with: - # build_type: pull-request - #conda-python-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 - # with: - # build_type: pull-request - #docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci:latest" - # run_script: "ci/build_docs.sh" - #wheel-build: - # needs: checks - # secrets: inherit - # uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 - # with: - # build_type: pull-request - # package-dir: python - # package-name: rmm - # skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" - #wheel-tests: - # needs: wheel-build - # secrets: inherit - # uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 - # with: - # build_type: pull-request - # package-name: rmm - # test-unittest: "python -m pytest ./python/rmm/tests" - # test-smoketest: "python ./ci/wheel_smoke_test.py" + conda-python-build: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 + with: + build_type: pull-request + conda-python-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 + with: + build_type: pull-request + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci:latest" + run_script: "ci/build_docs.sh" + wheel-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + with: + build_type: pull-request + package-dir: python + package-name: rmm + skbuild-configure-options: "-DRMM_BUILD_WHEELS=ON" + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + with: + build_type: pull-request + package-name: rmm + test-unittest: "python -m pytest ./python/rmm/tests" + test-smoketest: "python ./ci/wheel_smoke_test.py" From a45a93b268930519127847d985c268232bb09f2d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Jun 2023 19:20:08 -0500 Subject: [PATCH 37/55] Always pin to cuda-version according to major spec. --- conda/recipes/rmm/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index ca17f49d3..d97f54bc1 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -62,6 +62,7 @@ requirements: - setuptools >=61.0.0 - tomli # [py<311] run: + - cuda-version {{ cuda_spec }} {% if cuda_major == "11" %} - cuda-python >=11.7.1,<12.0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} From 4a1a701852d970c4e78b68a8e5bc2aae486fe3ca Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 13 Jun 2023 14:59:36 -0700 Subject: [PATCH 38/55] Set cuda_spec --- conda/recipes/rmm/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 64ac73370..cc63329ca 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -3,6 +3,7 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} {% 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 py_version = environ['CONDA_PY'] %} {% set date_string = environ['RAPIDS_DATE_STRING'] %} From b5d6a2f6710888ddcdd71f6063e8b16507c85c08 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 13 Jun 2023 19:36:07 -0500 Subject: [PATCH 39/55] Remove extra line. --- conda/recipes/rmm/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index cc63329ca..3039135e8 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -47,7 +47,6 @@ requirements: - cuda-version {{ cuda_version }} - {{ compiler('cuda') }} {% endif %} - - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} From 3ab055f238934e4ccc9b5fcd95ac94604f5b39f8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 14 Jun 2023 08:48:41 -0500 Subject: [PATCH 40/55] Don't allow alphas of cuda-python. --- conda/recipes/rmm/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 3039135e8..c00418198 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -51,9 +51,9 @@ requirements: host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} - - cuda-python >=11.7.1,<12.0 + - cuda-python >=11.7.1,<12.0a0 {% else %} - - cuda-python >=12.0,<13.0 + - cuda-python >=12.0,<13.0a0 {% endif %} - cython >=0.29,<0.30 - librmm ={{ version }}*=cuda{{ cuda_major }}* From 64a77b6935ad3617837139ee6d47c48b490c666b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 14:48:37 -0500 Subject: [PATCH 41/55] Revise cuda-version usage. --- conda/recipes/librmm/meta.yaml | 4 ++-- conda/recipes/rmm/meta.yaml | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 1c5d040c5..f31c9ffac 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -21,9 +21,9 @@ requirements: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} - - cuda-version {{ cuda_version }} - {{ compiler('cuda') }} {% endif %} + - cuda-version ={{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} @@ -77,7 +77,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "11" %} - - cudatoolkit + - cudatoolkit {{ cuda_spec }} {% endif %} - cuda-version {{ cuda_spec }} - fmt {{ fmt_version }} diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index c00418198..d0f473ae6 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -44,9 +44,9 @@ requirements: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} {{ cuda_version }} {% else %} - - cuda-version {{ cuda_version }} - {{ compiler('cuda') }} {% endif %} + - cuda-version ={{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: {% if cuda_major == "11" %} @@ -55,8 +55,9 @@ requirements: {% else %} - cuda-python >=12.0,<13.0a0 {% endif %} + - cuda-version ={{ cuda_version }} - cython >=0.29,<0.30 - - librmm ={{ version }}*=cuda{{ cuda_major }}* + - librmm ={{ version }} - python - scikit-build >=0.13.1 - setuptools >=61.0.0 @@ -64,11 +65,12 @@ requirements: run: - cuda-version {{ cuda_spec }} {% if cuda_major == "11" %} - - cuda-python >=11.7.1,<12.0 + - cuda-python >=11.7.1,<12.0a0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} {% else %} - - cuda-python >=12.0,<13.0 + - cuda-python >=12.0,<13.0a0 {% endif %} + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - numba >=0.57 - numpy >=1.21 From 0aeae568915aeba6696b7ff3cb6831304fa1f17d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 14:50:01 -0500 Subject: [PATCH 42/55] Replace cudatoolkit with cuda-version in host on CUDA 11. Co-authored-by: jakirkham --- conda/recipes/librmm/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index f31c9ffac..8b3e4b676 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -26,9 +26,7 @@ requirements: - cuda-version ={{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {% if cuda_major == "11" %} - - cudatoolkit ={{ cuda_version }} - {% endif %} + - cuda-version ={{ cuda_version }} # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not # pulled by CPM and installed as a part of the rmm packages. However, From 58bb021b47e6288c300b2c72e88e02d2575ff521 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 14:52:31 -0500 Subject: [PATCH 43/55] Fix cuda_spec. --- conda/recipes/librmm/meta.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index f31c9ffac..fa93e1b37 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -137,7 +137,7 @@ outputs: - cmake {{ cmake_version }} run: {% if cuda_major == "11" %} - - cudatoolkit + - cudatoolkit {{ cuda_spec }} {% endif %} - cuda-version {{ cuda_spec }} - {{ pin_subpackage('librmm', exact=True) }} diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index d0f473ae6..5b018c2c3 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -3,7 +3,6 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} {% 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 py_version = environ['CONDA_PY'] %} {% set date_string = environ['RAPIDS_DATE_STRING'] %} @@ -63,7 +62,6 @@ requirements: - setuptools >=61.0.0 - tomli # [py<311] run: - - cuda-version {{ cuda_spec }} {% if cuda_major == "11" %} - cuda-python >=11.7.1,<12.0a0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} From a07dd1c5ae82e84dc2ba8df75d8a089e1db5f4bd Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 15:06:43 -0500 Subject: [PATCH 44/55] Specify CUDA 11 versions to avoid breakage in newer CUDA versions than 12.0. --- dependencies.yaml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index b6ad1864a..c33889b20 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -98,10 +98,27 @@ dependencies: - matrix: cuda: "12.0" packages: - - &cuda_python12 cuda-python>=12.0,<13.0 - - matrix: # All CUDA 11 versions + - &cuda_python12 cuda-python>=12.0,<13.0a0 + - matrix: + cuda: "11.8" + packages: + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - matrix: + cuda: "11.6" + packages: + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - matrix: + cuda: "11.5" + packages: + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - matrix: + cuda: "11.4" + packages: + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - matrix: + cuda: "11.2" packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0 + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 checks: common: - output_types: [conda, requirements] From 2fbc09c6a1273030c5f0458f94920391d4302d7d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 15:19:14 -0500 Subject: [PATCH 45/55] Improve cuda-python dependency spec. --- dependencies.yaml | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c33889b20..6e2e4cd90 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -94,31 +94,31 @@ dependencies: - cuda-version=12.0 - cuda-nvcc - output_types: [conda, requirements, pyproject] - matrices: - - matrix: - cuda: "12.0" - packages: - - &cuda_python12 cuda-python>=12.0,<13.0a0 + matrices: &cuda_python_matrix - matrix: - cuda: "11.8" + cuda: "11.2" packages: - &cuda_python11 cuda-python>=11.7.1,<12.0a0 - matrix: - cuda: "11.6" + cuda: "11.4" packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - *cuda_python11 - matrix: cuda: "11.5" packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - *cuda_python11 - matrix: - cuda: "11.4" + cuda: "11.6" packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - *cuda_python11 - matrix: - cuda: "11.2" + cuda: "11.8" packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0a0 + - *cuda_python11 + - matrix: + cuda: "12.0" + packages: + - &cuda_python12 cuda-python>=12.0,<13.0a0 checks: common: - output_types: [conda, requirements] @@ -190,14 +190,7 @@ dependencies: - numpy>=1.21 specific: - output_types: [conda, requirements, pyproject] - matrices: - - matrix: - cuda: "12.0" - packages: - - *cuda_python12 - - matrix: # All CUDA 11 versions - packages: - - *cuda_python11 + <<: *cuda_python_matrix test_cpp: common: - output_types: conda From d2d805200a8a21353d86aa791479b0c7a3289ab0 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 18:11:42 -0500 Subject: [PATCH 46/55] Fix dependencies.yaml. --- dependencies.yaml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 6e2e4cd90..1143afd75 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -190,7 +190,31 @@ dependencies: - numpy>=1.21 specific: - output_types: [conda, requirements, pyproject] - <<: *cuda_python_matrix + matrices: &cuda_python_matrix + - matrix: + cuda: "11.2" + packages: + - *cuda_python11 + - matrix: + cuda: "11.4" + packages: + - *cuda_python11 + - matrix: + cuda: "11.5" + packages: + - *cuda_python11 + - matrix: + cuda: "11.6" + packages: + - *cuda_python11 + - matrix: + cuda: "11.8" + packages: + - *cuda_python11 + - matrix: + cuda: "12.0" + packages: + - *cuda_python12 test_cpp: common: - output_types: conda From 7509fff6960e9c9346127702278fdd95a11032e9 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 18:20:15 -0500 Subject: [PATCH 47/55] Revert changes to cuda-python in dependencies.yaml. --- dependencies.yaml | 52 ++++++++--------------------------------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1143afd75..b6ad1864a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -94,31 +94,14 @@ dependencies: - cuda-version=12.0 - cuda-nvcc - output_types: [conda, requirements, pyproject] - matrices: &cuda_python_matrix - - matrix: - cuda: "11.2" - packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0a0 - - matrix: - cuda: "11.4" - packages: - - *cuda_python11 - - matrix: - cuda: "11.5" - packages: - - *cuda_python11 - - matrix: - cuda: "11.6" - packages: - - *cuda_python11 - - matrix: - cuda: "11.8" - packages: - - *cuda_python11 + matrices: - matrix: cuda: "12.0" packages: - - &cuda_python12 cuda-python>=12.0,<13.0a0 + - &cuda_python12 cuda-python>=12.0,<13.0 + - matrix: # All CUDA 11 versions + packages: + - &cuda_python11 cuda-python>=11.7.1,<12.0 checks: common: - output_types: [conda, requirements] @@ -190,31 +173,14 @@ dependencies: - numpy>=1.21 specific: - output_types: [conda, requirements, pyproject] - matrices: &cuda_python_matrix - - matrix: - cuda: "11.2" - packages: - - *cuda_python11 - - matrix: - cuda: "11.4" - packages: - - *cuda_python11 - - matrix: - cuda: "11.5" - packages: - - *cuda_python11 - - matrix: - cuda: "11.6" - packages: - - *cuda_python11 - - matrix: - cuda: "11.8" - packages: - - *cuda_python11 + matrices: - matrix: cuda: "12.0" packages: - *cuda_python12 + - matrix: # All CUDA 11 versions + packages: + - *cuda_python11 test_cpp: common: - output_types: conda From 865f70789dbaa09a2ade4b29d7a0238050020cdc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 21:03:10 -0500 Subject: [PATCH 48/55] Add cuda-cudart-dev to CUDA 12 host dependencies. --- conda/recipes/rmm/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 5b018c2c3..2364ccea2 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -52,6 +52,7 @@ requirements: - cudatoolkit ={{ cuda_version }} - cuda-python >=11.7.1,<12.0a0 {% else %} + - cuda-cudart-dev - cuda-python >=12.0,<13.0a0 {% endif %} - cuda-version ={{ cuda_version }} From 32130818b161cf97f92b717bcd7c93ba48a45439 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 20 Jun 2023 21:24:52 -0500 Subject: [PATCH 49/55] Get cuda-python via run_exports from host. Co-authored-by: jakirkham --- conda/recipes/rmm/meta.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 2364ccea2..994ed042b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -50,10 +50,10 @@ requirements: host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} - - cuda-python >=11.7.1,<12.0a0 + - cuda-python 11.7.1 {% else %} - cuda-cudart-dev - - cuda-python >=12.0,<13.0a0 + - cuda-python 12.0 {% endif %} - cuda-version ={{ cuda_version }} - cython >=0.29,<0.30 @@ -64,10 +64,7 @@ requirements: - tomli # [py<311] run: {% if cuda_major == "11" %} - - cuda-python >=11.7.1,<12.0a0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - {% else %} - - cuda-python >=12.0,<13.0a0 {% endif %} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - numba >=0.57 From b2b3b29819fc7376e585a2b2dfe194acac69f659 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 21 Jun 2023 08:28:33 -0500 Subject: [PATCH 50/55] Update conda/recipes/librmm/meta.yaml Co-authored-by: jakirkham --- conda/recipes/librmm/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 3eef05f70..c6c358a5e 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -133,6 +133,13 @@ outputs: requirements: build: - cmake {{ cmake_version }} + host: + - cuda-version ={{ cuda_version }} + {% if cuda_major == "11" %} + - cudatoolkit ={{ cuda_version }} + {% else %} + - cuda-cudart-dev + {% endif %} run: {% if cuda_major == "11" %} - cudatoolkit {{ cuda_spec }} From a1156d6fa1e52f3d3ca8615daf2a5d241ef0fdb2 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 21 Jun 2023 11:01:15 -0500 Subject: [PATCH 51/55] Fix ignore_run_exports_from. --- conda/recipes/librmm/meta.yaml | 4 ---- conda/recipes/rmm/meta.yaml | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index c6c358a5e..57aee4cdc 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -67,8 +67,6 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} - {% else %} - - {{ compiler('cuda') }} {% endif %} requirements: build: @@ -127,8 +125,6 @@ outputs: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} - {% else %} - - {{ compiler('cuda') }} {% endif %} requirements: build: diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 994ed042b..43d599d61 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -32,7 +32,9 @@ build: - SCCACHE_S3_USE_SSL - SCCACHE_S3_NO_CREDENTIALS ignore_run_exports_from: - - {{ compiler('cuda') }} + {% if cuda_major == "11" %} + - {{ compiler('cuda11') }} + {% endif %} requirements: build: From 3b74582282f7b863a410feab302b557bc1631b8b Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 21 Jun 2023 14:47:01 -0400 Subject: [PATCH 52/55] Apply suggestions from code review --- conda/recipes/rmm/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 43d599d61..0f19f461b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -52,10 +52,10 @@ requirements: host: {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} - - cuda-python 11.7.1 + - cuda-python ==11.7.1 {% else %} - cuda-cudart-dev - - cuda-python 12.0 + - cuda-python ==12.0 {% endif %} - cuda-version ={{ cuda_version }} - cython >=0.29,<0.30 From c0f9368c3f0f1eade7d084b94081594a184d125f Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 21 Jun 2023 13:56:12 -0500 Subject: [PATCH 53/55] Add CUDA 12 environment. --- .../all_cuda-120_arch-x86_64.yaml | 24 +++++++++++++++++++ dependencies.yaml | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 conda/environments/all_cuda-120_arch-x86_64.yaml diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml new file mode 100644 index 000000000..5e934f1af --- /dev/null +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -0,0 +1,24 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- conda-forge +dependencies: +- cmake>=3.26.4 +- cuda-nvcc +- cuda-python>=12.0,<13.0 +- cuda-version=12.0 +- cython>=0.29,<0.30 +- fmt>=9.1.0,<10 +- gcovr>=5.0 +- ninja +- numba>=0.57 +- numpy>=1.21 +- pre-commit +- pytest +- pytest-cov +- python>=3.9,<3.11 +- scikit-build>=0.13.1 +- spdlog>=1.11.0,<1.12 +- tomli +name: all_cuda-120_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index b6ad1864a..c4cf5cb77 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["11.8"] + cuda: ["11.8", "12.0"] arch: [x86_64] includes: - build From 748c7b5ee6498ae61b6db155d6421afbd7d35ff5 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 21 Jun 2023 13:57:50 -0500 Subject: [PATCH 54/55] Fix cuda-python pinnings to prevent alphas. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/pyproject.toml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 6a30b5f40..9af75b762 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -5,7 +5,7 @@ channels: - conda-forge dependencies: - cmake>=3.26.4 -- cuda-python>=11.7.1,<12.0 +- cuda-python>=11.7.1,<12.0a0 - cudatoolkit=11.8 - cython>=0.29,<0.30 - fmt>=9.1.0,<10 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 5e934f1af..ebbdc7758 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -6,7 +6,7 @@ channels: dependencies: - cmake>=3.26.4 - cuda-nvcc -- cuda-python>=12.0,<13.0 +- cuda-python>=12.0,<13.0a0 - cuda-version=12.0 - cython>=0.29,<0.30 - fmt>=9.1.0,<10 diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 0f19f461b..4d915db02 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -55,7 +55,7 @@ requirements: - cuda-python ==11.7.1 {% else %} - cuda-cudart-dev - - cuda-python ==12.0 + - cuda-python ==12.0.0 {% endif %} - cuda-version ={{ cuda_version }} - cython >=0.29,<0.30 diff --git a/dependencies.yaml b/dependencies.yaml index c4cf5cb77..20d9cb8b6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -98,10 +98,10 @@ dependencies: - matrix: cuda: "12.0" packages: - - &cuda_python12 cuda-python>=12.0,<13.0 + - &cuda_python12 cuda-python>=12.0,<13.0a0 - matrix: # All CUDA 11 versions packages: - - &cuda_python11 cuda-python>=11.7.1,<12.0 + - &cuda_python11 cuda-python>=11.7.1,<12.0a0 checks: common: - output_types: [conda, requirements] diff --git a/python/pyproject.toml b/python/pyproject.toml index 0d917afb1..58ac1d5ad 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -16,7 +16,7 @@ build-backend = "setuptools.build_meta" requires = [ "cmake>=3.26.4", - "cuda-python>=11.7.1,<12.0", + "cuda-python>=11.7.1,<12.0a0", "cython>=0.29,<0.30", "ninja", "scikit-build>=0.13.1", @@ -36,7 +36,7 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ - "cuda-python>=11.7.1,<12.0", + "cuda-python>=11.7.1,<12.0a0", "numba>=0.57", "numpy>=1.21", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. From 56f8d598a437969e2e82e9378b03f3a0a996e1ec Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 21 Jun 2023 14:11:08 -0500 Subject: [PATCH 55/55] Use pin_compatible. --- conda/recipes/librmm/meta.yaml | 4 ++-- conda/recipes/rmm/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 57aee4cdc..7895a4afb 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -138,9 +138,9 @@ outputs: {% endif %} run: {% if cuda_major == "11" %} - - cudatoolkit {{ cuda_spec }} + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} {% endif %} - - cuda-version {{ cuda_spec }} + - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - {{ pin_subpackage('librmm', exact=True) }} - gtest {{ gtest_version }} - gmock {{ gtest_version }} diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 4d915db02..d97871a90 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -50,6 +50,7 @@ requirements: - cuda-version ={{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: + - cuda-version ={{ cuda_version }} {% if cuda_major == "11" %} - cudatoolkit ={{ cuda_version }} - cuda-python ==11.7.1 @@ -57,7 +58,6 @@ requirements: - cuda-cudart-dev - cuda-python ==12.0.0 {% endif %} - - cuda-version ={{ cuda_version }} - cython >=0.29,<0.30 - librmm ={{ version }} - python