From 57db9f7a8a645c7aa661f27c0962632c5e00a958 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 17 Jan 2025 09:54:13 -0600 Subject: [PATCH] Revert libraft testing changes. --- ci/build_cpp.sh | 5 +---- ci/build_docs.sh | 5 +---- ci/build_python.sh | 5 +---- ci/build_wheel_cuml.sh | 6 ------ ci/build_wheel_libcuml.sh | 3 --- ci/test_cpp.sh | 5 +---- ci/test_notebooks.sh | 5 +---- ci/test_python_common.sh | 5 +---- ci/use_conda_packages_from_prs.sh | 10 ---------- ci/use_wheels_from_prs.sh | 22 ---------------------- 10 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 ci/use_conda_packages_from_prs.sh delete mode 100644 ci/use_wheels_from_prs.sh diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 7c35f35be5..fa066c03c6 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2025, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail @@ -9,9 +9,6 @@ source rapids-configure-sccache source rapids-date-string -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - export CMAKE_GENERATOR=Ninja rapids-print-env diff --git a/ci/build_docs.sh b/ci/build_docs.sh index a1cc16eb10..05f1f24ee5 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2023-2025, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. set -euo pipefail rapids-logger "Create test conda environment" @@ -8,9 +8,6 @@ rapids-logger "Create test conda environment" RAPIDS_VERSION="$(rapids-version)" export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - rapids-dependency-file-generator \ --output conda \ --file-key docs \ diff --git a/ci/build_python.sh b/ci/build_python.sh index d0b5724f89..e8d2b3ed39 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2025, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail @@ -9,9 +9,6 @@ source rapids-configure-sccache source rapids-date-string -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - export CMAKE_GENERATOR=Ninja rapids-print-env diff --git a/ci/build_wheel_cuml.sh b/ci/build_wheel_cuml.sh index bd5d9da86f..4b8525ce78 100755 --- a/ci/build_wheel_cuml.sh +++ b/ci/build_wheel_cuml.sh @@ -12,14 +12,8 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" # available for pip to find. RAPIDS_PY_WHEEL_NAME="libcuml_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuml_dist -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ./ci/use_wheels_from_prs.sh - rapids-logger "Generating build requirements" -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ./ci/use_wheels_from_prs.sh - rapids-dependency-file-generator \ --output requirements \ --file-key "py_build_${package_name}" \ diff --git a/ci/build_wheel_libcuml.sh b/ci/build_wheel_libcuml.sh index a795ccc987..b2a32d47ab 100755 --- a/ci/build_wheel_libcuml.sh +++ b/ci/build_wheel_libcuml.sh @@ -10,9 +10,6 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" rapids-logger "Generating build requirements" -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ./ci/use_wheels_from_prs.sh - rapids-dependency-file-generator \ --output requirements \ --file-key "py_build_${package_name}" \ diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 9535d43ae7..ea6d1cdc11 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2025, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail @@ -11,9 +11,6 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index c3d8ec7453..d76a754b8b 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2025, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. set -euo pipefail . /opt/conda/etc/profile.d/conda.sh @@ -8,9 +8,6 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - rapids-logger "Generate Notebook testing dependencies" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 0430c553c3..5f1894356c 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2025, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail @@ -9,9 +9,6 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -# TODO(jameslamb): remove this when https://github.com/rapidsai/raft/pull/2531 is merged -source ci/use_conda_packages_from_prs.sh - rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh deleted file mode 100644 index 3b1cba3bfb..0000000000 --- a/ci/use_conda_packages_from_prs.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2025, NVIDIA CORPORATION. -# TODO(jameslamb): remove this file when https://github.com/rapidsai/raft/pull/2531 is merged - -RAFT_COMMIT="0d6597b08919f2aae8ac268f1a68d6a8fe5beb4e" - -RAFT_CPP_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}") -RAFT_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 python "${RAFT_COMMIT:0:7}") - -conda config --system --add channels "${RAFT_CPP_CHANNEL}" -conda config --system --add channels "${RAFT_PYTHON_CHANNEL}" diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh deleted file mode 100644 index aea295d4bd..0000000000 --- a/ci/use_wheels_from_prs.sh +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2025, NVIDIA CORPORATION. -# TODO(jameslamb): remove this file when https://github.com/rapidsai/raft/pull/2531 is merged - -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" - -RAFT_COMMIT="0d6597b08919f2aae8ac268f1a68d6a8fe5beb4e" -LIBRAFT_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" -) -PYLIBRAFT_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 python "${RAFT_COMMIT:0:7}" -) -RAFT_DASK_CHANNEL=$( - RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 python "${RAFT_COMMIT:0:7}" -) -cat > ./constraints.txt <