diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 740a6409ccd..e86ee405cd1 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -13,12 +13,15 @@ export CMAKE_GENERATOR=Ninja rapids-print-env +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) + version=$(rapids-generate-version) rapids-logger "Begin cpp build" # With boa installed conda build forward to boa RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ + --channel "${LIBRMM_CHANNEL}" \ conda/recipes/libcudf rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 3c2a7761e1a..250869339a4 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -25,6 +25,8 @@ done rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly @@ -32,24 +34,32 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/cudf RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/dask-cudf RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/cudf_kafka RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/custreamz diff --git a/ci/test_cpp_common.sh b/ci/test_cpp_common.sh index da847137a2b..7ce17e772c6 100755 --- a/ci/test_cpp_common.sh +++ b/ci/test_cpp_common.sh @@ -22,6 +22,7 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) RESULTS_DIR=${RAPIDS_TESTS_DIR:-"$(mktemp -d)"} RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${RESULTS_DIR}/test-results"}/ @@ -31,6 +32,7 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ libcudf libcudf_kafka libcudf-tests libcudf-example rapids-logger "Check GPU usage" diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 7559d970f6d..3ef85988138 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -26,6 +26,8 @@ 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 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) RESULTS_DIR=${RAPIDS_TESTS_DIR:-"$(mktemp -d)"} RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${RESULTS_DIR}/test-results"}/ @@ -37,4 +39,6 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ cudf libcudf diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 7a5fef9f25e..4e98122d6b7 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -30,7 +30,7 @@ dependencies: - dlpack>=0.8,<1.0 - doxygen=1.9.1 - fastavro>=0.22.9 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - fsspec>=0.6.0 - gcc_linux-64=11.* - hypothesis @@ -82,7 +82,7 @@ dependencies: - s3fs>=2022.3.0 - scikit-build-core>=0.7.0 - scipy -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-autobuild - sphinx-copybutton diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 48453e18bb0..17e8b490088 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -31,7 +31,7 @@ dependencies: - dlpack>=0.8,<1.0 - doxygen=1.9.1 - fastavro>=0.22.9 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - fsspec>=0.6.0 - gcc_linux-64=11.* - hypothesis @@ -80,7 +80,7 @@ dependencies: - s3fs>=2022.3.0 - scikit-build-core>=0.7.0 - scipy -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-autobuild - sphinx-copybutton diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index b7fbaab9306..a69c2d4532f 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -26,10 +26,10 @@ librdkafka_version: - ">=1.9.0,<1.10.0a0" fmt_version: - - ">=10.1.1,<11" + - ">=10.2.1,<11" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.13.0,<1.14" nvcomp_version: - "=3.0.6" diff --git a/cpp/cmake/thirdparty/get_spdlog.cmake b/cpp/cmake/thirdparty/get_spdlog.cmake index c0e07d02d94..2284978d84a 100644 --- a/cpp/cmake/thirdparty/get_spdlog.cmake +++ b/cpp/cmake/thirdparty/get_spdlog.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-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,18 +19,11 @@ function(find_and_configure_spdlog) rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET cudf-exports) rapids_export_package(BUILD spdlog cudf-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 cudf-exports - ) - endif() + rapids_cpm_spdlog( + FMT_OPTION "EXTERNAL_FMT_HO" + INSTALL_EXPORT_SET cudf-exports + BUILD_EXPORT_SET cudf-exports + ) endfunction() find_and_configure_spdlog() diff --git a/dependencies.yaml b/dependencies.yaml index 1508656471d..c569f824ad0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -246,13 +246,13 @@ dependencies: common: - output_types: conda packages: - - fmt>=10.1.1,<11 + - fmt>=10.2.1,<11 - librmm==24.6.* - libkvikio==24.6.* - librdkafka>=1.9.0,<1.10.0a0 # Align nvcomp version with rapids-cmake - nvcomp==3.0.6 - - spdlog>=1.12.0,<1.13 + - spdlog>=1.13.0,<1.14 build_wheels: common: - output_types: [requirements, pyproject] diff --git a/rapids_config.cmake b/rapids_config.cmake index 3a88769f6e7..3ce4b417d8a 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -27,6 +27,12 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/CUDF_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + include(FetchContent) + FetchContent_Declare( + rapids-cmake + GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git + GIT_TAG fmt-version + ) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake"