From 867452b745535070db9ad0f824078422433e05f6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 11:00:29 -0500 Subject: [PATCH 01/17] Update fmt (to 11.0.2) and spdlog (to 1.14.1). --- conda/recipes/libraft/conda_build_config.yaml | 4 ++-- conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml | 4 ++-- cpp/template/cmake/thirdparty/fetch_rapids.cmake | 2 ++ rapids_config.cmake | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml index 00b133c821..5c0047fb9c 100644 --- a/conda/recipes/libraft/conda_build_config.yaml +++ b/conda/recipes/libraft/conda_build_config.yaml @@ -73,7 +73,7 @@ cuda11_cuda_profiler_api_run_version: - ">=11.4.240,<12" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.14.1,<1.15" fmt_version: - - ">=10.1.1,<11" + - ">=11.0.2,<12" diff --git a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml index 70d1f0490e..ed6f708e14 100644 --- a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml +++ b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml @@ -23,7 +23,7 @@ nlohmann_json_version: - ">=3.11.2" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.14.1,<1.15" fmt_version: - - ">=10.1.1,<11" + - ">=11.0.2,<12" diff --git a/cpp/template/cmake/thirdparty/fetch_rapids.cmake b/cpp/template/cmake/thirdparty/fetch_rapids.cmake index f64a924cf5..69229c07d1 100644 --- a/cpp/template/cmake/thirdparty/fetch_rapids.cmake +++ b/cpp/template/cmake/thirdparty/fetch_rapids.cmake @@ -13,6 +13,8 @@ # Use this variable to update RAPIDS and RAFT versions set(RAPIDS_VERSION "24.10") + set(rapids-cmake-repo jameslamb/rapids-cmake) + set(rapids-cmake-branch fmt-and-spdlog) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION}/RAPIDS.cmake diff --git a/rapids_config.cmake b/rapids_config.cmake index c8077f7f4b..80794e1dad 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,8 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + set(rapids-cmake-repo jameslamb/rapids-cmake) + set(rapids-cmake-branch fmt-and-spdlog) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From 2a6aeea61dc33621f985be186ef0992d3da81333 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 13:12:37 -0500 Subject: [PATCH 02/17] use rmm and ucxx CI artifacts --- ci/build_cpp.sh | 10 +++++++++- ci/build_python.sh | 16 ++++++++++++++++ ci/test_cpp.sh | 8 ++++++++ ci/test_python.sh | 10 ++++++++++ cpp/cmake/thirdparty/get_spdlog.cmake | 11 +---------- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index c456bcae80..9dce4cee56 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -15,6 +15,14 @@ rapids-print-env rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libraft +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) +UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) + +RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${UCXX_CHANNEL}" \ + conda/recipes/libraft rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 80d37b5ae3..40902bac3a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -17,6 +17,10 @@ rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) +UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) + version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) export RAPIDS_PACKAGE_VERSION=${version} @@ -27,12 +31,18 @@ echo "${version}" > VERSION rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${UCXX_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}" \ + --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-dask # Build ann-bench for each cuda and python version @@ -40,6 +50,9 @@ rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python @@ -50,6 +63,9 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-ann-bench-cpu fi diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 05323e4f5d..be990c026a 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -8,10 +8,17 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ . /opt/conda/etc/profile.d/conda.sh +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) +UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) + rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ + --prepend-channel "${LIBRMM_CHANNEL}" \ + --prepend-channel "${RMM_CHANNEL}" \ + --prepend-channel "${UCXX_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test @@ -29,6 +36,7 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${UCXX_CHANNEL}" \ libraft-headers libraft libraft-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index 01e5ac9456..34c81b04d6 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -8,10 +8,17 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ . /opt/conda/etc/profile.d/conda.sh +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) +UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) + rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_python \ + --prepend-channel "${LIBRMM_CHANNEL}" \ + --prepend-channel "${RMM_CHANNEL}" \ + --prepend-channel "${UCXX_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test @@ -34,6 +41,9 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${UCXX_CHANNEL}" \ libraft libraft-headers pylibraft raft-dask rapids-logger "Check GPU usage" diff --git a/cpp/cmake/thirdparty/get_spdlog.cmake b/cpp/cmake/thirdparty/get_spdlog.cmake index 7be7804c7e..57e38c2638 100644 --- a/cpp/cmake/thirdparty/get_spdlog.cmake +++ b/cpp/cmake/thirdparty/get_spdlog.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -19,15 +19,6 @@ function(find_and_configure_spdlog) rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) rapids_export_package(BUILD spdlog rmm-exports) - if(spdlog_ADDED) - rapids_export( - BUILD spdlog - EXPORT_SET spdlog - GLOBAL_TARGETS spdlog spdlog_header_only - NAMESPACE spdlog::) - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET rmm-exports) - endif() endfunction() find_and_configure_spdlog() \ No newline at end of file From b7c151e1ab3bfe2ee54a64f3b346fd287e6fda9f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 17:45:43 -0500 Subject: [PATCH 03/17] try using librmm wheels --- ci/build_wheel.sh | 10 +++++++++- ci/test_wheel_pylibraft.sh | 8 ++++++++ ci/test_wheel_raft_dask.sh | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index e7ae52f33a..edd467c007 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -39,8 +39,16 @@ case "${RAPIDS_CUDA_VERSION}" in ;; esac +LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) + +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "" >> /tmp/constraints.txt +export PIP_CONSTRAINT=/tmp/constraints.txt + # Hardcode the output dir -python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check +python -m pip wheel . -w dist -v --no-deps --disable-pip-version-check mkdir -p final_dist python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/* diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index b38f5a690b..7cd14dc227 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -7,6 +7,14 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist +LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) + +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "" >> /tmp/constraints.txt +export PIP_CONSTRAINT=/tmp/constraints.txt + # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/pylibraft*.whl)[test] diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index 9b1187592d..2d263d6d39 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -7,6 +7,14 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist +LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) + +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "" >> /tmp/constraints.txt +export PIP_CONSTRAINT=/tmp/constraints.txt + # Download the pylibraft built in the previous step RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-pylibraft-dep python -m pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl From f1b079312597a3dd6ebf1917369ea1ab378c16f5 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 19:51:45 -0500 Subject: [PATCH 04/17] try again to use rmm wheels --- ci/build_wheel.sh | 4 ++-- ci/test_wheel_pylibraft.sh | 4 ++-- ci/test_wheel_raft_dask.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index edd467c007..0f5260e651 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -39,8 +39,8 @@ case "${RAPIDS_CUDA_VERSION}" in ;; esac -LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) +LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") +RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index 7cd14dc227..1d7030dd50 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -7,8 +7,8 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) +LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") +RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index 2d263d6d39..b5e302eb15 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -7,8 +7,8 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-wheel-artifact rmm 1678 python) +LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") +RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt From d4ef11a485a2e643492bb43e9f8a771eaf8ce7d5 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 19:59:16 -0500 Subject: [PATCH 05/17] rapids-get-pr-wheel-artifact was missing RAPIDS_PY_WHEEL_NAME --- ci/build_wheel.sh | 8 ++++++-- ci/test_wheel_pylibraft.sh | 8 ++++++-- ci/test_wheel_raft_dask.sh | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 0f5260e651..bea8fdbfc1 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -39,8 +39,12 @@ case "${RAPIDS_CUDA_VERSION}" in ;; esac -LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") -RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") +LIBRMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp +) +RMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python +) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index 1d7030dd50..35d533987f 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -7,8 +7,12 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") -RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") +LIBRMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp +) +RMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python +) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index b5e302eb15..36a1890117 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -7,8 +7,12 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_cpp_rmm_${RAPIDS_PY_CUDA_SUFFIX}_x86_64.tar.gz") -RMM_CHANNEL=$(rapids-get-artifact "ci/rmm/pull-request/1678/4127d9c/rmm_wheel_python_rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./}_x86_64.tar.gz") +LIBRMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp +) +RMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python +) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt From 06fcda51cce6d95a8578da96a94cb0743e03a984 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 20:12:25 -0500 Subject: [PATCH 06/17] ok you do not need to provide the Python slug yourself for rapids-get-pr-wheel-artifact --- ci/build_wheel.sh | 2 +- ci/test_wheel_pylibraft.sh | 2 +- ci/test_wheel_raft_dask.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index bea8fdbfc1..a41689100c 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -43,7 +43,7 @@ LIBRMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp ) RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index 35d533987f..db3b9d2766 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -11,7 +11,7 @@ LIBRMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp ) RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index 36a1890117..d8a767b7e9 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -11,7 +11,7 @@ LIBRMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp ) RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX}_py${RAPIDS_PY_VERSION//./} rapids-get-pr-wheel-artifact rmm 1678 python + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt From 3b83970163b6ff24150d8bf8cceb0b53928622f8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Sep 2024 20:21:29 -0500 Subject: [PATCH 07/17] constraints need 'file://' protocol --- ci/build_wheel.sh | 4 ++-- ci/test_wheel_pylibraft.sh | 4 ++-- ci/test_wheel_raft_dask.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index a41689100c..99f22fdd9b 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -46,8 +46,8 @@ RMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt echo "" >> /tmp/constraints.txt export PIP_CONSTRAINT=/tmp/constraints.txt diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index db3b9d2766..9ac1db3dfe 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -14,8 +14,8 @@ RMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt echo "" >> /tmp/constraints.txt export PIP_CONSTRAINT=/tmp/constraints.txt diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index d8a767b7e9..7fbacaa306 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -14,8 +14,8 @@ RMM_CHANNEL=$( RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python ) -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ $(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt +echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt +echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt echo "" >> /tmp/constraints.txt export PIP_CONSTRAINT=/tmp/constraints.txt From 3ba2201d678cc8befdfcaa0e89630a95a00a78b2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 08:23:58 -0700 Subject: [PATCH 08/17] try suppressing unreachable-code diagnostics from nvcc (this should be narrowed down / upstreamed before merging) --- cpp/include/raft/cluster/detail/agglomerative.cuh | 2 ++ cpp/include/raft/cluster/detail/connectivities.cuh | 2 ++ cpp/include/raft/cluster/detail/kmeans.cuh | 2 ++ cpp/include/raft/cluster/detail/kmeans_balanced.cuh | 2 ++ cpp/include/raft/cluster/detail/kmeans_common.cuh | 2 ++ cpp/include/raft/cluster/detail/mst.cuh | 2 ++ cpp/include/raft/cluster/detail/single_linkage.cuh | 2 ++ cpp/include/raft/comms/detail/mpi_comms.hpp | 2 ++ cpp/include/raft/comms/detail/std_comms.hpp | 2 ++ cpp/include/raft/comms/detail/test.hpp | 2 ++ cpp/include/raft/core/detail/callback_sink.hpp | 2 ++ cpp/include/raft/core/detail/nvtx.hpp | 2 ++ cpp/include/raft/core/device_container_policy.hpp | 2 ++ cpp/include/raft/core/device_mdarray.hpp | 2 ++ cpp/include/raft/core/device_resources.hpp | 2 ++ cpp/include/raft/core/device_resources_manager.hpp | 2 ++ cpp/include/raft/core/interruptible.hpp | 2 ++ cpp/include/raft/core/logger-inl.hpp | 2 ++ cpp/include/raft/core/managed_container_policy.hpp | 2 ++ cpp/include/raft/core/resource/cuda_stream.hpp | 2 ++ cpp/include/raft/core/resource/cusolver_dn_handle.hpp | 2 ++ cpp/include/raft/core/resource/device_memory_resource.hpp | 2 ++ cpp/include/raft/core/resource/thrust_policy.hpp | 3 +++ cpp/include/raft/core/stream_view.hpp | 2 ++ .../raft/distance/detail/fused_distance_nn/cutlass_base.cuh | 2 ++ cpp/include/raft/distance/detail/masked_nn.cuh | 2 ++ .../raft/distance/detail/pairwise_distance_cutlass_base.cuh | 2 ++ cpp/include/raft/distance/distance-ext.cuh | 2 ++ cpp/include/raft/distance/distance-inl.cuh | 2 ++ cpp/include/raft/label/detail/classlabels.cuh | 2 ++ cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh | 2 ++ cpp/include/raft/linalg/detail/eig.cuh | 2 ++ cpp/include/raft/linalg/detail/lstsq.cuh | 2 ++ cpp/include/raft/linalg/detail/map.cuh | 2 ++ cpp/include/raft/linalg/detail/qr.cuh | 2 ++ cpp/include/raft/linalg/detail/svd.cuh | 2 ++ cpp/include/raft/linalg/detail/transpose.cuh | 2 ++ cpp/include/raft/matrix/detail/math.cuh | 2 ++ 38 files changed, 77 insertions(+) diff --git a/cpp/include/raft/cluster/detail/agglomerative.cuh b/cpp/include/raft/cluster/detail/agglomerative.cuh index f2c83abdd3..ab325234f3 100644 --- a/cpp/include/raft/cluster/detail/agglomerative.cuh +++ b/cpp/include/raft/cluster/detail/agglomerative.cuh @@ -22,7 +22,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/connectivities.cuh b/cpp/include/raft/cluster/detail/connectivities.cuh index c527b754c3..a31bc99923 100644 --- a/cpp/include/raft/cluster/detail/connectivities.cuh +++ b/cpp/include/raft/cluster/detail/connectivities.cuh @@ -29,7 +29,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans.cuh b/cpp/include/raft/cluster/detail/kmeans.cuh index 4efeedcbaa..bb6f3a7b4e 100644 --- a/cpp/include/raft/cluster/detail/kmeans.cuh +++ b/cpp/include/raft/cluster/detail/kmeans.cuh @@ -38,8 +38,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh index 0a5a3ba5aa..d003489532 100644 --- a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh +++ b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh @@ -41,10 +41,12 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans_common.cuh b/cpp/include/raft/cluster/detail/kmeans_common.cuh index 8263aa4615..77ba0ba75c 100644 --- a/cpp/include/raft/cluster/detail/kmeans_common.cuh +++ b/cpp/include/raft/cluster/detail/kmeans_common.cuh @@ -36,8 +36,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/mst.cuh b/cpp/include/raft/cluster/detail/mst.cuh index 55becc8e15..8adc382134 100644 --- a/cpp/include/raft/cluster/detail/mst.cuh +++ b/cpp/include/raft/cluster/detail/mst.cuh @@ -23,7 +23,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/single_linkage.cuh b/cpp/include/raft/cluster/detail/single_linkage.cuh index ccc6472684..25b62b5a56 100644 --- a/cpp/include/raft/cluster/detail/single_linkage.cuh +++ b/cpp/include/raft/cluster/detail/single_linkage.cuh @@ -23,7 +23,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 namespace raft::cluster::detail { diff --git a/cpp/include/raft/comms/detail/mpi_comms.hpp b/cpp/include/raft/comms/detail/mpi_comms.hpp index a07146052e..0cdfafb9f7 100644 --- a/cpp/include/raft/comms/detail/mpi_comms.hpp +++ b/cpp/include/raft/comms/detail/mpi_comms.hpp @@ -22,8 +22,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/comms/detail/std_comms.hpp b/cpp/include/raft/comms/detail/std_comms.hpp index c5d64f6a29..ad68a2ccc7 100644 --- a/cpp/include/raft/comms/detail/std_comms.hpp +++ b/cpp/include/raft/comms/detail/std_comms.hpp @@ -23,8 +23,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/comms/detail/test.hpp b/cpp/include/raft/comms/detail/test.hpp index 601c1858a3..8cab6a8333 100644 --- a/cpp/include/raft/comms/detail/test.hpp +++ b/cpp/include/raft/comms/detail/test.hpp @@ -21,8 +21,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/detail/callback_sink.hpp b/cpp/include/raft/core/detail/callback_sink.hpp index a110af5c76..528f6070e6 100644 --- a/cpp/include/raft/core/detail/callback_sink.hpp +++ b/cpp/include/raft/core/detail/callback_sink.hpp @@ -18,10 +18,12 @@ #include #include +#pragma nv_diag_suppress 128 #define SPDLOG_HEADER_ONLY #include #include #include +#pragma nv_diag_default 128 namespace spdlog::sinks { diff --git a/cpp/include/raft/core/detail/nvtx.hpp b/cpp/include/raft/core/detail/nvtx.hpp index 253d8e5b93..d87fbbfc99 100644 --- a/cpp/include/raft/core/detail/nvtx.hpp +++ b/cpp/include/raft/core/detail/nvtx.hpp @@ -16,7 +16,9 @@ #pragma once +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #ifdef NVTX_ENABLED diff --git a/cpp/include/raft/core/device_container_policy.hpp b/cpp/include/raft/core/device_container_policy.hpp index 18d8b77364..bb3e41ce7b 100644 --- a/cpp/include/raft/core/device_container_policy.hpp +++ b/cpp/include/raft/core/device_container_policy.hpp @@ -29,10 +29,12 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_mdarray.hpp b/cpp/include/raft/core/device_mdarray.hpp index a34f6e2e02..992e2f1935 100644 --- a/cpp/include/raft/core/device_mdarray.hpp +++ b/cpp/include/raft/core/device_mdarray.hpp @@ -21,7 +21,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_resources.hpp b/cpp/include/raft/core/device_resources.hpp index 856ecc96d7..ead4d7f8db 100644 --- a/cpp/include/raft/core/device_resources.hpp +++ b/cpp/include/raft/core/device_resources.hpp @@ -35,9 +35,11 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_resources_manager.hpp b/cpp/include/raft/core/device_resources_manager.hpp index 1c4bee15a6..39ba0c66ae 100644 --- a/cpp/include/raft/core/device_resources_manager.hpp +++ b/cpp/include/raft/core/device_resources_manager.hpp @@ -18,11 +18,13 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/interruptible.hpp b/cpp/include/raft/core/interruptible.hpp index 4ec1067e00..25971152f2 100644 --- a/cpp/include/raft/core/interruptible.hpp +++ b/cpp/include/raft/core/interruptible.hpp @@ -22,7 +22,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/logger-inl.hpp b/cpp/include/raft/core/logger-inl.hpp index ea5f4ea26e..49cae8ed23 100644 --- a/cpp/include/raft/core/logger-inl.hpp +++ b/cpp/include/raft/core/logger-inl.hpp @@ -34,8 +34,10 @@ #include #include // RAFT_INLINE_CONDITIONAL +#pragma nv_diag_suppress 128 #include // NOLINT #include // NOLINT +#pragma nv_diag_default 128 namespace raft { diff --git a/cpp/include/raft/core/managed_container_policy.hpp b/cpp/include/raft/core/managed_container_policy.hpp index 889e9383e6..8fce400c1b 100644 --- a/cpp/include/raft/core/managed_container_policy.hpp +++ b/cpp/include/raft/core/managed_container_policy.hpp @@ -23,7 +23,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 namespace raft { /** diff --git a/cpp/include/raft/core/resource/cuda_stream.hpp b/cpp/include/raft/core/resource/cuda_stream.hpp index 68b5c055fe..5a322cfa8f 100644 --- a/cpp/include/raft/core/resource/cuda_stream.hpp +++ b/cpp/include/raft/core/resource/cuda_stream.hpp @@ -20,7 +20,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/resource/cusolver_dn_handle.hpp b/cpp/include/raft/core/resource/cusolver_dn_handle.hpp index a0698d9b82..7aba954c66 100644 --- a/cpp/include/raft/core/resource/cusolver_dn_handle.hpp +++ b/cpp/include/raft/core/resource/cusolver_dn_handle.hpp @@ -21,7 +21,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/resource/device_memory_resource.hpp b/cpp/include/raft/core/resource/device_memory_resource.hpp index b785010a0a..f2d5b92024 100644 --- a/cpp/include/raft/core/resource/device_memory_resource.hpp +++ b/cpp/include/raft/core/resource/device_memory_resource.hpp @@ -20,10 +20,12 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/resource/thrust_policy.hpp b/cpp/include/raft/core/resource/thrust_policy.hpp index c728f0a00e..213a65d339 100644 --- a/cpp/include/raft/core/resource/thrust_policy.hpp +++ b/cpp/include/raft/core/resource/thrust_policy.hpp @@ -19,7 +19,10 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 + namespace raft::resource { class thrust_policy_resource : public resource { public: diff --git a/cpp/include/raft/core/stream_view.hpp b/cpp/include/raft/core/stream_view.hpp index 3a42ee949e..28cc199e44 100644 --- a/cpp/include/raft/core/stream_view.hpp +++ b/cpp/include/raft/core/stream_view.hpp @@ -20,7 +20,9 @@ #ifndef RAFT_DISABLE_CUDA #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #endif namespace raft { diff --git a/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh b/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh index b2fc5e0cc7..20de6c6459 100644 --- a/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh +++ b/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh @@ -31,7 +31,9 @@ #include // getMultiProcessorCount #include // RAFT_CUTLASS_TRY +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/distance/detail/masked_nn.cuh b/cpp/include/raft/distance/detail/masked_nn.cuh index 951e030cbd..cefe1082ad 100644 --- a/cpp/include/raft/distance/detail/masked_nn.cuh +++ b/cpp/include/raft/distance/detail/masked_nn.cuh @@ -24,7 +24,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh b/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh index 1cc272f74e..614ab94860 100644 --- a/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh +++ b/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh @@ -32,7 +32,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/distance/distance-ext.cuh b/cpp/include/raft/distance/distance-ext.cuh index 2d41e029fe..4281f9e952 100644 --- a/cpp/include/raft/distance/distance-ext.cuh +++ b/cpp/include/raft/distance/distance-ext.cuh @@ -22,7 +22,9 @@ #include // raft::distance::DistanceType #include // RAFT_EXPLICIT +#pragma nv_diag_suppress 128 #include // rmm::device_uvector +#pragma nv_diag_default 128 #ifdef RAFT_EXPLICIT_INSTANTIATE_ONLY diff --git a/cpp/include/raft/distance/distance-inl.cuh b/cpp/include/raft/distance/distance-inl.cuh index 13c9d57efd..db5e6efbf5 100644 --- a/cpp/include/raft/distance/distance-inl.cuh +++ b/cpp/include/raft/distance/distance-inl.cuh @@ -21,7 +21,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/label/detail/classlabels.cuh b/cpp/include/raft/label/detail/classlabels.cuh index 3742b688a0..673a0125d7 100644 --- a/cpp/include/raft/label/detail/classlabels.cuh +++ b/cpp/include/raft/label/detail/classlabels.cuh @@ -21,8 +21,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh b/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh index 9680cbc636..31d00ff09e 100644 --- a/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh +++ b/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh @@ -20,7 +20,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/eig.cuh b/cpp/include/raft/linalg/detail/eig.cuh index ba7ed3dcdf..c30eef7035 100644 --- a/cpp/include/raft/linalg/detail/eig.cuh +++ b/cpp/include/raft/linalg/detail/eig.cuh @@ -24,9 +24,11 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/lstsq.cuh b/cpp/include/raft/linalg/detail/lstsq.cuh index c2842fda30..15a1f23468 100644 --- a/cpp/include/raft/linalg/detail/lstsq.cuh +++ b/cpp/include/raft/linalg/detail/lstsq.cuh @@ -34,9 +34,11 @@ #include #include +#pragma nv_diag_suppress 128 #include #include #include +#pragma nv_diag_default 128 namespace raft { namespace linalg { diff --git a/cpp/include/raft/linalg/detail/map.cuh b/cpp/include/raft/linalg/detail/map.cuh index 4ff3aa9754..063c36d93e 100644 --- a/cpp/include/raft/linalg/detail/map.cuh +++ b/cpp/include/raft/linalg/detail/map.cuh @@ -25,7 +25,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/qr.cuh b/cpp/include/raft/linalg/detail/qr.cuh index 6233786812..830c58ea9d 100644 --- a/cpp/include/raft/linalg/detail/qr.cuh +++ b/cpp/include/raft/linalg/detail/qr.cuh @@ -23,8 +23,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/svd.cuh b/cpp/include/raft/linalg/detail/svd.cuh index 79b64c7447..103982befe 100644 --- a/cpp/include/raft/linalg/detail/svd.cuh +++ b/cpp/include/raft/linalg/detail/svd.cuh @@ -34,8 +34,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 namespace raft { namespace linalg { diff --git a/cpp/include/raft/linalg/detail/transpose.cuh b/cpp/include/raft/linalg/detail/transpose.cuh index ec60aacc9c..27ea89d580 100644 --- a/cpp/include/raft/linalg/detail/transpose.cuh +++ b/cpp/include/raft/linalg/detail/transpose.cuh @@ -23,7 +23,9 @@ #include #include +#pragma nv_diag_suppress 128 #include +#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/matrix/detail/math.cuh b/cpp/include/raft/matrix/detail/math.cuh index e1b6b2ef71..c7eb5fc5ca 100644 --- a/cpp/include/raft/matrix/detail/math.cuh +++ b/cpp/include/raft/matrix/detail/math.cuh @@ -24,8 +24,10 @@ #include #include +#pragma nv_diag_suppress 128 #include #include +#pragma nv_diag_default 128 #include From 31520f50d29e29cdd1e65f982a5ade602e9a42d1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 10:51:31 -0700 Subject: [PATCH 09/17] fix checks --- .pre-commit-config.yaml | 2 +- cpp/include/raft/cluster/detail/agglomerative.cuh | 2 +- cpp/include/raft/core/detail/callback_sink.hpp | 2 +- cpp/include/raft/linalg/detail/map.cuh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 88be628e55..458d8b1b51 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: # Explicitly specify the pyproject.toml at the repo root, not per-project. args: ["--config", "pyproject.toml"] - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 7.1.1 hooks: - id: flake8 args: ["--config=.flake8"] diff --git a/cpp/include/raft/cluster/detail/agglomerative.cuh b/cpp/include/raft/cluster/detail/agglomerative.cuh index ab325234f3..a47d0908ef 100644 --- a/cpp/include/raft/cluster/detail/agglomerative.cuh +++ b/cpp/include/raft/cluster/detail/agglomerative.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/raft/core/detail/callback_sink.hpp b/cpp/include/raft/core/detail/callback_sink.hpp index 528f6070e6..8b9281bf85 100644 --- a/cpp/include/raft/core/detail/callback_sink.hpp +++ b/cpp/include/raft/core/detail/callback_sink.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/raft/linalg/detail/map.cuh b/cpp/include/raft/linalg/detail/map.cuh index 063c36d93e..31b2ac9083 100644 --- a/cpp/include/raft/linalg/detail/map.cuh +++ b/cpp/include/raft/linalg/detail/map.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 366f4c8788de192c1093f27b21271143d0cd2b18 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 13:06:50 -0700 Subject: [PATCH 10/17] Revert "try suppressing unreachable-code diagnostics from nvcc (this should be narrowed down / upstreamed before merging)" This reverts commit 3ba2201d678cc8befdfcaa0e89630a95a00a78b2. --- cpp/include/raft/cluster/detail/agglomerative.cuh | 2 -- cpp/include/raft/cluster/detail/connectivities.cuh | 2 -- cpp/include/raft/cluster/detail/kmeans.cuh | 2 -- cpp/include/raft/cluster/detail/kmeans_balanced.cuh | 2 -- cpp/include/raft/cluster/detail/kmeans_common.cuh | 2 -- cpp/include/raft/cluster/detail/mst.cuh | 2 -- cpp/include/raft/cluster/detail/single_linkage.cuh | 2 -- cpp/include/raft/comms/detail/mpi_comms.hpp | 2 -- cpp/include/raft/comms/detail/std_comms.hpp | 2 -- cpp/include/raft/comms/detail/test.hpp | 2 -- cpp/include/raft/core/detail/callback_sink.hpp | 2 -- cpp/include/raft/core/detail/nvtx.hpp | 2 -- cpp/include/raft/core/device_container_policy.hpp | 2 -- cpp/include/raft/core/device_mdarray.hpp | 2 -- cpp/include/raft/core/device_resources.hpp | 2 -- cpp/include/raft/core/device_resources_manager.hpp | 2 -- cpp/include/raft/core/interruptible.hpp | 2 -- cpp/include/raft/core/logger-inl.hpp | 2 -- cpp/include/raft/core/managed_container_policy.hpp | 2 -- cpp/include/raft/core/resource/cuda_stream.hpp | 2 -- cpp/include/raft/core/resource/cusolver_dn_handle.hpp | 2 -- cpp/include/raft/core/resource/device_memory_resource.hpp | 2 -- cpp/include/raft/core/resource/thrust_policy.hpp | 3 --- cpp/include/raft/core/stream_view.hpp | 2 -- .../raft/distance/detail/fused_distance_nn/cutlass_base.cuh | 2 -- cpp/include/raft/distance/detail/masked_nn.cuh | 2 -- .../raft/distance/detail/pairwise_distance_cutlass_base.cuh | 2 -- cpp/include/raft/distance/distance-ext.cuh | 2 -- cpp/include/raft/distance/distance-inl.cuh | 2 -- cpp/include/raft/label/detail/classlabels.cuh | 2 -- cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh | 2 -- cpp/include/raft/linalg/detail/eig.cuh | 2 -- cpp/include/raft/linalg/detail/lstsq.cuh | 2 -- cpp/include/raft/linalg/detail/map.cuh | 2 -- cpp/include/raft/linalg/detail/qr.cuh | 2 -- cpp/include/raft/linalg/detail/svd.cuh | 2 -- cpp/include/raft/linalg/detail/transpose.cuh | 2 -- cpp/include/raft/matrix/detail/math.cuh | 2 -- 38 files changed, 77 deletions(-) diff --git a/cpp/include/raft/cluster/detail/agglomerative.cuh b/cpp/include/raft/cluster/detail/agglomerative.cuh index a47d0908ef..3f250c06f0 100644 --- a/cpp/include/raft/cluster/detail/agglomerative.cuh +++ b/cpp/include/raft/cluster/detail/agglomerative.cuh @@ -22,9 +22,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/connectivities.cuh b/cpp/include/raft/cluster/detail/connectivities.cuh index a31bc99923..c527b754c3 100644 --- a/cpp/include/raft/cluster/detail/connectivities.cuh +++ b/cpp/include/raft/cluster/detail/connectivities.cuh @@ -29,9 +29,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans.cuh b/cpp/include/raft/cluster/detail/kmeans.cuh index bb6f3a7b4e..4efeedcbaa 100644 --- a/cpp/include/raft/cluster/detail/kmeans.cuh +++ b/cpp/include/raft/cluster/detail/kmeans.cuh @@ -38,10 +38,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh index d003489532..0a5a3ba5aa 100644 --- a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh +++ b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh @@ -41,12 +41,10 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/kmeans_common.cuh b/cpp/include/raft/cluster/detail/kmeans_common.cuh index 77ba0ba75c..8263aa4615 100644 --- a/cpp/include/raft/cluster/detail/kmeans_common.cuh +++ b/cpp/include/raft/cluster/detail/kmeans_common.cuh @@ -36,10 +36,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/mst.cuh b/cpp/include/raft/cluster/detail/mst.cuh index 8adc382134..55becc8e15 100644 --- a/cpp/include/raft/cluster/detail/mst.cuh +++ b/cpp/include/raft/cluster/detail/mst.cuh @@ -23,9 +23,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/cluster/detail/single_linkage.cuh b/cpp/include/raft/cluster/detail/single_linkage.cuh index 25b62b5a56..ccc6472684 100644 --- a/cpp/include/raft/cluster/detail/single_linkage.cuh +++ b/cpp/include/raft/cluster/detail/single_linkage.cuh @@ -23,9 +23,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 namespace raft::cluster::detail { diff --git a/cpp/include/raft/comms/detail/mpi_comms.hpp b/cpp/include/raft/comms/detail/mpi_comms.hpp index 0cdfafb9f7..a07146052e 100644 --- a/cpp/include/raft/comms/detail/mpi_comms.hpp +++ b/cpp/include/raft/comms/detail/mpi_comms.hpp @@ -22,10 +22,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/comms/detail/std_comms.hpp b/cpp/include/raft/comms/detail/std_comms.hpp index ad68a2ccc7..c5d64f6a29 100644 --- a/cpp/include/raft/comms/detail/std_comms.hpp +++ b/cpp/include/raft/comms/detail/std_comms.hpp @@ -23,10 +23,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/comms/detail/test.hpp b/cpp/include/raft/comms/detail/test.hpp index 8cab6a8333..601c1858a3 100644 --- a/cpp/include/raft/comms/detail/test.hpp +++ b/cpp/include/raft/comms/detail/test.hpp @@ -21,10 +21,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/detail/callback_sink.hpp b/cpp/include/raft/core/detail/callback_sink.hpp index 8b9281bf85..53816639b6 100644 --- a/cpp/include/raft/core/detail/callback_sink.hpp +++ b/cpp/include/raft/core/detail/callback_sink.hpp @@ -18,12 +18,10 @@ #include #include -#pragma nv_diag_suppress 128 #define SPDLOG_HEADER_ONLY #include #include #include -#pragma nv_diag_default 128 namespace spdlog::sinks { diff --git a/cpp/include/raft/core/detail/nvtx.hpp b/cpp/include/raft/core/detail/nvtx.hpp index d87fbbfc99..253d8e5b93 100644 --- a/cpp/include/raft/core/detail/nvtx.hpp +++ b/cpp/include/raft/core/detail/nvtx.hpp @@ -16,9 +16,7 @@ #pragma once -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #ifdef NVTX_ENABLED diff --git a/cpp/include/raft/core/device_container_policy.hpp b/cpp/include/raft/core/device_container_policy.hpp index bb3e41ce7b..18d8b77364 100644 --- a/cpp/include/raft/core/device_container_policy.hpp +++ b/cpp/include/raft/core/device_container_policy.hpp @@ -29,12 +29,10 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_mdarray.hpp b/cpp/include/raft/core/device_mdarray.hpp index 992e2f1935..a34f6e2e02 100644 --- a/cpp/include/raft/core/device_mdarray.hpp +++ b/cpp/include/raft/core/device_mdarray.hpp @@ -21,9 +21,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_resources.hpp b/cpp/include/raft/core/device_resources.hpp index ead4d7f8db..856ecc96d7 100644 --- a/cpp/include/raft/core/device_resources.hpp +++ b/cpp/include/raft/core/device_resources.hpp @@ -35,11 +35,9 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/device_resources_manager.hpp b/cpp/include/raft/core/device_resources_manager.hpp index 39ba0c66ae..1c4bee15a6 100644 --- a/cpp/include/raft/core/device_resources_manager.hpp +++ b/cpp/include/raft/core/device_resources_manager.hpp @@ -18,13 +18,11 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/interruptible.hpp b/cpp/include/raft/core/interruptible.hpp index 25971152f2..4ec1067e00 100644 --- a/cpp/include/raft/core/interruptible.hpp +++ b/cpp/include/raft/core/interruptible.hpp @@ -22,9 +22,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/logger-inl.hpp b/cpp/include/raft/core/logger-inl.hpp index 49cae8ed23..ea5f4ea26e 100644 --- a/cpp/include/raft/core/logger-inl.hpp +++ b/cpp/include/raft/core/logger-inl.hpp @@ -34,10 +34,8 @@ #include #include // RAFT_INLINE_CONDITIONAL -#pragma nv_diag_suppress 128 #include // NOLINT #include // NOLINT -#pragma nv_diag_default 128 namespace raft { diff --git a/cpp/include/raft/core/managed_container_policy.hpp b/cpp/include/raft/core/managed_container_policy.hpp index 8fce400c1b..889e9383e6 100644 --- a/cpp/include/raft/core/managed_container_policy.hpp +++ b/cpp/include/raft/core/managed_container_policy.hpp @@ -23,9 +23,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 namespace raft { /** diff --git a/cpp/include/raft/core/resource/cuda_stream.hpp b/cpp/include/raft/core/resource/cuda_stream.hpp index 5a322cfa8f..68b5c055fe 100644 --- a/cpp/include/raft/core/resource/cuda_stream.hpp +++ b/cpp/include/raft/core/resource/cuda_stream.hpp @@ -20,9 +20,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/resource/cusolver_dn_handle.hpp b/cpp/include/raft/core/resource/cusolver_dn_handle.hpp index 7aba954c66..a0698d9b82 100644 --- a/cpp/include/raft/core/resource/cusolver_dn_handle.hpp +++ b/cpp/include/raft/core/resource/cusolver_dn_handle.hpp @@ -21,9 +21,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/core/resource/device_memory_resource.hpp b/cpp/include/raft/core/resource/device_memory_resource.hpp index f2d5b92024..b785010a0a 100644 --- a/cpp/include/raft/core/resource/device_memory_resource.hpp +++ b/cpp/include/raft/core/resource/device_memory_resource.hpp @@ -20,12 +20,10 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/core/resource/thrust_policy.hpp b/cpp/include/raft/core/resource/thrust_policy.hpp index 213a65d339..c728f0a00e 100644 --- a/cpp/include/raft/core/resource/thrust_policy.hpp +++ b/cpp/include/raft/core/resource/thrust_policy.hpp @@ -19,10 +19,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 - namespace raft::resource { class thrust_policy_resource : public resource { public: diff --git a/cpp/include/raft/core/stream_view.hpp b/cpp/include/raft/core/stream_view.hpp index 28cc199e44..3a42ee949e 100644 --- a/cpp/include/raft/core/stream_view.hpp +++ b/cpp/include/raft/core/stream_view.hpp @@ -20,9 +20,7 @@ #ifndef RAFT_DISABLE_CUDA #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #endif namespace raft { diff --git a/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh b/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh index 20de6c6459..b2fc5e0cc7 100644 --- a/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh +++ b/cpp/include/raft/distance/detail/fused_distance_nn/cutlass_base.cuh @@ -31,9 +31,7 @@ #include // getMultiProcessorCount #include // RAFT_CUTLASS_TRY -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/distance/detail/masked_nn.cuh b/cpp/include/raft/distance/detail/masked_nn.cuh index cefe1082ad..951e030cbd 100644 --- a/cpp/include/raft/distance/detail/masked_nn.cuh +++ b/cpp/include/raft/distance/detail/masked_nn.cuh @@ -24,9 +24,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh b/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh index 614ab94860..1cc272f74e 100644 --- a/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh +++ b/cpp/include/raft/distance/detail/pairwise_distance_cutlass_base.cuh @@ -32,9 +32,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/distance/distance-ext.cuh b/cpp/include/raft/distance/distance-ext.cuh index 4281f9e952..2d41e029fe 100644 --- a/cpp/include/raft/distance/distance-ext.cuh +++ b/cpp/include/raft/distance/distance-ext.cuh @@ -22,9 +22,7 @@ #include // raft::distance::DistanceType #include // RAFT_EXPLICIT -#pragma nv_diag_suppress 128 #include // rmm::device_uvector -#pragma nv_diag_default 128 #ifdef RAFT_EXPLICIT_INSTANTIATE_ONLY diff --git a/cpp/include/raft/distance/distance-inl.cuh b/cpp/include/raft/distance/distance-inl.cuh index db5e6efbf5..13c9d57efd 100644 --- a/cpp/include/raft/distance/distance-inl.cuh +++ b/cpp/include/raft/distance/distance-inl.cuh @@ -21,9 +21,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/label/detail/classlabels.cuh b/cpp/include/raft/label/detail/classlabels.cuh index 673a0125d7..3742b688a0 100644 --- a/cpp/include/raft/label/detail/classlabels.cuh +++ b/cpp/include/raft/label/detail/classlabels.cuh @@ -21,10 +21,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh b/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh index 31d00ff09e..9680cbc636 100644 --- a/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh +++ b/cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh @@ -20,9 +20,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/eig.cuh b/cpp/include/raft/linalg/detail/eig.cuh index c30eef7035..ba7ed3dcdf 100644 --- a/cpp/include/raft/linalg/detail/eig.cuh +++ b/cpp/include/raft/linalg/detail/eig.cuh @@ -24,11 +24,9 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/lstsq.cuh b/cpp/include/raft/linalg/detail/lstsq.cuh index 15a1f23468..c2842fda30 100644 --- a/cpp/include/raft/linalg/detail/lstsq.cuh +++ b/cpp/include/raft/linalg/detail/lstsq.cuh @@ -34,11 +34,9 @@ #include #include -#pragma nv_diag_suppress 128 #include #include #include -#pragma nv_diag_default 128 namespace raft { namespace linalg { diff --git a/cpp/include/raft/linalg/detail/map.cuh b/cpp/include/raft/linalg/detail/map.cuh index 31b2ac9083..04bff3afa0 100644 --- a/cpp/include/raft/linalg/detail/map.cuh +++ b/cpp/include/raft/linalg/detail/map.cuh @@ -25,9 +25,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/qr.cuh b/cpp/include/raft/linalg/detail/qr.cuh index 830c58ea9d..6233786812 100644 --- a/cpp/include/raft/linalg/detail/qr.cuh +++ b/cpp/include/raft/linalg/detail/qr.cuh @@ -23,10 +23,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include diff --git a/cpp/include/raft/linalg/detail/svd.cuh b/cpp/include/raft/linalg/detail/svd.cuh index 103982befe..79b64c7447 100644 --- a/cpp/include/raft/linalg/detail/svd.cuh +++ b/cpp/include/raft/linalg/detail/svd.cuh @@ -34,10 +34,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 namespace raft { namespace linalg { diff --git a/cpp/include/raft/linalg/detail/transpose.cuh b/cpp/include/raft/linalg/detail/transpose.cuh index 27ea89d580..ec60aacc9c 100644 --- a/cpp/include/raft/linalg/detail/transpose.cuh +++ b/cpp/include/raft/linalg/detail/transpose.cuh @@ -23,9 +23,7 @@ #include #include -#pragma nv_diag_suppress 128 #include -#pragma nv_diag_default 128 #include #include diff --git a/cpp/include/raft/matrix/detail/math.cuh b/cpp/include/raft/matrix/detail/math.cuh index c7eb5fc5ca..e1b6b2ef71 100644 --- a/cpp/include/raft/matrix/detail/math.cuh +++ b/cpp/include/raft/matrix/detail/math.cuh @@ -24,10 +24,8 @@ #include #include -#pragma nv_diag_suppress 128 #include #include -#pragma nv_diag_default 128 #include From 9ef213308f608b2b69f33f1ca1cf96f2a09d1781 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 17:57:20 -0700 Subject: [PATCH 11/17] copyright --- cpp/include/raft/cluster/detail/agglomerative.cuh | 2 +- cpp/include/raft/core/detail/callback_sink.hpp | 2 +- cpp/include/raft/linalg/detail/map.cuh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/include/raft/cluster/detail/agglomerative.cuh b/cpp/include/raft/cluster/detail/agglomerative.cuh index 3f250c06f0..f2c83abdd3 100644 --- a/cpp/include/raft/cluster/detail/agglomerative.cuh +++ b/cpp/include/raft/cluster/detail/agglomerative.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/raft/core/detail/callback_sink.hpp b/cpp/include/raft/core/detail/callback_sink.hpp index 53816639b6..a110af5c76 100644 --- a/cpp/include/raft/core/detail/callback_sink.hpp +++ b/cpp/include/raft/core/detail/callback_sink.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. + * Copyright (c) 2020-2022, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/raft/linalg/detail/map.cuh b/cpp/include/raft/linalg/detail/map.cuh index 04bff3afa0..4ff3aa9754 100644 --- a/cpp/include/raft/linalg/detail/map.cuh +++ b/cpp/include/raft/linalg/detail/map.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. + * Copyright (c) 2022-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 81cf3b36793fb575374f066ab25812081652da46 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 09:43:02 -0700 Subject: [PATCH 12/17] move rapids-cmake overrides [skip ci] --- rapids_config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index 80794e1dad..e01741e7fc 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -25,9 +25,9 @@ else() "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}") endif() +set(rapids-cmake-repo jameslamb/rapids-cmake) +set(rapids-cmake-branch fmt-and-spdlog) if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") - set(rapids-cmake-repo jameslamb/rapids-cmake) - set(rapids-cmake-branch fmt-and-spdlog) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From 8f918bd31325ba35ff120d603a4112920512d512 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 21:16:47 -0500 Subject: [PATCH 13/17] kick off a build --- .github/workflows/pr.yaml | 136 +++++++++++++++--------------- ci/build_cpp.sh | 13 +-- ci/build_python.sh | 19 +---- ci/build_wheel.sh | 14 +-- ci/test_cpp.sh | 9 +- ci/test_python.sh | 11 +-- ci/test_wheel_pylibraft.sh | 12 +-- ci/test_wheel_raft_dask.sh | 12 +-- ci/use_conda_packages_from_prs.sh | 15 ++++ ci/use_wheels_from_prs.sh | 58 +++++++++++++ 10 files changed, 154 insertions(+), 145 deletions(-) create mode 100755 ci/use_conda_packages_from_prs.sh create mode 100755 ci/use_wheels_from_prs.sh diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 381ca6b378..03b38ff6d0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,82 +12,82 @@ concurrency: jobs: pr-builder: needs: - - checks + # - checks - conda-cpp-build - - conda-cpp-tests - - conda-cpp-checks + # - conda-cpp-tests + # - conda-cpp-checks - conda-python-build - - conda-python-tests - - docs-build + # - conda-python-tests + # - docs-build - wheel-build-pylibraft - - wheel-tests-pylibraft + # - wheel-tests-pylibraft - wheel-build-raft-dask - - wheel-tests-raft-dask + # - wheel-tests-raft-dask - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - checks: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 - with: - enable_check_generated_files: false + # checks: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 + # with: + # enable_check_generated_files: false conda-cpp-build: - needs: checks + # needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 with: build_type: pull-request node_type: cpu16 - conda-cpp-tests: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - with: - build_type: pull-request - conda-cpp-checks: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 - with: - build_type: pull-request - enable_check_symbols: true - symbol_exclusions: raft_cutlass + # conda-cpp-tests: + # needs: conda-cpp-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + # with: + # build_type: pull-request + # conda-cpp-checks: + # needs: conda-cpp-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 + # with: + # build_type: pull-request + # enable_check_symbols: true + # symbol_exclusions: raft_cutlass conda-python-build: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: build_type: pull-request - conda-python-tests: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - with: - build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - with: - build_type: pull-request - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci-conda:latest" - run_script: "ci/build_docs.sh" + # conda-python-tests: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + # with: + # build_type: pull-request + # docs-build: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + # with: + # build_type: pull-request + # node_type: "gpu-v100-latest-1" + # arch: "amd64" + # container_image: "rapidsai/ci-conda:latest" + # run_script: "ci/build_docs.sh" wheel-build-pylibraft: - needs: checks + # needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: build_type: pull-request script: ci/build_wheel_pylibraft.sh - wheel-tests-pylibraft: - needs: wheel-build-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - with: - build_type: pull-request - script: ci/test_wheel_pylibraft.sh + # wheel-tests-pylibraft: + # needs: wheel-build-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + # with: + # build_type: pull-request + # script: ci/test_wheel_pylibraft.sh wheel-build-raft-dask: needs: wheel-tests-pylibraft secrets: inherit @@ -95,20 +95,20 @@ jobs: with: build_type: pull-request script: "ci/build_wheel_raft_dask.sh" - wheel-tests-raft-dask: - needs: wheel-build-raft-dask - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - with: - build_type: pull-request - script: ci/test_wheel_raft_dask.sh - devcontainer: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 - with: - arch: '["amd64"]' - cuda: '["12.5"]' - build_command: | - sccache -z; - build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; - sccache -s; + # wheel-tests-raft-dask: + # needs: wheel-build-raft-dask + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + # with: + # build_type: pull-request + # script: ci/test_wheel_raft_dask.sh + # devcontainer: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 + # with: + # arch: '["amd64"]' + # cuda: '["12.5"]' + # build_command: | + # sccache -z; + # build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; + # sccache -s; diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 9dce4cee56..b11a99bf56 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,18 +11,13 @@ source rapids-date-string export CMAKE_GENERATOR=Ninja +cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ +source ./ci/use_conda_packages_from_prs.sh + rapids-print-env rapids-logger "Begin cpp build" -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) -UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) - -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${UCXX_CHANNEL}" \ - conda/recipes/libraft +RAPIDS_PACKAGE_VERSION=$(rapids-generate-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 40902bac3a..c54e998935 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -11,16 +11,15 @@ source rapids-date-string export CMAKE_GENERATOR=Ninja +cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ +source ./ci/use_conda_packages_from_prs.sh + rapids-print-env rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) -UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) - version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) export RAPIDS_PACKAGE_VERSION=${version} @@ -31,18 +30,12 @@ echo "${version}" > VERSION rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${UCXX_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}" \ - --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-dask # Build ann-bench for each cuda and python version @@ -50,9 +43,6 @@ rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python @@ -63,9 +53,6 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${UCXX_CHANNEL}" \ conda/recipes/raft-ann-bench-cpu fi diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 99f22fdd9b..4628afc973 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -18,6 +18,8 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" rapids-generate-version > VERSION +source ./ci/use_wheels_from_prs.sh + cd "${package_dir}" case "${RAPIDS_CUDA_VERSION}" in @@ -39,18 +41,6 @@ case "${RAPIDS_CUDA_VERSION}" in ;; esac -LIBRMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp -) -RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python -) - -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt -echo "" >> /tmp/constraints.txt -export PIP_CONSTRAINT=/tmp/constraints.txt - # Hardcode the output dir python -m pip wheel . -w dist -v --no-deps --disable-pip-version-check diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index be990c026a..e819bf61d6 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -5,20 +5,14 @@ set -euo pipefail # Support invoking test_cpp.sh outside the script directory cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ +source ./ci/use_conda_packages_from_prs.sh . /opt/conda/etc/profile.d/conda.sh -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) -UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) - rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ - --prepend-channel "${LIBRMM_CHANNEL}" \ - --prepend-channel "${RMM_CHANNEL}" \ - --prepend-channel "${UCXX_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test @@ -36,7 +30,6 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - --channel "${UCXX_CHANNEL}" \ libraft-headers libraft libraft-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index 34c81b04d6..cd94103498 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -5,20 +5,14 @@ set -euo pipefail # Support invoking test_python.sh outside the script directory cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ +source ./ci/use_conda_packages_from_prs.sh . /opt/conda/etc/profile.d/conda.sh -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) -UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) - rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_python \ - --prepend-channel "${LIBRMM_CHANNEL}" \ - --prepend-channel "${RMM_CHANNEL}" \ - --prepend-channel "${UCXX_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test @@ -41,9 +35,6 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${UCXX_CHANNEL}" \ libraft libraft-headers pylibraft raft-dask rapids-logger "Check GPU usage" diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index 9ac1db3dfe..3fd4225526 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -7,17 +7,7 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp -) -RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python -) - -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt -echo "" >> /tmp/constraints.txt -export PIP_CONSTRAINT=/tmp/constraints.txt +source ./ci/use_wheels_from_prs.sh # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/pylibraft*.whl)[test] diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index 7fbacaa306..6ce87bceb5 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -7,17 +7,7 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -LIBRMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp -) -RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python -) - -echo "rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm*.whl)" > /tmp/constraints.txt -echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm*.whl)" >> /tmp/constraints.txt -echo "" >> /tmp/constraints.txt -export PIP_CONSTRAINT=/tmp/constraints.txt +source ./ci/use_wheels_from_prs.sh # Download the pylibraft built in the previous step RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-pylibraft-dep diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh new file mode 100755 index 0000000000..1fee3fcb48 --- /dev/null +++ b/ci/use_conda_packages_from_prs.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) + +CUDF_CPP_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 cpp) +CUDF_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 python) + +UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) + +conda config --system --add channels "${LIBRMM_CHANNEL}" +conda config --system --add channels "${RMM_CHANNEL}" +conda config --system --add channels "${CUDF_CPP_CHANNEL}" +conda config --system --add channels "${CUDF_PYTHON_CHANNEL}" +conda config --system --add channels "${UCXX_CHANNEL}" diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh new file mode 100755 index 0000000000..52e3e1d485 --- /dev/null +++ b/ci/use_wheels_from_prs.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" + +LIBRMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp +) +RMM_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python +) + +UCXX_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python +) +LIBUCXX_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=libucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 cpp +) +DISTRIBUTED_UCXX_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=distributed_ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python +) + +CUDF_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=cudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python +) +LIBCUDF_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=libcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 cpp +) +PYLIBCUDF_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=pylibcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python +) +DASK_CUDF_CHANNEL=$( + RAPIDS_PY_WHEEL_NAME=dask_cudf_${RAPIDS_PY_CUDA_SUFFIX} \ + RAPIDS_PY_WHEEL_PURE=1 \ + rapids-get-pr-wheel-artifact cudf 16806 python +) + +# RAFT_DASK_CHANNEL=$( +# RAPIDS_PY_WHEEL_NAME=raft_dask_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python +# ) +# PYLIBRAFT_CHANNEL=$( +# RAPIDS_PY_WHEEL_NAME=pylibraft_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python +# ) + +cat > /tmp/constraints.txt < Date: Wed, 18 Sep 2024 21:24:31 -0500 Subject: [PATCH 14/17] fix dependency graph --- .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 03b38ff6d0..31d76476d6 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -89,7 +89,7 @@ jobs: # build_type: pull-request # script: ci/test_wheel_pylibraft.sh wheel-build-raft-dask: - needs: wheel-tests-pylibraft + # needs: wheel-tests-pylibraft secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: From 67334b7897ebfc0a0d61a551f8b01760d4356c37 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 21:26:13 -0500 Subject: [PATCH 15/17] devcontainer --- .github/workflows/pr.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 31d76476d6..85823130da 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -102,13 +102,13 @@ jobs: # with: # build_type: pull-request # script: ci/test_wheel_raft_dask.sh - # devcontainer: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 - # with: - # arch: '["amd64"]' - # cuda: '["12.5"]' - # build_command: | - # sccache -z; - # build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; - # sccache -s; + devcontainer: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 + with: + arch: '["amd64"]' + cuda: '["12.5"]' + build_command: | + sccache -z; + build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; + sccache -s; From 925840ec1db214dc456d6bbb5ab4398faa5a8960 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Sep 2024 13:03:24 -0500 Subject: [PATCH 16/17] run all CI --- .github/workflows/pr.yaml | 118 +++++++++++++++--------------- ci/build_wheel.sh | 2 +- ci/use_conda_packages_from_prs.sh | 1 + ci/use_wheels_from_prs.sh | 1 + 4 files changed, 62 insertions(+), 60 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 85823130da..381ca6b378 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,96 +12,96 @@ concurrency: jobs: pr-builder: needs: - # - checks + - checks - conda-cpp-build - # - conda-cpp-tests - # - conda-cpp-checks + - conda-cpp-tests + - conda-cpp-checks - conda-python-build - # - conda-python-tests - # - docs-build + - conda-python-tests + - docs-build - wheel-build-pylibraft - # - wheel-tests-pylibraft + - wheel-tests-pylibraft - wheel-build-raft-dask - # - wheel-tests-raft-dask + - wheel-tests-raft-dask - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - # checks: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 - # with: - # enable_check_generated_files: false + checks: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 + with: + enable_check_generated_files: false conda-cpp-build: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 with: build_type: pull-request node_type: cpu16 - # conda-cpp-tests: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # conda-cpp-checks: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 - # with: - # build_type: pull-request - # enable_check_symbols: true - # symbol_exclusions: raft_cutlass + conda-cpp-tests: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + with: + build_type: pull-request + conda-cpp-checks: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 + with: + build_type: pull-request + enable_check_symbols: true + symbol_exclusions: raft_cutlass conda-python-build: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: build_type: pull-request - # conda-python-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" + conda-python-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + build_type: pull-request + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" wheel-build-pylibraft: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: build_type: pull-request script: ci/build_wheel_pylibraft.sh - # wheel-tests-pylibraft: - # needs: wheel-build-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: ci/test_wheel_pylibraft.sh + wheel-tests-pylibraft: + needs: wheel-build-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + with: + build_type: pull-request + script: ci/test_wheel_pylibraft.sh wheel-build-raft-dask: - # needs: wheel-tests-pylibraft + needs: wheel-tests-pylibraft secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: build_type: pull-request script: "ci/build_wheel_raft_dask.sh" - # wheel-tests-raft-dask: - # needs: wheel-build-raft-dask - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: ci/test_wheel_raft_dask.sh + wheel-tests-raft-dask: + needs: wheel-build-raft-dask + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + with: + build_type: pull-request + script: ci/test_wheel_raft_dask.sh devcontainer: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 4628afc973..5a1d154728 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -42,7 +42,7 @@ case "${RAPIDS_CUDA_VERSION}" in esac # Hardcode the output dir -python -m pip wheel . -w dist -v --no-deps --disable-pip-version-check +python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check mkdir -p final_dist python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/* diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh index 1fee3fcb48..0783567f21 100755 --- a/ci/use_conda_packages_from_prs.sh +++ b/ci/use_conda_packages_from_prs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2024, NVIDIA CORPORATION. LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh index 52e3e1d485..17092c6484 100755 --- a/ci/use_wheels_from_prs.sh +++ b/ci/use_wheels_from_prs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2024, NVIDIA CORPORATION. RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" From f2d8a88c7341b7bc4fbb43f582627feb853e55cd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Sep 2024 15:44:23 -0500 Subject: [PATCH 17/17] remove testing-only changes [skip ci] --- ci/build_cpp.sh | 3 - ci/build_python.sh | 3 - ci/build_wheel.sh | 2 - ci/test_cpp.sh | 1 - ci/test_python.sh | 1 - ci/test_wheel_pylibraft.sh | 2 - ci/test_wheel_raft_dask.sh | 2 - ci/use_conda_packages_from_prs.sh | 16 ----- ci/use_wheels_from_prs.sh | 59 ------------------- .../cmake/thirdparty/fetch_rapids.cmake | 2 - rapids_config.cmake | 2 - 11 files changed, 93 deletions(-) delete mode 100755 ci/use_conda_packages_from_prs.sh delete mode 100755 ci/use_wheels_from_prs.sh diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index b11a99bf56..c456bcae80 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,9 +11,6 @@ source rapids-date-string export CMAKE_GENERATOR=Ninja -cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ -source ./ci/use_conda_packages_from_prs.sh - rapids-print-env rapids-logger "Begin cpp build" diff --git a/ci/build_python.sh b/ci/build_python.sh index c54e998935..80d37b5ae3 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -11,9 +11,6 @@ source rapids-date-string export CMAKE_GENERATOR=Ninja -cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ -source ./ci/use_conda_packages_from_prs.sh - rapids-print-env rapids-logger "Begin py build" diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 5a1d154728..e7ae52f33a 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -18,8 +18,6 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" rapids-generate-version > VERSION -source ./ci/use_wheels_from_prs.sh - cd "${package_dir}" case "${RAPIDS_CUDA_VERSION}" in diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index e819bf61d6..05323e4f5d 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -5,7 +5,6 @@ set -euo pipefail # Support invoking test_cpp.sh outside the script directory cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ -source ./ci/use_conda_packages_from_prs.sh . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index cd94103498..01e5ac9456 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -5,7 +5,6 @@ set -euo pipefail # Support invoking test_python.sh outside the script directory cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ -source ./ci/use_conda_packages_from_prs.sh . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_wheel_pylibraft.sh b/ci/test_wheel_pylibraft.sh index 3fd4225526..b38f5a690b 100755 --- a/ci/test_wheel_pylibraft.sh +++ b/ci/test_wheel_pylibraft.sh @@ -7,8 +7,6 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -source ./ci/use_wheels_from_prs.sh - # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/pylibraft*.whl)[test] diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index 6ce87bceb5..9b1187592d 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -7,8 +7,6 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -source ./ci/use_wheels_from_prs.sh - # Download the pylibraft built in the previous step RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-pylibraft-dep python -m pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh deleted file mode 100755 index 0783567f21..0000000000 --- a/ci/use_conda_packages_from_prs.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) - -CUDF_CPP_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 cpp) -CUDF_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 python) - -UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp) - -conda config --system --add channels "${LIBRMM_CHANNEL}" -conda config --system --add channels "${RMM_CHANNEL}" -conda config --system --add channels "${CUDF_CPP_CHANNEL}" -conda config --system --add channels "${CUDF_PYTHON_CHANNEL}" -conda config --system --add channels "${UCXX_CHANNEL}" diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh deleted file mode 100755 index 17092c6484..0000000000 --- a/ci/use_wheels_from_prs.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" - -LIBRMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp -) -RMM_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python -) - -UCXX_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python -) -LIBUCXX_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=libucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 cpp -) -DISTRIBUTED_UCXX_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=distributed_ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python -) - -CUDF_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=cudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python -) -LIBCUDF_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=libcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 cpp -) -PYLIBCUDF_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=pylibcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python -) -DASK_CUDF_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME=dask_cudf_${RAPIDS_PY_CUDA_SUFFIX} \ - RAPIDS_PY_WHEEL_PURE=1 \ - rapids-get-pr-wheel-artifact cudf 16806 python -) - -# RAFT_DASK_CHANNEL=$( -# RAPIDS_PY_WHEEL_NAME=raft_dask_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python -# ) -# PYLIBRAFT_CHANNEL=$( -# RAPIDS_PY_WHEEL_NAME=pylibraft_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python -# ) - -cat > /tmp/constraints.txt <