From 367052cde52e117e873ef0992913924ff64cd761 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 25 Mar 2024 14:17:47 -0500 Subject: [PATCH 01/13] prevent path conflicts --- ci/build_cpp.sh | 1 + ci/build_python.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2778c2a7d7..3c33c369f8 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -16,6 +16,7 @@ rapids-print-env version=$(rapids-generate-version) rapids-logger "Begin cpp build" +conda config --set path_conflict prevent RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft diff --git a/ci/build_python.sh b/ci/build_python.sh index a8b76269ae..5a070aef16 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -28,6 +28,7 @@ for package_name in pylibraft raft-dask; do sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/${underscore_package_name}/_version.py" done +conda config --set path_conflict prevent # TODO: Remove `--no-test` flags once importing on a CPU # node works correctly rapids-conda-retry mambabuild \ From a0ae8bce129bbff620f4e68434f230a9c23acb42 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 11:46:07 -0500 Subject: [PATCH 02/13] move librmm to host --- ci/build_cpp.sh | 2 +- conda/recipes/libraft/meta.yaml | 4 ++-- scratch.md | 0 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 scratch.md diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2778c2a7d7..15f007a629 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -19,4 +19,4 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft -rapids-upload-conda-to-s3 cpp +#rapids-upload-conda-to-s3 cpp diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index c4fd0aa0b6..b55fd20b9f 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -64,6 +64,7 @@ outputs: {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} + - librmm ={{ minor_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} @@ -71,7 +72,6 @@ outputs: {% else %} - cuda-cudart {% endif %} - - librmm ={{ minor_version }} - spdlog {{ spdlog_version }} - fmt {{ fmt_version }} about: @@ -93,9 +93,9 @@ outputs: requirements: host: - cuda-version ={{ cuda_version }} + - librmm ={{ minor_version }} run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} - - librmm ={{ minor_version }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit diff --git a/scratch.md b/scratch.md new file mode 100644 index 0000000000..e69de29bb2 From a7554bab1d2264415db182aba700c9e7045fa9f5 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 10:05:54 -0500 Subject: [PATCH 03/13] try pulling in rmm CI artifacts --- ci/build_cpp.sh | 6 +++++- ci/build_python.sh | 10 ++++++++++ ci/test_cpp.sh | 5 +++++ ci/test_python.sh | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 15f007a629..70f7951543 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -13,10 +13,14 @@ export CMAKE_GENERATOR=Ninja rapids-print-env +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) + version=$(rapids-generate-version) rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft +RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry \ + --channel "${LIBRMM_CHANNEL}" \ + mambabuild conda/recipes/libraft #rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index a8b76269ae..80ae2c5308 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,6 +16,8 @@ rapids-print-env rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) @@ -33,12 +35,16 @@ done rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/pylibraft rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-dask # Build ann-bench for each cuda and python version @@ -46,6 +52,8 @@ rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python @@ -56,6 +64,8 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench-cpu fi diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index f83ddf616d..5e4e89d83f 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -22,6 +22,9 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -29,6 +32,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libraft-headers libraft libraft-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index f5b188ca0b..28cca5e86a 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -25,6 +25,9 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" @@ -34,6 +37,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libraft libraft-headers pylibraft raft-dask rapids-logger "Check GPU usage" From d16a4da7a8f5c8e04d6d36499d3e9a1d50e9e935 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 11:46:07 -0500 Subject: [PATCH 04/13] move librmm to host --- ci/build_cpp.sh | 2 +- conda/recipes/libraft/meta.yaml | 4 ++-- scratch.md | 0 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 scratch.md diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2778c2a7d7..15f007a629 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -19,4 +19,4 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft -rapids-upload-conda-to-s3 cpp +#rapids-upload-conda-to-s3 cpp diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index c4fd0aa0b6..b55fd20b9f 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -64,6 +64,7 @@ outputs: {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} + - librmm ={{ minor_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} @@ -71,7 +72,6 @@ outputs: {% else %} - cuda-cudart {% endif %} - - librmm ={{ minor_version }} - spdlog {{ spdlog_version }} - fmt {{ fmt_version }} about: @@ -93,9 +93,9 @@ outputs: requirements: host: - cuda-version ={{ cuda_version }} + - librmm ={{ minor_version }} run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} - - librmm ={{ minor_version }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit diff --git a/scratch.md b/scratch.md new file mode 100644 index 0000000000..e69de29bb2 From 9494cfeb9668005b3599965e0662596c730f191a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 10:07:02 -0700 Subject: [PATCH 05/13] more notes --- scratch.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scratch.md b/scratch.md index e69de29bb2..43229486df 100644 --- a/scratch.md +++ b/scratch.md @@ -0,0 +1,11 @@ +```shell +docker run \ + --rm \ + -v $(pwd):/opt/work \ + -w /opt/work \ + -it rapidsai/ci-conda:cuda12.2.2-ubuntu22.04-py3.9-amd64 \ + bash + +# do a 'librmm' conda build +ci/build_cpp.sh +``` From 05476849a7c9a8a505d2ede4bff8f0e0104bb090 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 29 Apr 2024 14:38:24 -0700 Subject: [PATCH 06/13] more debugging --- scratch.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/scratch.md b/scratch.md index 43229486df..112e8e26ec 100644 --- a/scratch.md +++ b/scratch.md @@ -3,9 +3,26 @@ docker run \ --rm \ -v $(pwd):/opt/work \ -w /opt/work \ - -it rapidsai/ci-conda:cuda12.2.2-ubuntu22.04-py3.9-amd64 \ + -it rapidsai/ci-conda:cuda12.2.2-ubuntu22.04-py3.10 \ bash -# do a 'librmm' conda build +# do a 'libraft' conda build ci/build_cpp.sh ``` + +* https://github.com/mozilla/sccache/pull/1403 +* https://github.com/mozilla/sccache/blob/887ae9086146d1cfdbdd0a3bc568c77c80ac3a08/src/config.rs#L659-L664 +* https://github.com/rapidsai/gha-tools/pull/57/files#r1268405346 + +Supposedly: + +```text +/opt/conda/lib/python3.10/site-packages/conda_build/environ.py:551: UserWarning: The environment variable 'AWS_ACCESS_KEY_ID' specified in script_env is undefined. + warnings.warn( +``` + +> If a listed environment variable is missing from the environment seen by the conda-build process itself, a UserWarning is emitted during the build process and the variable remains undefined. + +https://docs.conda.io/projects/conda-build/en/stable/resources/define-metadata.html#use-environment-variables + +that's coming from here: https://github.com/conda/conda-build/blob/3e9fe719aecc61c92cdfc20fe131cde1c36e3a3c/conda_build/environ.py#L532 From 3e6489bbdc010e9a3b6de13697339baf9ff24569 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Apr 2024 12:41:05 -0700 Subject: [PATCH 07/13] remove unnecessary stuff --- ci/build_cpp.sh | 6 +----- ci/build_python.sh | 10 ---------- ci/test_cpp.sh | 4 ---- ci/test_python.sh | 5 ----- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 70f7951543..15f007a629 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -13,14 +13,10 @@ export CMAKE_GENERATOR=Ninja rapids-print-env -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) - version=$(rapids-generate-version) rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry \ - --channel "${LIBRMM_CHANNEL}" \ - mambabuild conda/recipes/libraft +RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft #rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 80ae2c5308..a8b76269ae 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,8 +16,6 @@ rapids-print-env rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) @@ -35,16 +33,12 @@ done rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ conda/recipes/pylibraft rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ conda/recipes/raft-dask # Build ann-bench for each cuda and python version @@ -52,8 +46,6 @@ rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python @@ -64,8 +56,6 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench-cpu fi diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 5e4e89d83f..c643d287e7 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -22,8 +22,6 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -32,8 +30,6 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ libraft-headers libraft libraft-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index 28cca5e86a..f5b188ca0b 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -25,9 +25,6 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) - RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" @@ -37,8 +34,6 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ libraft libraft-headers pylibraft raft-dask rapids-logger "Check GPU usage" From 1e0e228326f5206802dc4989823ddc57d2d61bbe Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Apr 2024 12:41:40 -0700 Subject: [PATCH 08/13] one more line --- ci/test_cpp.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index c643d287e7..f83ddf616d 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -22,7 +22,6 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) - RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" From ee7eca8e5ab6a40bc0b7762e011785ef21005433 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Apr 2024 14:17:23 -0700 Subject: [PATCH 09/13] add 'run' pinnings --- conda/recipes/libraft/meta.yaml | 2 ++ scratch.md | 28 ---------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 scratch.md diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index b55fd20b9f..a516bdf0c4 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -67,6 +67,7 @@ outputs: - librmm ={{ minor_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} + - {{ pin_compatible('librmm', max_pin='x.x') }} {% if cuda_major == "11" %} - cudatoolkit {% else %} @@ -96,6 +97,7 @@ outputs: - librmm ={{ minor_version }} run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} + - {{ pin_compatible('librmm', max_pin='x.x') }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit diff --git a/scratch.md b/scratch.md deleted file mode 100644 index 112e8e26ec..0000000000 --- a/scratch.md +++ /dev/null @@ -1,28 +0,0 @@ -```shell -docker run \ - --rm \ - -v $(pwd):/opt/work \ - -w /opt/work \ - -it rapidsai/ci-conda:cuda12.2.2-ubuntu22.04-py3.10 \ - bash - -# do a 'libraft' conda build -ci/build_cpp.sh -``` - -* https://github.com/mozilla/sccache/pull/1403 -* https://github.com/mozilla/sccache/blob/887ae9086146d1cfdbdd0a3bc568c77c80ac3a08/src/config.rs#L659-L664 -* https://github.com/rapidsai/gha-tools/pull/57/files#r1268405346 - -Supposedly: - -```text -/opt/conda/lib/python3.10/site-packages/conda_build/environ.py:551: UserWarning: The environment variable 'AWS_ACCESS_KEY_ID' specified in script_env is undefined. - warnings.warn( -``` - -> If a listed environment variable is missing from the environment seen by the conda-build process itself, a UserWarning is emitted during the build process and the variable remains undefined. - -https://docs.conda.io/projects/conda-build/en/stable/resources/define-metadata.html#use-environment-variables - -that's coming from here: https://github.com/conda/conda-build/blob/3e9fe719aecc61c92cdfc20fe131cde1c36e3a3c/conda_build/environ.py#L532 From 30355f2d187098a1e57d420929226812aa1eadd8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Apr 2024 14:31:19 -0700 Subject: [PATCH 10/13] uncomment upload step --- ci/build_cpp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 15f007a629..2778c2a7d7 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -19,4 +19,4 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft -#rapids-upload-conda-to-s3 cpp +rapids-upload-conda-to-s3 cpp From 476f606d88357ce2c4e7bc57a779ade6da79d91e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Apr 2024 14:58:11 -0700 Subject: [PATCH 11/13] use minor_version instead of pin_compatible for leading-0 version numbers --- conda/recipes/libraft/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index a516bdf0c4..8a92890573 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -67,7 +67,7 @@ outputs: - librmm ={{ minor_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - - {{ pin_compatible('librmm', max_pin='x.x') }} + - librmm ={{ minor_version }} {% if cuda_major == "11" %} - cudatoolkit {% else %} @@ -97,7 +97,7 @@ outputs: - librmm ={{ minor_version }} run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} - - {{ pin_compatible('librmm', max_pin='x.x') }} + - librmm ={{ minor_version }} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit From 5dcb2f40b8eaaa08ef8aed22a3d24b46d30e6af2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 1 May 2024 07:30:36 -0700 Subject: [PATCH 12/13] revert unnecessary diff caused by re-ordering --- conda/recipes/libraft/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 8a92890573..aa2d905d14 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -67,12 +67,12 @@ outputs: - librmm ={{ minor_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - - librmm ={{ minor_version }} {% if cuda_major == "11" %} - cudatoolkit {% else %} - cuda-cudart {% endif %} + - librmm ={{ minor_version }} - spdlog {{ spdlog_version }} - fmt {{ fmt_version }} about: From bf5bafd5de38f4bc1027ea538d6c10b0c75f759a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 2 May 2024 13:48:40 -0500 Subject: [PATCH 13/13] empty commit to re-trigger CI