From 4da08b156c7c755d0ab56356dd74d8cfc4cd8ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Sun, 14 Dec 2025 15:41:33 +0100 Subject: [PATCH] Small fixes to internal pool names --- .../detail/executor_pools_management.hpp | 42 +++++++++---------- include/kokkos_buffer_util.hpp | 7 ++-- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/include/cppuddle/executor_recycling/detail/executor_pools_management.hpp b/include/cppuddle/executor_recycling/detail/executor_pools_management.hpp index 6a89025b..c28eecfa 100644 --- a/include/cppuddle/executor_recycling/detail/executor_pools_management.hpp +++ b/include/cppuddle/executor_recycling/detail/executor_pools_management.hpp @@ -139,39 +139,39 @@ class executor_pool { public: template static void init(size_t number_of_executors, Ts ... executor_args) { - executor_pool_implementation::init(number_of_executors, + pool_manager::init(number_of_executors, executor_args...); } template static void init_all_executor_pools(size_t number_of_executors, Ts ... executor_args) { - executor_pool_implementation::init_all_executor_pools(number_of_executors, + pool_manager::init_all_executor_pools(number_of_executors, executor_args...); } template static void init_executor_pool(size_t pool_id, size_t number_of_executors, Ts ... executor_args) { - executor_pool_implementation::init_executor_pool(pool_id, number_of_executors, + pool_manager::init_executor_pool(pool_id, number_of_executors, executor_args...); } template static void cleanup() { - executor_pool_implementation::cleanup(); + pool_manager::cleanup(); } template static std::tuple get_interface(const size_t gpu_id) { - return executor_pool_implementation::get_interface(gpu_id); + return pool_manager::get_interface(gpu_id); } template static void release_interface(size_t index, const size_t gpu_id) noexcept { - executor_pool_implementation::release_interface(index, + pool_manager::release_interface(index, gpu_id); } template static bool interface_available(size_t load_limit, const size_t gpu_id) noexcept { - return executor_pool_implementation::interface_available( + return pool_manager::interface_available( load_limit, gpu_id); } template static size_t get_current_load(const size_t gpu_id = 0) noexcept { - return executor_pool_implementation::get_current_load( + return pool_manager::get_current_load( gpu_id); } template @@ -182,19 +182,19 @@ class executor_pool { template static void set_device_selector(std::function select_gpu_function) { - executor_pool_implementation::set_device_selector(select_gpu_function); + pool_manager::set_device_selector(select_gpu_function); } template static void select_device(size_t gpu_id) { - executor_pool_implementation::select_device(gpu_id); + pool_manager::select_device(gpu_id); } private: executor_pool() = default; private: - template class executor_pool_implementation { + template class pool_manager { public: /// Deprecated! Use init_on_all_gpu or init_on_gpu template @@ -277,7 +277,7 @@ class executor_pool { } private: - executor_pool_implementation() = default; + pool_manager() = default; cppuddle::mutex_t pool_mut{}; std::function select_gpu_function = [](size_t gpu_id) { // By default no multi gpu support @@ -288,21 +288,21 @@ class executor_pool { std::deque executorpools{}; std::array gpu_mutexes; - static executor_pool_implementation& instance(void) { - static executor_pool_implementation pool_instance{}; + static pool_manager& instance(void) { + static pool_manager pool_instance{}; return pool_instance; } public: - ~executor_pool_implementation() = default; + ~pool_manager() = default; // Bunch of constructors we don't need - executor_pool_implementation(executor_pool_implementation const &other) = + pool_manager(pool_manager const &other) = delete; - executor_pool_implementation & - operator=(executor_pool_implementation const &other) = delete; - executor_pool_implementation(executor_pool_implementation &&other) = delete; - executor_pool_implementation & - operator=(executor_pool_implementation &&other) = delete; + pool_manager & + operator=(pool_manager const &other) = delete; + pool_manager(pool_manager &&other) = delete; + pool_manager & + operator=(pool_manager &&other) = delete; }; public: diff --git a/include/kokkos_buffer_util.hpp b/include/kokkos_buffer_util.hpp index 716229a0..158ed733 100644 --- a/include/kokkos_buffer_util.hpp +++ b/include/kokkos_buffer_util.hpp @@ -15,13 +15,14 @@ namespace recycler { template using aggregated_recycled_view [[deprecated( - "Use aggregated_recycle_view from header recycling_kokkos_view.hpp " - "instead")]] = + "Use cppuddle::memory_recycling::aggregated_recycling_view from header " + "recycling_kokkos_view.hpp instead")]] = cppuddle::memory_recycling::aggregated_recycling_view; template using recycled_view [[deprecated( - "Use recycle_view from header recycling_kokkos_view.hpp instead")]] = + "Use cppuddle::memory_recycling::recycling_view from header " + "recycling_kokkos_view.hpp instead")]] = cppuddle::memory_recycling::recycling_view; } // end namespace recycler