Don't use local headers or runtime in HPX backend due to deprecation

masterleinad · Aug 29, 2023 · d813035 · d813035
1 parent d122c39
commit d813035
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/core/src/HPX/Kokkos_HPX.cpp b/core/src/HPX/Kokkos_HPX.cpp
@@ -25,11 +25,11 @@
 
 #include <impl/Kokkos_ExecSpaceManager.hpp>
 
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/local/mutex.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/init.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/version.hpp>
 
 #include <atomic>
@@ -207,15 +207,15 @@ int HPX::concurrency() const {
 void HPX::impl_initialize(InitializationSettings const &settings) {
   hpx::runtime *rt = hpx::get_runtime_ptr();
   if (rt == nullptr) {
-    hpx::local::init_params i;
+    hpx::init_params i;
     if (settings.has_num_threads()) {
       i.cfg.emplace_back("hpx.os_threads=" +
                          std::to_string(settings.get_num_threads()));
     }
     int argc_hpx     = 1;
     char name[]      = "kokkos_hpx";
     char *argv_hpx[] = {name, nullptr};
-    hpx::local::start(nullptr, argc_hpx, argv_hpx, i);
+    hpx::start(nullptr, argc_hpx, argv_hpx, i);
 
     m_hpx_initialized = true;
   }
@@ -231,11 +231,11 @@ void HPX::impl_finalize() {
     hpx::runtime *rt = hpx::get_runtime_ptr();
     if (rt != nullptr) {
 #if HPX_VERSION_FULL >= 0x010900
-      hpx::post([]() { hpx::local::finalize(); });
+      hpx::post([]() { hpx::finalize(); });
 #else
-      hpx::apply([]() { hpx::local::finalize(); });
+      hpx::apply([]() { hpx::finalize(); });
 #endif
-      hpx::local::stop();
+      hpx::stop();
     } else {
       Kokkos::abort(
           "Kokkos::Experimental::HPX::impl_finalize: Kokkos started "
@@ -325,4 +325,4 @@ int g_hpx_space_factory_initialized =
 
 #else
 void KOKKOS_CORE_SRC_IMPL_HPX_PREVENT_LINK_ERROR() {}
-#endif  //#ifdef KOKKOS_ENABLE_HPX
+#endif  // #ifdef KOKKOS_ENABLE_HPX
diff --git a/core/src/HPX/Kokkos_HPX.hpp b/core/src/HPX/Kokkos_HPX.hpp
@@ -50,12 +50,12 @@ static_assert(false,
 
 #include <KokkosExp_MDRangePolicy.hpp>
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <Kokkos_UniqueToken.hpp>
 

diff --git a/core/src/HPX/Kokkos_HPX_Task.hpp b/core/src/HPX/Kokkos_HPX_Task.hpp
@@ -25,8 +25,8 @@
 
 #include <HPX/Kokkos_HPX.hpp>
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 
 #include <type_traits>
 

diff --git a/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp b/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
@@ -19,8 +19,7 @@
 
 #include <HPX/Kokkos_HPX.hpp>
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
+#include <hpx/execution.hpp>
 
 namespace Kokkos {
 namespace Impl {

diff --git a/core/unit_test/hpx/TestHPX_IndependentInstances.cpp b/core/unit_test/hpx/TestHPX_IndependentInstances.cpp
@@ -18,7 +18,7 @@
 #include <TestHPX_Category.hpp>
 
 #include <hpx/config.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/future.hpp>
 
 #ifndef HPX_COMPUTE_DEVICE_CODE
 

diff --git a/core/unit_test/hpx/TestHPX_IndependentInstancesDelayedExecution.cpp b/core/unit_test/hpx/TestHPX_IndependentInstancesDelayedExecution.cpp
@@ -17,7 +17,7 @@
 #include <Kokkos_Core.hpp>
 #include <TestHPX_Category.hpp>
 
-#include <hpx/local/execution.hpp>
+#include <hpx/execution.hpp>
 
 namespace {
 

diff --git a/core/unit_test/hpx/TestHPX_IndependentInstancesInstanceIds.cpp b/core/unit_test/hpx/TestHPX_IndependentInstancesInstanceIds.cpp
@@ -17,7 +17,7 @@
 #include <Kokkos_Core.hpp>
 #include <TestHPX_Category.hpp>
 
-#include <hpx/local/execution.hpp>
+#include <hpx/execution.hpp>
 
 namespace {