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