From f89b0693d2670761f21ae2f98854c60ba85a367e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 28 Jan 2025 07:38:29 +0000 Subject: [PATCH 01/13] Point at the library branch of rapids-logger --- rapids-cmake/cpm/rapids_logger.cmake | 25 +++++++++++++------------ rapids-cmake/cpm/versions.json | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/rapids-cmake/cpm/rapids_logger.cmake b/rapids-cmake/cpm/rapids_logger.cmake index ce10f469..aef48a43 100644 --- a/rapids-cmake/cpm/rapids_logger.cmake +++ b/rapids-cmake/cpm/rapids_logger.cmake @@ -26,28 +26,23 @@ Allow projects to build `rapids-logger` via `CPM`. Uses the version of rapids-logger :ref:`specified in the version file ` for consistency across all RAPIDS projects. -Unlike most `rapids_cpm` functions, this one does not support export sets because rapids-logger adds targets directly to the calling project's own export set and does not require its own exporting or to be found at all by consuming projects once the first project's call to rapids_make_logger has completed. - .. code-block:: cmake - rapids_cpm_rapids_logger( [ ...]) + rapids_cpm_rapids_logger( [BUILD_EXPORT_SET ] + [INSTALL_EXPORT_SET ] + [ ...]) .. |PKG_NAME| replace:: logger .. include:: common_package_args.txt -Result Functions -^^^^^^^^^^^^^^^^ - :cmake:command:`rapids_make_logger` is made available +Result Targets +^^^^^^^^^^^^^^ + rapids_logger::rapids_logger target will be created #]=======================================================================] function(rapids_cpm_rapids_logger) list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.cpm.rapids_logger") - set(options) - set(one_value) - set(multi_value) - cmake_parse_arguments(_RAPIDS "${options}" "${one_value}" "${multi_value}" ${ARGN}) - include("${rapids-cmake-dir}/cpm/detail/package_details.cmake") rapids_cpm_package_details(rapids_logger version repository tag shallow exclude) @@ -55,7 +50,7 @@ function(rapids_cpm_rapids_logger) rapids_cpm_generate_patch_command(rapids_logger ${version} patch_command) include("${rapids-cmake-dir}/cpm/find.cmake") - rapids_cpm_find(rapids_logger ${version} ${_RAPIDS_UNPARSED_ARGUMENTS} + rapids_cpm_find(rapids_logger ${version} ${ARGN} CPM_ARGS GIT_REPOSITORY ${repository} GIT_TAG ${tag} @@ -64,4 +59,10 @@ function(rapids_cpm_rapids_logger) include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake") rapids_cpm_display_patch_status(logger) + + # Propagate up variables that CPMFindPackage provide + set(rapids_logger_SOURCE_DIR "${rapids_logger_SOURCE_DIR}" PARENT_SCOPE) + set(rapids_logger_BINARY_DIR "${rapids_logger_BINARY_DIR}" PARENT_SCOPE) + set(rapids_logger_ADDED "${rapids_logger_ADDED}" PARENT_SCOPE) + set(rapids_logger_VERSION ${version} PARENT_SCOPE) endfunction() diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 2d8f971d..10c9bd3f 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -35,7 +35,7 @@ "git_shallow": false, "always_download": true, "git_url": "https://github.com/rapidsai/rapids-logger.git", - "git_tag": "8968ab3337f31c845d4e3bf6c55ae89242ded22b" + "git_tag": "feat/library" }, "fmt": { "version": "11.0.2", From 78812f87330ef4eb8537973081b18aea16c1b245 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 28 Jan 2025 19:33:44 +0000 Subject: [PATCH 02/13] Change branch --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 10c9bd3f..8e9615b9 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -35,7 +35,7 @@ "git_shallow": false, "always_download": true, "git_url": "https://github.com/rapidsai/rapids-logger.git", - "git_tag": "feat/library" + "git_tag": "feat/library_integration" }, "fmt": { "version": "11.0.2", From a012a34d1c36d7cc5e34a6755786647cd39a8227 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 28 Jan 2025 21:36:19 +0000 Subject: [PATCH 03/13] Don't build tests for rapids-logger --- rapids-cmake/cpm/rapids_logger.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/rapids_logger.cmake b/rapids-cmake/cpm/rapids_logger.cmake index aef48a43..497dd89e 100644 --- a/rapids-cmake/cpm/rapids_logger.cmake +++ b/rapids-cmake/cpm/rapids_logger.cmake @@ -55,7 +55,8 @@ function(rapids_cpm_rapids_logger) GIT_REPOSITORY ${repository} GIT_TAG ${tag} GIT_SHALLOW ${shallow} ${patch_command} - EXCLUDE_FROM_ALL ON) + EXCLUDE_FROM_ALL ON + OPTIONS "BUILD_TESTS OFF") include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake") rapids_cpm_display_patch_status(logger) From fb5e2e5915548113d76d6b8d1e0131dbaa73f571 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 29 Jan 2025 20:05:47 +0000 Subject: [PATCH 04/13] Update to new branch --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 8e9615b9..f338c6e3 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -34,7 +34,7 @@ "version": "0.1.0", "git_shallow": false, "always_download": true, - "git_url": "https://github.com/rapidsai/rapids-logger.git", + "git_url": "https://github.com/vyasr/rapids-logger.git", "git_tag": "feat/library_integration" }, "fmt": { From 076af41193a8495429d395ce0ed592779929013e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 31 Jan 2025 23:31:11 +0000 Subject: [PATCH 05/13] Bump tag --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index f338c6e3..c70c2f9d 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -35,7 +35,7 @@ "git_shallow": false, "always_download": true, "git_url": "https://github.com/vyasr/rapids-logger.git", - "git_tag": "feat/library_integration" + "git_tag": "main" }, "fmt": { "version": "11.0.2", From 762ec4ad9a884fe3f391d7d3ac8a74320f92c55e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 2 Feb 2025 03:13:47 +0000 Subject: [PATCH 06/13] Remove hardcoded always download --- rapids-cmake/cpm/versions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index c70c2f9d..3182ebfb 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -33,7 +33,6 @@ "rapids_logger": { "version": "0.1.0", "git_shallow": false, - "always_download": true, "git_url": "https://github.com/vyasr/rapids-logger.git", "git_tag": "main" }, From b9f313a0543df368850d27e186eb81fe2e067597 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 2 Feb 2025 04:15:12 +0000 Subject: [PATCH 07/13] Fix path --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 3182ebfb..cf1409d0 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -33,7 +33,7 @@ "rapids_logger": { "version": "0.1.0", "git_shallow": false, - "git_url": "https://github.com/vyasr/rapids-logger.git", + "git_url": "https://github.com/rapidsai/rapids-logger.git", "git_tag": "main" }, "fmt": { From 481e8633664e70d696500e0ce3b397bdf829af76 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 2 Feb 2025 17:43:23 +0000 Subject: [PATCH 08/13] Have rapids-cmake pull rmm from the custom branch for testing --- rapids-cmake/cpm/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index cf1409d0..f9734205 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -78,8 +78,8 @@ }, "rmm": { "version": "${rapids-cmake-version}", - "git_url": "https://github.com/rapidsai/rmm.git", - "git_tag": "branch-${version}" + "git_url": "https://github.com/vyasr/rmm.git", + "git_tag": "feat/rapids_logger_library" }, "spdlog": { "version": "1.14.1", From 6bcf88836cfd967388d0e23b97d3fa2087f02027 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 4 Feb 2025 20:11:17 +0000 Subject: [PATCH 09/13] Update rmm tests to no longer expect the logger target --- testing/cpm/cpm_rmm-simple.cmake | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/testing/cpm/cpm_rmm-simple.cmake b/testing/cpm/cpm_rmm-simple.cmake index f98498c3..9284d36c 100644 --- a/testing/cpm/cpm_rmm-simple.cmake +++ b/testing/cpm/cpm_rmm-simple.cmake @@ -21,22 +21,10 @@ rapids_cpm_init() if(TARGET rmm::rmm) message(FATAL_ERROR "Expected rmm::rmm not to exist") endif() -if(TARGET rmm::rmm_logger) - message(FATAL_ERROR "Expected rmm::rmm_logger not to exist") -endif() -if(TARGET rmm::rmm_logger_impl) - message(FATAL_ERROR "Expected rmm::rmm_logger_impl not to exist") -endif() rapids_cpm_rmm() if(NOT TARGET rmm::rmm) message(FATAL_ERROR "Expected rmm::rmm target to exist") endif() -if(NOT TARGET rmm::rmm_logger) - message(FATAL_ERROR "Expected rmm::rmm_logger target to exist") -endif() -if(NOT TARGET rmm::rmm_logger_impl) - message(FATAL_ERROR "Expected rmm::rmm_logger_impl target to exist") -endif() rapids_cpm_rmm() From aed468bd353f668e5330826d2ff834fd6116217f Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 4 Feb 2025 20:25:32 +0000 Subject: [PATCH 10/13] Update logger test --- testing/cpm/cpm_logger-simple.cmake | 38 ++++++++++------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/testing/cpm/cpm_logger-simple.cmake b/testing/cpm/cpm_logger-simple.cmake index ed655644..e9b2b028 100644 --- a/testing/cpm/cpm_logger-simple.cmake +++ b/testing/cpm/cpm_logger-simple.cmake @@ -17,32 +17,20 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/rapids_logger.cmake) rapids_cpm_init() -rapids_cpm_rapids_logger() - -set(logger_namespace rapids) -set(logger_target "${logger_namespace}_logger") -set(logger_impl_target "${logger_namespace}_logger_impl") +if(TARGET rapids_logger::rapids_logger) + message(FATAL_ERROR "Expected rapids_logger::rapids_logger not to exist") +endif() -rapids_make_logger("${logger_namespace}") +if(COMMAND create_logger_macros) + message(FATAL_ERROR "Expected create_logger_macros function not to exist") +endif() -function(check_target target) - if(NOT TARGET "${target}") - message(FATAL_ERROR "Target ${target} was not created.") - endif() -endfunction() - -function(check_file fn) - if(NOT EXISTS "${fn}") - message(FATAL_ERROR "File ${fn} was not created.") - endif() -endfunction() +rapids_cpm_rapids_logger() -check_target("${logger_target}") -check_target("${logger_impl_target}") -check_target("${logger_namespace}::${logger_target}") -check_target("${logger_namespace}::${logger_impl_target}") +if(NOT TARGET rapids_logger::rapids_logger) + message(FATAL_ERROR "Expected rapids_logger::rapids_logger to exist") +endif() -set(base_dir "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${logger_namespace}") -check_file("${base_dir}/logger.hpp") -check_file("${base_dir}/logger_impl/logger_impl.hpp") -check_file("${base_dir}/logger_impl/logger.cpp") +if(NOT COMMAND create_logger_macros) + message(FATAL_ERROR "Expected create_logger_macros function to exist") +endif() From ae4cb7f8c534e3cf7c41e3c3d61aa27c3d6b859e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 5 Feb 2025 20:52:35 +0000 Subject: [PATCH 11/13] Remove EXCLUDE_FROM_ALL from rapids-logger itself --- rapids-cmake/cpm/rapids_logger.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/rapids-cmake/cpm/rapids_logger.cmake b/rapids-cmake/cpm/rapids_logger.cmake index 497dd89e..9bda7bb8 100644 --- a/rapids-cmake/cpm/rapids_logger.cmake +++ b/rapids-cmake/cpm/rapids_logger.cmake @@ -55,7 +55,6 @@ function(rapids_cpm_rapids_logger) GIT_REPOSITORY ${repository} GIT_TAG ${tag} GIT_SHALLOW ${shallow} ${patch_command} - EXCLUDE_FROM_ALL ON OPTIONS "BUILD_TESTS OFF") include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake") From 38bd7b8e2c81bff9adc53434f17c5d1ec4097b65 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 10 Feb 2025 21:03:51 +0000 Subject: [PATCH 12/13] Update tag --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index f9734205..2097d362 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -34,7 +34,7 @@ "version": "0.1.0", "git_shallow": false, "git_url": "https://github.com/rapidsai/rapids-logger.git", - "git_tag": "main" + "git_tag": "46070bb255482f0782ca840ae45de9354380e298" }, "fmt": { "version": "11.0.2", From 7b5057cbf7cf8cf480f88497818bc582fc968726 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 10 Feb 2025 21:05:28 +0000 Subject: [PATCH 13/13] Revert rmm testing change --- rapids-cmake/cpm/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 2097d362..555a7006 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -78,8 +78,8 @@ }, "rmm": { "version": "${rapids-cmake-version}", - "git_url": "https://github.com/vyasr/rmm.git", - "git_tag": "feat/rapids_logger_library" + "git_url": "https://github.com/rapidsai/rmm.git", + "git_tag": "branch-${version}" }, "spdlog": { "version": "1.14.1",