From cadb79b6ca1ca2590f598be44b4b3f03be979988 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 17 Nov 2024 18:09:38 +0000 Subject: [PATCH 1/6] Adapt to rmm logger changes --- cpp/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index e4fa3b28383..b5867d847d9 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -926,9 +926,16 @@ add_dependencies(cudf jitify_preprocess_run) # Specify the target module library dependencies target_link_libraries( cudf - PUBLIC CCCL::CCCL rmm::rmm $ spdlog::spdlog_header_only - PRIVATE $ cuco::cuco ZLIB::ZLIB nvcomp::nvcomp - kvikio::kvikio $ nanoarrow + PUBLIC CCCL::CCCL rmm::rmm rmm::rmm_logger $ + spdlog::spdlog_header_only + PRIVATE $ + cuco::cuco + ZLIB::ZLIB + nvcomp::nvcomp + kvikio::kvikio + $ + nanoarrow + $ ) # Add Conda library, and include paths if specified From 37439d70e68cdde59ca3b5bf6ad820aba69c0242 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 27 Nov 2024 01:46:45 +0000 Subject: [PATCH 2/6] Test against rmm branch --- ci/build_cpp.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 3d06eacf9ff..8b9a34c8167 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -17,9 +17,12 @@ rapids-logger "Begin cpp build" sccache --zero-stats +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1739 cpp) + # With boa installed conda build forward to boa RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ - conda/recipes/libcudf + conda/recipes/libcudf \ + --channel "${LIBRMM_CHANNEL}" sccache --show-adv-stats From 0ce74dac8ab4ec2378630202747edc834843d6b9 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 27 Nov 2024 02:14:24 +0000 Subject: [PATCH 3/6] Use an override to test in static compilation settings --- cpp/cmake/thirdparty/get_rmm.cmake | 6 +++++- cpp/cmake/thirdparty/patches/rmm_override.json | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 cpp/cmake/thirdparty/patches/rmm_override.json diff --git a/cpp/cmake/thirdparty/get_rmm.cmake b/cpp/cmake/thirdparty/get_rmm.cmake index 854bd3d1149..0a5263182ca 100644 --- a/cpp/cmake/thirdparty/get_rmm.cmake +++ b/cpp/cmake/thirdparty/get_rmm.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2020-2021, NVIDIA CORPORATION. +# Copyright (c) 2020-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 @@ -15,6 +15,10 @@ # This function finds rmm and sets any additional necessary environment variables. function(find_and_configure_rmm) include(${rapids-cmake-dir}/cpm/rmm.cmake) + include(${rapids-cmake-dir}/cpm/package_override.cmake) + + set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") + rapids_cpm_package_override("${cudf_patch_dir}/rmm_override.json") # Find or install RMM rapids_cpm_rmm(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports) diff --git a/cpp/cmake/thirdparty/patches/rmm_override.json b/cpp/cmake/thirdparty/patches/rmm_override.json new file mode 100644 index 00000000000..ce31e09994d --- /dev/null +++ b/cpp/cmake/thirdparty/patches/rmm_override.json @@ -0,0 +1,9 @@ +{ + "packages": { + "rmm": { + "version": "25.02", + "git_url": "https://github.com/vyasr/rmm.git", + "git_tag": "fix/logger_issues" + } + } +} From 7e3bf3af01c7422a84181afe329ea8d09426f68c Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 27 Nov 2024 05:23:58 +0000 Subject: [PATCH 4/6] Use impl target unconditionally --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index b5867d847d9..bb844b2b704 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -935,7 +935,7 @@ target_link_libraries( kvikio::kvikio $ nanoarrow - $ + rmm::rmm_logger_impl ) # Add Conda library, and include paths if specified From 1a3d812278c2c149091c2ab9749ed055584996ad Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 27 Nov 2024 14:47:29 +0000 Subject: [PATCH 5/6] Revert "Use an override to test in static compilation settings" This reverts commit 0ce74dac8ab4ec2378630202747edc834843d6b9. --- cpp/cmake/thirdparty/get_rmm.cmake | 6 +----- cpp/cmake/thirdparty/patches/rmm_override.json | 9 --------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 cpp/cmake/thirdparty/patches/rmm_override.json diff --git a/cpp/cmake/thirdparty/get_rmm.cmake b/cpp/cmake/thirdparty/get_rmm.cmake index 0a5263182ca..854bd3d1149 100644 --- a/cpp/cmake/thirdparty/get_rmm.cmake +++ b/cpp/cmake/thirdparty/get_rmm.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2020-2024, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, 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 @@ -15,10 +15,6 @@ # This function finds rmm and sets any additional necessary environment variables. function(find_and_configure_rmm) include(${rapids-cmake-dir}/cpm/rmm.cmake) - include(${rapids-cmake-dir}/cpm/package_override.cmake) - - set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") - rapids_cpm_package_override("${cudf_patch_dir}/rmm_override.json") # Find or install RMM rapids_cpm_rmm(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports) diff --git a/cpp/cmake/thirdparty/patches/rmm_override.json b/cpp/cmake/thirdparty/patches/rmm_override.json deleted file mode 100644 index ce31e09994d..00000000000 --- a/cpp/cmake/thirdparty/patches/rmm_override.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "packages": { - "rmm": { - "version": "25.02", - "git_url": "https://github.com/vyasr/rmm.git", - "git_tag": "fix/logger_issues" - } - } -} From 67ac08c14d8694f038486b4dab10c7329f887ae3 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 27 Nov 2024 14:47:34 +0000 Subject: [PATCH 6/6] Revert "Test against rmm branch" This reverts commit 37439d70e68cdde59ca3b5bf6ad820aba69c0242. --- ci/build_cpp.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 8b9a34c8167..3d06eacf9ff 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -17,12 +17,9 @@ rapids-logger "Begin cpp build" sccache --zero-stats -LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1739 cpp) - # With boa installed conda build forward to boa RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ - conda/recipes/libcudf \ - --channel "${LIBRMM_CHANNEL}" + conda/recipes/libcudf sccache --show-adv-stats