From 18e5f8c63d97976a2681b3f299b54cec617f82e9 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 2 Nov 2023 20:33:04 -0500 Subject: [PATCH 1/4] Build with spdlog 1.12.0 and fmt 10.1.1. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-120_arch-x86_64.yaml | 4 ++-- dependencies.yaml | 4 ++-- fetch_rapids.cmake | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index b3ac9d4f..f765b3cc 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - dask-cuda==23.12.* - dask-cudf==23.12.* - distributed -- fmt>=9.1.0,<10 +- fmt>=10.1.1,<11 - gmock>=1.13.0 - gtest>=1.13.0 - librmm==23.12.* @@ -41,7 +41,7 @@ dependencies: - rmm==23.12.* - scikit-build>=0.13.1 - setuptools -- spdlog>=1.11.0,<1.12 +- spdlog>=1.12.0,<1.13 - tomli - ucx - wheel diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 42dbb4f5..869f8f46 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - dask-cuda==23.12.* - dask-cudf==23.12.* - distributed -- fmt>=9.1.0,<10 +- fmt>=10.1.1,<11 - gmock>=1.13.0 - gtest>=1.13.0 - librmm==23.12.* @@ -41,7 +41,7 @@ dependencies: - rmm==23.12.* - scikit-build>=0.13.1 - setuptools -- spdlog>=1.11.0,<1.12 +- spdlog>=1.12.0,<1.13 - tomli - ucx - wheel diff --git a/dependencies.yaml b/dependencies.yaml index ba444b8c..3d699a3f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -67,12 +67,12 @@ dependencies: - c-compiler - cxx-compiler - &cmake_ver cmake>=3.26.4 - - fmt>=9.1.0,<10 + - fmt>=10.1.1,<11 - &gmock gmock>=1.13.0 - >est gtest>=1.13.0 - librmm==23.12.* - ninja - - spdlog>=1.11.0,<1.12 + - spdlog>=1.12.0,<1.13 build_python: common: - output_types: [conda, requirements, pyproject] diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 7d8d63f0..fb6d8384 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}/UCXX_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake From e2f1acdcdd7c8f234b188658e4023ca4a6a5b942 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 22 Nov 2023 13:14:41 -0600 Subject: [PATCH 2/4] Test with rmm artifacts. --- ci/build_cpp.sh | 5 +++++ ci/test_cpp.sh | 5 +++++ ci/test_python.sh | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index b554950d..6b33212a 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,9 +11,14 @@ export CMAKE_GENERATOR=Ninja rapids-print-env +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python) + rapids-logger "Begin C++ and Python builds" rapids-conda-retry mambabuild \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/ucxx rapids-upload-conda-to-s3 cpp diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 5d72d463..32609fcc 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -96,8 +96,13 @@ run_port_retry() { rapids-logger "Downloading artifacts from previous jobs" 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) + rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libucxx libucxx-examples libucxx-tests print_ucx_config diff --git a/ci/test_python.sh b/ci/test_python.sh index 169674e2..08bec6ac 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -89,8 +89,13 @@ run_distributed_ucxx_tests() { rapids-logger "Downloading artifacts from previous jobs" 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) + rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libucxx ucxx distributed-ucxx # TODO: Perhaps install from conda? We need distributed installed in developer From b9c5837d08eeb0e75f62c2564cf27e9540e30d80 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 29 Nov 2023 16:17:49 -0800 Subject: [PATCH 3/4] Use cudf artifacts. --- ci/test_python.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/test_python.sh b/ci/test_python.sh index 08bec6ac..a21cd08c 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -91,11 +91,15 @@ 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) +LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) +CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${LIBRMM_CHANNEL}" \ --channel "${RMM_CHANNEL}" \ + --channel "${LIBCUDF_CHANNEL}" \ + --channel "${CUDF_CHANNEL}" \ libucxx ucxx distributed-ucxx # TODO: Perhaps install from conda? We need distributed installed in developer From 27c82a4693da7069d6ed301c6201b8871a6256eb Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 30 Nov 2023 10:53:02 -0600 Subject: [PATCH 4/4] Revert build changes. --- ci/build_cpp.sh | 5 ----- ci/test_cpp.sh | 5 ----- ci/test_python.sh | 9 --------- fetch_rapids.cmake | 2 -- 4 files changed, 21 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 6b33212a..b554950d 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,14 +11,9 @@ export CMAKE_GENERATOR=Ninja rapids-print-env -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp) -RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python) - rapids-logger "Begin C++ and Python builds" rapids-conda-retry mambabuild \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ conda/recipes/ucxx rapids-upload-conda-to-s3 cpp diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 32609fcc..5d72d463 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -96,13 +96,8 @@ run_port_retry() { rapids-logger "Downloading artifacts from previous jobs" 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) - rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ libucxx libucxx-examples libucxx-tests print_ucx_config diff --git a/ci/test_python.sh b/ci/test_python.sh index a21cd08c..169674e2 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -89,17 +89,8 @@ run_distributed_ucxx_tests() { rapids-logger "Downloading artifacts from previous jobs" 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) -LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp) -CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python) - rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - --channel "${LIBRMM_CHANNEL}" \ - --channel "${RMM_CHANNEL}" \ - --channel "${LIBCUDF_CHANNEL}" \ - --channel "${CUDF_CHANNEL}" \ libucxx ucxx distributed-ucxx # TODO: Perhaps install from conda? We need distributed installed in developer diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 7e655b3d..62a33c30 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -11,8 +11,6 @@ # 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}/UCXX_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake