Cleaning up #includes in hpx/ folder

- unifying `<hpx/local/...>` and `<hpx/...>`
STEllAR-GROUP · May 7, 2023 · dbc51cb · dbc51cb
1 parent e82d578
commit dbc51cb
Show file tree

Hide file tree

Showing 829 changed files with 2,402 additions and 2,472 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: >
     -bugprone-exception-escape,
     -bugprone-forward-declaration-namespace,
     -bugprone-macro-parentheses,
+    -bugprone-branch-clone,
     modernize-use-nullptr,
     misc-assert-side-effect
     misc-dangling-handle

diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
@@ -104,6 +104,13 @@ set(HPX_CXX_COMPILER_VERSION
 # ##############################################################################
 # Setup the imported libraries (publicly linked) #
 
+# Propagate Amplifier settings, if needed
+if(HPX_WITH_ITTNOTIFY)
+  set(AMPLIFIER_INCLUDE_DIR "@AMPLIFIER_INCLUDE_DIR@")
+  set(AMPLIFIER_LIBRARY "@AMPLIFIER_LIBRARY@")
+  set(AMPLIFIER_ROOT "@AMPLIFIER_ROOT@")
+endif()
+
 # Allocator
 set(HPX_JEMALLOC_ROOT "@JEMALLOC_ROOT@")
 set(HPX_TCMALLOC_ROOT "@TCMALLOC_ROOT@")

diff --git a/components/parcel_plugins/coalescing/src/performance_counters.cpp b/components/parcel_plugins/coalescing/src/performance_counters.cpp
@@ -92,7 +92,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::monotonically_increasing:
         {
             performance_counters::counter_path_elements paths;
@@ -176,7 +175,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::monotonically_increasing:
         {
             performance_counters::counter_path_elements paths;
@@ -261,7 +259,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::average_count:
         {
             performance_counters::counter_path_elements paths;

diff --git a/examples/1d_stencil/1d_stencil_1.cpp b/examples/1d_stencil/1d_stencil_1.cpp
@@ -11,8 +11,8 @@
 // This example provides a serial base line implementation. No parallelization
 // is performed.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/1d_stencil/1d_stencil_2.cpp b/examples/1d_stencil/1d_stencil_2.cpp
@@ -19,9 +19,9 @@
 // overheads.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/1d_stencil/1d_stencil_3.cpp b/examples/1d_stencil/1d_stencil_3.cpp
@@ -14,9 +14,9 @@
 // example is still fully serial, no parallelization is performed.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/1d_stencil/1d_stencil_4.cpp b/examples/1d_stencil/1d_stencil_4.cpp
@@ -15,11 +15,11 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/synchronization.hpp>
 

diff --git a/examples/1d_stencil/1d_stencil_4_parallel.cpp b/examples/1d_stencil/1d_stencil_4_parallel.cpp
@@ -14,10 +14,10 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 
 #if !defined(HPX_HAVE_CXX17_SHARED_PTR_ARRAY)

diff --git a/examples/1d_stencil/1d_stencil_channel.cpp b/examples/1d_stencil/1d_stencil_channel.cpp
@@ -12,18 +12,15 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include "communicator.hpp"
-#include "stencil.hpp"
-
 #include <hpx/algorithm.hpp>
+#include <hpx/compute.hpp>
 #include <hpx/hpx_init.hpp>
 #include <hpx/include/async.hpp>
 #include <hpx/include/components.hpp>
-#include <hpx/include/compute.hpp>
 #include <hpx/include/lcos.hpp>
 #include <hpx/include/util.hpp>
 #include <hpx/iterator_support/counting_shape.hpp>
-#include <hpx/program_options/options_description.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <array>
@@ -32,6 +29,9 @@
 #include <string>
 #include <vector>
 
+#include "communicator.hpp"
+#include "stencil.hpp"
+
 using communication_type = double;
 
 HPX_REGISTER_CHANNEL_DECLARATION(communication_type, stencil_communication)

diff --git a/examples/1d_stencil/stencil.hpp b/examples/1d_stencil/stencil.hpp
@@ -6,11 +6,11 @@
 
 #pragma once
 
+#include <hpx/algorithm.hpp>
+#include <hpx/compute.hpp>
 #include <hpx/include/async.hpp>
 #include <hpx/include/components.hpp>
-#include <hpx/include/compute.hpp>
 #include <hpx/include/lcos.hpp>
-#include <hpx/include/parallel_algorithm.hpp>
 #include <hpx/include/util.hpp>
 
 #include <algorithm>

diff --git a/examples/balancing/hpx_thread_phase.cpp b/examples/balancing/hpx_thread_phase.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/concurrency.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>

diff --git a/examples/balancing/os_thread_num.cpp b/examples/balancing/os_thread_num.cpp
@@ -4,13 +4,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/allocator_support.hpp>
 #include <hpx/modules/concurrency.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/future_reduce/rnd_future_reduce.cpp b/examples/future_reduce/rnd_future_reduce.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/runtime.hpp>
 //
 #include <iostream>
 #include <random>

diff --git a/examples/hello_world_component/hello_world_client.cpp b/examples/hello_world_component/hello_world_client.cpp
@@ -33,7 +33,7 @@ int main()
 #endif
 //]
 #else
-#include <hpx/local/thread.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/wrap_main.hpp>
 
 #include <iostream>

diff --git a/examples/jacobi/jacobi.cpp b/examples/jacobi/jacobi.cpp
@@ -7,8 +7,8 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
+#include <hpx/chrono.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
 
 #include "jacobi_component/grid.hpp"
 #include "jacobi_component/solver.hpp"

diff --git a/examples/jacobi_smp/jacobi.cpp b/examples/jacobi_smp/jacobi.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(JACOBI_SMP_NO_HPX)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #endif
 
-#include <hpx/modules/program_options.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <iostream>

diff --git a/examples/jacobi_smp/jacobi_hpx.cpp b/examples/jacobi_smp/jacobi_hpx.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
 
 #include "jacobi.hpp"
 

diff --git a/examples/jacobi_smp/jacobi_nonuniform.cpp b/examples/jacobi_smp/jacobi_nonuniform.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(JACOBI_SMP_NO_HPX)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #endif
 
-#include <hpx/modules/program_options.hpp>
+#include <hpx/program_options.hpp>
 
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi_action.hpp>

diff --git a/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp b/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
 
 #include "jacobi_nonuniform.hpp"
 

diff --git a/examples/jacobi_smp/jacobi_nonuniform_omp.hpp b/examples/jacobi_smp/jacobi_nonuniform_omp.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <hpx/local/chrono.hpp>
+#include <hpx/chrono.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/jacobi_smp/jacobi_omp.hpp b/examples/jacobi_smp/jacobi_omp.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <hpx/local/chrono.hpp>
+#include <hpx/chrono.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/examples/qt/qt.cpp b/examples/qt/qt.cpp
@@ -55,7 +55,7 @@ void qt_main(int argc, char** argv)
     app.exec();
 }
 
-int hpx_main(int argc, char** argv)
+int hpx_main(int argc, char* argv[])
 {
     {
         // Get a reference to one of the main thread

diff --git a/examples/quickstart/barrier_docs.cpp b/examples/quickstart/barrier_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[barrier_docs
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 

diff --git a/examples/quickstart/composable_guard.cpp b/examples/quickstart/composable_guard.cpp
@@ -3,7 +3,7 @@
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/lcos_local.hpp>
 
 #include <atomic>

diff --git a/examples/quickstart/condition_variable_docs.cpp b/examples/quickstart/condition_variable_docs.cpp
@@ -7,10 +7,10 @@
 // This example is meant for inclusion in the documentation.
 
 //[condition_variable_docs
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/init.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 #include <string>

diff --git a/examples/quickstart/counting_semaphore_docs.cpp b/examples/quickstart/counting_semaphore_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[counting_semaphore_docs
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 

diff --git a/examples/quickstart/customize_async.cpp b/examples/quickstart/customize_async.cpp
@@ -9,9 +9,9 @@
 // processing unit) for a thread which is created by calling hpx::post() or
 // hpx::async().
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <iostream>

diff --git a/examples/quickstart/enumerate_threads.cpp b/examples/quickstart/enumerate_threads.cpp
@@ -6,9 +6,9 @@
 
 //[threads_docs
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <iostream>

diff --git a/examples/quickstart/event_synchronization.cpp b/examples/quickstart/event_synchronization.cpp
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <hpx/assert.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 
 #include <cstddef>