From 2565477629ae6fcc7771f17a2cd1c4b00929ee16 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 2 Nov 2023 20:33:25 -0500 Subject: [PATCH 1/5] Build with spdlog 1.12.0 and fmt 10.1.1. --- fetch_rapids.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 37fb090fd6..df175cce73 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -11,6 +11,8 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= +set(rapids-cmake-repo kkraus14/rapids-cmake) +set(rapids-cmake-branch spdlog_1.12_fmt_10) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS.cmake From f75466c041cf7ffea1ba01ddba2677b6ee30bbf8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 22 Nov 2023 14:22:30 -0800 Subject: [PATCH 2/5] Use upstream packages. --- ci/build_cpp.sh | 8 +++++++- ci/build_python.sh | 14 +++++++++++++- ci/test_cpp.sh | 4 ++++ ci/test_python_common.sh | 12 ++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 0a6a649fd0..5cc41359b2 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -9,10 +9,16 @@ export CMAKE_GENERATOR=Ninja rapids-print-env +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) +LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) + version=$(rapids-generate-version) rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcuml +RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + conda/recipes/libcuml rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 1332062770..9c6d3c8793 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -14,7 +14,7 @@ package_dir="python" version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) -export RAPIDS_PACKAGE_VERSION=${version} +export RAPIDS_PACKAGE_VERSION=${version} echo "${version}" > VERSION sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/_version.py" @@ -22,12 +22,24 @@ sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${packag rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python) +LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) +RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python) +LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) +CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ + --channel "${LIBCUDF_CHANNEL}" \ + --channel "${CUDF_CHANNEL}" \ conda/recipes/cuml # Build cuml-cpu only in CUDA 11 jobs since it only depends on python diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index ebed9c9bdc..593962f5d7 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -19,6 +19,8 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) +LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -26,6 +28,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ libcuml libcuml-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 1ec5d59380..9cedbf12a0 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -21,6 +21,12 @@ set -u rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python) +LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) +RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python) +LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) +CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} @@ -31,6 +37,12 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ + --channel "${LIBCUDF_CHANNEL}" \ + --channel "${CUDF_CHANNEL}" \ libcuml cuml rapids-logger "Check GPU usage" From b2cf4dfb08f1f8df391ee03e0b1110b515026214 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 27 Nov 2023 14:23:53 -0800 Subject: [PATCH 3/5] Use cumlprims_mg artifacts. --- ci/build_cpp.sh | 2 ++ ci/build_python.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 5cc41359b2..07e56d7916 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,6 +11,7 @@ rapids-print-env LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) +LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg 160 cpp) version=$(rapids-generate-version) @@ -19,6 +20,7 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --channel "${LIBRMM_CHANNEL}" \ --channel "${LIBRAFT_CHANNEL}" \ + --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \ conda/recipes/libcuml rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 9c6d3c8793..6fbe6a37fb 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -28,6 +28,7 @@ LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python) LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) +LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg 160 cpp) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly @@ -40,6 +41,7 @@ rapids-conda-retry mambabuild \ --channel "${RAFT_CHANNEL}" \ --channel "${LIBCUDF_CHANNEL}" \ --channel "${CUDF_CHANNEL}" \ + --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \ conda/recipes/cuml # Build cuml-cpu only in CUDA 11 jobs since it only depends on python From 9beca956022b24c337176f34b204330d0bc13aae Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 29 Nov 2023 21:30:06 -0600 Subject: [PATCH 4/5] Drop cumlprims (no private repo access). --- ci/build_cpp.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 07e56d7916..5cc41359b2 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,7 +11,6 @@ rapids-print-env LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) -LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg 160 cpp) version=$(rapids-generate-version) @@ -20,7 +19,6 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --channel "${LIBRMM_CHANNEL}" \ --channel "${LIBRAFT_CHANNEL}" \ - --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \ conda/recipes/libcuml rapids-upload-conda-to-s3 cpp From 984d6919b7cec0de685fca70caa8ce875b30bdd8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 29 Nov 2023 21:30:44 -0600 Subject: [PATCH 5/5] Drop cumlprims_mg. --- ci/build_python.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 6fbe6a37fb..9c6d3c8793 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -28,7 +28,6 @@ LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp) RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python) LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) -LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg 160 cpp) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly @@ -41,7 +40,6 @@ rapids-conda-retry mambabuild \ --channel "${RAFT_CHANNEL}" \ --channel "${LIBCUDF_CHANNEL}" \ --channel "${CUDF_CHANNEL}" \ - --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \ conda/recipes/cuml # Build cuml-cpu only in CUDA 11 jobs since it only depends on python