From 876cf9168d3943d0a5354a758b3ad2e0f7710734 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 7 Dec 2022 14:28:11 -0600 Subject: [PATCH 01/15] Update to spdlog>=1.11.0, fmt>=9.1.0. --- conda/environments/all_cuda-115_arch-x86_64.yaml | 3 ++- conda/environments/all_cuda-116_arch-x86_64.yaml | 3 ++- conda/recipes/librmm/conda_build_config.yaml | 5 ++++- conda/recipes/librmm/meta.yaml | 3 +++ dependencies.yaml | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 0f6da8e09..78cd7d316 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -13,6 +13,7 @@ dependencies: - cudatoolkit=11.5 - cython>=0.29,<0.30 - flake8=3.8.3 +- fmt>=9.1.0 - gcovr>=5.0 - isort=5.10.1 - ninja @@ -22,5 +23,5 @@ dependencies: - pytest-cov - python>=3.8,<3.10 - scikit-build>=0.13.1 -- spdlog>=1.8.5,<1.9 +- spdlog>=1.11.0 name: all_cuda-115_arch-x86_64 diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml index 646565a90..72efa849c 100644 --- a/conda/environments/all_cuda-116_arch-x86_64.yaml +++ b/conda/environments/all_cuda-116_arch-x86_64.yaml @@ -13,6 +13,7 @@ dependencies: - cudatoolkit=11.6 - cython>=0.29,<0.30 - flake8=3.8.3 +- fmt>=9.1.0 - gcovr>=5.0 - isort=5.10.1 - ninja @@ -22,5 +23,5 @@ dependencies: - pytest-cov - python>=3.8,<3.10 - scikit-build>=0.13.1 -- spdlog>=1.8.5,<1.9 +- spdlog>=1.11.0 name: all_cuda-116_arch-x86_64 diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index ce0bbeec5..0bf24d41d 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -10,11 +10,14 @@ cuda_compiler: cmake_version: - ">=3.23.1,!=3.25.0" +fmt_version: + - ">=9.1.0" + gtest_version: - "=1.10.0" spdlog_version: - - ">=1.8.5,<1.9" + - ">=1.11.0" sysroot_version: - "2.17" diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index a6599bb33..e73790cf9 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -51,8 +51,11 @@ outputs: requirements: build: - cmake {{ cmake_version }} + - fmt {{ fmt_version }} + - spdlog {{ spdlog_version }} run: - cudatoolkit {{ cuda_spec }} + - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} test: commands: diff --git a/dependencies.yaml b/dependencies.yaml index bd9b36122..6a4fef3e6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -43,7 +43,8 @@ dependencies: - scikit-build>=0.13.1 - output_types: conda packages: - - spdlog>=1.8.5,<1.9 + - fmt>=9.1.0 + - spdlog>=1.11.0 cudatoolkit: specific: - output_types: conda From 99bade8e1e996cdb99793cb6d176bc7ef96533bc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 7 Dec 2022 14:32:04 -0600 Subject: [PATCH 02/15] Add comment to explain dependencies. --- conda/recipes/librmm/meta.yaml | 9 +++++++-- conda/recipes/rmm/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index e73790cf9..1fd40376c 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -51,6 +51,11 @@ outputs: requirements: build: - cmake {{ cmake_version }} + # We require spdlog and fmt (which was devendored from spdlog + # conda-forge packages in 1.11.0) so that the spdlog headers are not + # pulled by CPM and installed as a part of the rmm packages. However, + # building against librmm still requires these headers so they are also + # exported as a run requirement. - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} run: @@ -92,7 +97,7 @@ outputs: - test -f $PREFIX/include/rmm/mr/host/new_delete_resource.hpp - test -f $PREFIX/include/rmm/mr/host/pinned_memory_resource.hpp about: - home: http://rapids.ai/ + home: https://rapids.ai/ license: Apache-2.0 summary: librmm library - name: librmm-tests @@ -112,6 +117,6 @@ outputs: - gtest {{ gtest_version }} - gmock {{ gtest_version }} about: - home: http://rapids.ai/ + home: https://rapids.ai/ license: Apache-2.0 summary: librmm test & benchmark executables diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 0edc9df5a..f627c0a4c 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -59,7 +59,7 @@ test: - rmm about: - home: http://rapids.ai/ + home: https://rapids.ai/ license: Apache-2.0 license_family: Apache license_file: LICENSE From 8d4d42a055159bf0889431584b20b6b4342d3f8f Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 10:34:23 -0600 Subject: [PATCH 03/15] Remove run pins (covered by run_exports of the package). --- conda/recipes/librmm/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index ce3a3581b..56a7fac2d 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -60,8 +60,6 @@ outputs: - spdlog {{ spdlog_version }} run: - cudatoolkit {{ cuda_spec }} - - fmt {{ fmt_version }} - - spdlog {{ spdlog_version }} test: commands: - test -f $PREFIX/include/rmm/thrust_rmm_allocator.h From e5272cb9dd350c190679c4e02e3a1e7f8138efdc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 10:36:13 -0600 Subject: [PATCH 04/15] Use a host section. --- conda/recipes/librmm/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 56a7fac2d..712931c13 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -51,11 +51,12 @@ outputs: requirements: build: - cmake {{ cmake_version }} + host: # We require spdlog and fmt (which was devendored from spdlog # conda-forge packages in 1.11.0) so that the spdlog headers are not # pulled by CPM and installed as a part of the rmm packages. However, - # building against librmm still requires these headers so they are also - # exported as a run requirement. + # building against librmm still requires these headers. They are also + # added as a run requirement via the packages' run_exports. - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} run: From bc66b5849f235fd3ecae2d74a02d864879034c3e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 10:37:23 -0600 Subject: [PATCH 05/15] Add pins to conda_build_config.yaml. --- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 0bf24d41d..39dec9e5c 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -11,13 +11,13 @@ cmake_version: - ">=3.23.1,!=3.25.0" fmt_version: - - ">=9.1.0" + - ">=9.1.0,<10" gtest_version: - "=1.10.0" spdlog_version: - - ">=1.11.0" + - ">=1.11.0,<1.12" sysroot_version: - "2.17" From a69b55d4f262c9e87004f3e45b6a53001f69692a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 13:52:25 -0600 Subject: [PATCH 06/15] Rerun CI to debug build log issue. From fd93f45fa1bec8a0dd55cff92260c907d60656f7 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 16:18:46 -0600 Subject: [PATCH 07/15] Move fmt, spdlog to host section of top level recipe requirements. --- conda/recipes/librmm/meta.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 712931c13..48c8693af 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -20,7 +20,14 @@ requirements: - {{ compiler('cuda') }} {{ cuda_version }} - sysroot_{{ target_platform }} {{ sysroot_version }} host: - - cudatoolkit {{ cuda_version }}.* + - cudatoolkit ={{ cuda_version }} + # We require spdlog and fmt (which was devendored from spdlog + # conda-forge packages in 1.11.0) so that the spdlog headers are not + # pulled by CPM and installed as a part of the rmm packages. However, + # building against librmm still requires these headers. They are also + # added as a run requirement via the packages' run_exports. + - fmt {{ fmt_version }} + - spdlog {{ spdlog_version }} build: script_env: @@ -51,14 +58,6 @@ outputs: requirements: build: - cmake {{ cmake_version }} - host: - # We require spdlog and fmt (which was devendored from spdlog - # conda-forge packages in 1.11.0) so that the spdlog headers are not - # pulled by CPM and installed as a part of the rmm packages. However, - # building against librmm still requires these headers. They are also - # added as a run requirement via the packages' run_exports. - - fmt {{ fmt_version }} - - spdlog {{ spdlog_version }} run: - cudatoolkit {{ cuda_spec }} test: From b7e8154b215b2ed08fcf4ce46d7481eff6c68920 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 16:22:13 -0600 Subject: [PATCH 08/15] Add fmt, spdlog to librmm run requirements. --- conda/recipes/librmm/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 48c8693af..3935c8c24 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -60,6 +60,8 @@ outputs: - cmake {{ cmake_version }} run: - cudatoolkit {{ cuda_spec }} + - fmt {{ fmt_version }} + - spdlog {{ spdlog_version }} test: commands: - test -f $PREFIX/include/rmm/thrust_rmm_allocator.h From f15eb0d4264b2f911cc89b5e2fe5cf1cc8ac95ef Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 17:03:04 -0600 Subject: [PATCH 09/15] Add ostream formatter for bytes. --- include/rmm/logger.hpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/rmm/logger.hpp b/include/rmm/logger.hpp index 8109eb888..b8134a1f3 100644 --- a/include/rmm/logger.hpp +++ b/include/rmm/logger.hpp @@ -16,12 +16,7 @@ #pragma once -// If using GCC, temporary workaround for older libcudacxx defining _LIBCPP_VERSION -// undefine it before including spdlog, due to fmtlib checking if it is defined -// TODO: remove once libcudacxx is on Github and RAPIDS depends on it -#ifdef __GNUG__ -#undef _LIBCPP_VERSION -#endif +#include #include #include @@ -89,6 +84,8 @@ struct bytes { } }; +template <> struct fmt::formatter : fmt::ostream_formatter {}; + } // namespace detail /** From 2d729f65ea06cc275b826a1b041618620b5e66b8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 17:32:03 -0600 Subject: [PATCH 10/15] Fix style. --- include/rmm/logger.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/rmm/logger.hpp b/include/rmm/logger.hpp index b8134a1f3..0199d67a6 100644 --- a/include/rmm/logger.hpp +++ b/include/rmm/logger.hpp @@ -84,7 +84,9 @@ struct bytes { } }; -template <> struct fmt::formatter : fmt::ostream_formatter {}; +template <> +struct fmt::formatter : fmt::ostream_formatter { +}; } // namespace detail From 62c1bf14c55172ce9e09df9445b0ae894f4caec8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 19 Jan 2023 17:50:33 -0600 Subject: [PATCH 11/15] Move namespace. --- include/rmm/logger.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/rmm/logger.hpp b/include/rmm/logger.hpp index 0199d67a6..9d63e7d58 100644 --- a/include/rmm/logger.hpp +++ b/include/rmm/logger.hpp @@ -84,10 +84,6 @@ struct bytes { } }; -template <> -struct fmt::formatter : fmt::ostream_formatter { -}; - } // namespace detail /** @@ -114,3 +110,7 @@ inline spdlog::logger& logger() #define RMM_LOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(&rmm::logger(), __VA_ARGS__) } // namespace rmm + +template <> +struct fmt::formatter : fmt::ostream_formatter { +}; From 06ec0f192218bd75f7e1605516df75ff5c39a36f Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Fri, 10 Feb 2023 17:40:19 -0500 Subject: [PATCH 12/15] depend on fmt explicitly, temporarily use rapids-cmake fork for testing --- CMakeLists.txt | 8 ++++- cmake/thirdparty/get_fmt.cmake | 33 +++++++++++++++++++ cmake/thirdparty/get_spdlog.cmake | 4 +-- include/rmm/logger.hpp | 5 +-- include/rmm/mr/device/detail/arena.hpp | 4 +-- .../mr/device/detail/coalescing_free_list.hpp | 6 ++-- .../detail/stream_ordered_memory_resource.hpp | 4 ++- .../mr/device/logging_resource_adaptor.hpp | 3 +- .../rmm/mr/device/pool_memory_resource.hpp | 4 ++- .../mr/device/tracking_resource_adaptor.hpp | 4 ++- tests/mr/device/callback_mr_tests.cpp | 4 +-- 11 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 cmake/thirdparty/get_fmt.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 08f4339a2..0c6eb07ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2018-2021, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, 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 @@ -14,6 +14,10 @@ cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) +# TODO(keith): REMOVE BEFORE MERGING +set(rapids-cmake-repo "kkraus14/rapids-cmake") +set(rapids-cmake-branch "spdlog_1.11_fmt") + if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) @@ -58,6 +62,7 @@ rapids_find_package( BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports) rapids_cpm_init() +include(cmake/thirdparty/get_fmt.cmake) include(cmake/thirdparty/get_spdlog.cmake) include(cmake/thirdparty/get_thrust.cmake) @@ -77,6 +82,7 @@ else() endif() target_link_libraries(rmm INTERFACE rmm::Thrust) +target_link_libraries(rmm INTERFACE fmt::fmt-header-only) target_link_libraries(rmm INTERFACE spdlog::spdlog_header_only) target_link_libraries(rmm INTERFACE dl) target_compile_features(rmm INTERFACE cxx_std_17 $) diff --git a/cmake/thirdparty/get_fmt.cmake b/cmake/thirdparty/get_fmt.cmake new file mode 100644 index 000000000..61a20177a --- /dev/null +++ b/cmake/thirdparty/get_fmt.cmake @@ -0,0 +1,33 @@ +# ============================================================================= +# Copyright (c) 2023, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed under the License +# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +# or implied. See the License for the specific language governing permissions and limitations under +# the License. +# ============================================================================= + +# Use CPM to find or clone fmt +function(find_and_configure_fmt) + + include(${rapids-cmake-dir}/cpm/fmt.cmake) + rapids_cpm_fmt(INSTALL_EXPORT_SET rmm-exports) + rapids_export_package(BUILD fmt rmm-exports) + + if(fmt_ADDED) + rapids_export( + BUILD fmt + EXPORT_SET fmt + GLOBAL_TARGETS fmt fmt-header-only + NAMESPACE fmt::) + include("${rapids-cmake-dir}/export/find_package_root.cmake") + rapids_export_find_package_root(BUILD fmt [=[${CMAKE_CURRENT_LIST_DIR}]=] rmm-exports) + endif() +endfunction() + +find_and_configure_fmt() diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index f78ae0262..24bbea89d 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, 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 @@ -16,7 +16,7 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(INSTALL_EXPORT_SET rmm-exports) + rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) rapids_export_package(BUILD spdlog rmm-exports) if(spdlog_ADDED) diff --git a/include/rmm/logger.hpp b/include/rmm/logger.hpp index 9d63e7d58..318535a4e 100644 --- a/include/rmm/logger.hpp +++ b/include/rmm/logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,8 @@ #pragma once -#include +#include +#include #include #include diff --git a/include/rmm/mr/device/detail/arena.hpp b/include/rmm/mr/device/detail/arena.hpp index c0e5df377..493fb6cb1 100644 --- a/include/rmm/mr/device/detail/arena.hpp +++ b/include/rmm/mr/device/detail/arena.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ #include +#include #include -#include #include #include diff --git a/include/rmm/mr/device/detail/coalescing_free_list.hpp b/include/rmm/mr/device/detail/coalescing_free_list.hpp index 8c5db7b02..d98ef7968 100644 --- a/include/rmm/mr/device/detail/coalescing_free_list.hpp +++ b/include/rmm/mr/device/detail/coalescing_free_list.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. + * Copyright (c) 2019-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,16 @@ #pragma once -#include #include #include +#include + #include #include #include #include +#include #include namespace rmm::mr::detail { diff --git a/include/rmm/mr/device/detail/stream_ordered_memory_resource.hpp b/include/rmm/mr/device/detail/stream_ordered_memory_resource.hpp index 50495cb17..fa53e480a 100644 --- a/include/rmm/mr/device/detail/stream_ordered_memory_resource.hpp +++ b/include/rmm/mr/device/detail/stream_ordered_memory_resource.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ #include #include +#include + #include #include diff --git a/include/rmm/mr/device/logging_resource_adaptor.hpp b/include/rmm/mr/device/logging_resource_adaptor.hpp index 60fd0d366..ee887f5b9 100644 --- a/include/rmm/mr/device/logging_resource_adaptor.hpp +++ b/include/rmm/mr/device/logging_resource_adaptor.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/include/rmm/mr/device/pool_memory_resource.hpp b/include/rmm/mr/device/pool_memory_resource.hpp index 60ab60cf4..297b3f864 100644 --- a/include/rmm/mr/device/pool_memory_resource.hpp +++ b/include/rmm/mr/device/pool_memory_resource.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,8 @@ #include #include +#include + #include #include diff --git a/include/rmm/mr/device/tracking_resource_adaptor.hpp b/include/rmm/mr/device/tracking_resource_adaptor.hpp index fbcb44898..f1996ba01 100644 --- a/include/rmm/mr/device/tracking_resource_adaptor.hpp +++ b/include/rmm/mr/device/tracking_resource_adaptor.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include diff --git a/tests/mr/device/callback_mr_tests.cpp b/tests/mr/device/callback_mr_tests.cpp index 101a75fc8..95dac93ec 100644 --- a/tests/mr/device/callback_mr_tests.cpp +++ b/tests/mr/device/callback_mr_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ #include -#include +#include #include #include From 56fa4d4a186f447f01eda4d14b8d7c8a5c597ad6 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Fri, 10 Feb 2023 18:01:40 -0500 Subject: [PATCH 13/15] temporarily point python cmake to fork as well --- python/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 705f40ac7..8bea660d8 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -16,6 +16,10 @@ cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) set(rmm_version 23.04.00) +# TODO(keith): REMOVE BEFORE MERGING +set(rapids-cmake-repo "kkraus14/rapids-cmake") +set(rapids-cmake-branch "spdlog_1.11_fmt") + file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.04/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) From dbd525a38e5774826d77129453aae53d71da22e2 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Fri, 10 Feb 2023 18:29:38 -0500 Subject: [PATCH 14/15] fix unused header, fix export_set name for fmt --- cmake/thirdparty/get_fmt.cmake | 2 +- include/rmm/mr/device/arena_memory_resource.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/thirdparty/get_fmt.cmake b/cmake/thirdparty/get_fmt.cmake index 61a20177a..238c52ce1 100644 --- a/cmake/thirdparty/get_fmt.cmake +++ b/cmake/thirdparty/get_fmt.cmake @@ -22,7 +22,7 @@ function(find_and_configure_fmt) if(fmt_ADDED) rapids_export( BUILD fmt - EXPORT_SET fmt + EXPORT_SET fmt-targets GLOBAL_TARGETS fmt fmt-header-only NAMESPACE fmt::) include("${rapids-cmake-dir}/export/find_package_root.cmake") diff --git a/include/rmm/mr/device/arena_memory_resource.hpp b/include/rmm/mr/device/arena_memory_resource.hpp index 1b1043b4a..b007d8f54 100644 --- a/include/rmm/mr/device/arena_memory_resource.hpp +++ b/include/rmm/mr/device/arena_memory_resource.hpp @@ -23,7 +23,6 @@ #include #include -#include #include #include From bcf6e7cd8772feb79a60552d81f1662af266ac21 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Feb 2023 11:53:32 -0600 Subject: [PATCH 15/15] Don't export fmt manually. --- cmake/thirdparty/get_fmt.cmake | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cmake/thirdparty/get_fmt.cmake b/cmake/thirdparty/get_fmt.cmake index 238c52ce1..5787fb73f 100644 --- a/cmake/thirdparty/get_fmt.cmake +++ b/cmake/thirdparty/get_fmt.cmake @@ -16,18 +16,7 @@ function(find_and_configure_fmt) include(${rapids-cmake-dir}/cpm/fmt.cmake) - rapids_cpm_fmt(INSTALL_EXPORT_SET rmm-exports) - rapids_export_package(BUILD fmt rmm-exports) - - if(fmt_ADDED) - rapids_export( - BUILD fmt - EXPORT_SET fmt-targets - GLOBAL_TARGETS fmt fmt-header-only - NAMESPACE fmt::) - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD fmt [=[${CMAKE_CURRENT_LIST_DIR}]=] rmm-exports) - endif() + rapids_cpm_fmt(INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) endfunction() find_and_configure_fmt()