Update examples and require HPX 1.7.0

msimberg · msimberg · commit 5940aadfedc4 · 2021-07-19T12:01:49.000+02:00
diff --git a/examples/00_exercises/CMakeLists.txt b/examples/00_exercises/CMakeLists.txt
@@ -6,7 +6,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(Exercises CXX)
 
-find_package(HPX REQUIRED)
+find_package(HPX 1.7.0 REQUIRED)
 
 set(solutions
   solution1
@@ -29,15 +29,17 @@ set(exercises
   exercise8)
 
 foreach(exercise ${exercises})
-  add_hpx_executable(${exercise}
-    SOURCES ${exercise}.cpp
-    COMPONENT_DEPENDENCIES iostreams partitioned_vector)
+  add_executable(${exercise} ${exercise}.cpp)
+  target_link_libraries(
+    ${exercise} PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component
+                        HPX::partitioned_vector_component)
 endforeach()
 
 foreach(solution ${solutions})
-  add_hpx_executable(${solution}
-    SOURCES ${solution}.cpp
-    COMPONENT_DEPENDENCIES iostreams partitioned_vector)
+  add_executable(${solution} ${solution}.cpp)
+  target_link_libraries(
+    ${solution} PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component
+                        HPX::partitioned_vector_component)
 endforeach()
 
 if(HPX_WITH_CUDA)
diff --git a/examples/00_exercises/exercise3.cpp b/examples/00_exercises/exercise3.cpp
@@ -48,8 +48,8 @@ int main()
     hpx::when_all(f, g).then(&funX);
     hpx::when_all(v).then(&funX);
     hpx::dataflow(&funX, f, g);
-    hpx::dataflow(hpx::util::unwrapping(&funX), f, g);
-    hpx::dataflow(hpx::util::unwrapping(&funX), f, 3.14);
+    hpx::dataflow(hpx::unwrapping(&funX), f, g);
+    hpx::dataflow(hpx::unwrapping(&funX), f, 3.14);
 
     return 0;
 }
diff --git a/examples/00_exercises/exercise7.cpp b/examples/00_exercises/exercise7.cpp
@@ -10,6 +10,7 @@
 #include <hpx/execution.hpp>
 #include <hpx/include/actions.hpp>
 #include <hpx/iostream.hpp>
+#include <hpx/runtime.hpp>
 #include <hpx/wrap_main.hpp>
 
 // This program does not compile because hello_locality is not an action, only a
diff --git a/examples/00_exercises/solution3.cpp b/examples/00_exercises/solution3.cpp
@@ -33,12 +33,12 @@ int main()
     hpx::shared_future<double> f = hpx::make_ready_future(3.14);
     hpx::shared_future<int> g = hpx::make_ready_future(42);
 
-    // hpx::util::unwrapping and hpx::dataflow are convenient.
+    // hpx::unwrapping and hpx::dataflow are convenient.
     hpx::async(&fun1, 3.14, 42);
     hpx::async(&fun1, f.get(), g.get());
     hpx::when_all(f, g).then(&fun2);
     hpx::dataflow(&fun3, f, g);
-    hpx::dataflow(hpx::util::unwrapping(&fun1), f, g);
+    hpx::dataflow(hpx::unwrapping(&fun1), f, g);
 
     return 0;
 }
diff --git a/examples/00_exercises/solution6.cpp b/examples/00_exercises/solution6.cpp
@@ -42,7 +42,7 @@ hpx::future<double> tree_transform_reduce(
     hpx::future<double> right_result = hpx::async(
         &tree_transform_reduce<Transformer, Reducer>, n->right, t, r);
 
-    return hpx::dataflow(hpx::util::unwrapping(r), left_result, right_result);
+    return hpx::dataflow(hpx::unwrapping(r), left_result, right_result);
 }
 
 int main()
diff --git a/examples/00_exercises/solution7.cpp b/examples/00_exercises/solution7.cpp
@@ -10,6 +10,7 @@
 #include <hpx/execution.hpp>
 #include <hpx/include/actions.hpp>
 #include <hpx/iostream.hpp>
+#include <hpx/runtime.hpp>
 #include <hpx/wrap_main.hpp>
 
 void hello_locality()
diff --git a/examples/01_hello_world/CMakeLists.txt b/examples/01_hello_world/CMakeLists.txt
@@ -6,11 +6,11 @@
 cmake_minimum_required(VERSION 3.0)
 project(Hello_World CXX)
 
-find_package(HPX REQUIRED)
+find_package(HPX 1.7.0 REQUIRED)
 link_directories(${HPX_LIBRARY_DIR})
 
 add_executable(hello_world hello_world.cpp)
-hpx_setup_target(hello_world COMPONENT_DEPENDENCIES iostreams)
+target_link_libraries(hello_world PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/01_hello_world/hello_world.cpp b/examples/01_hello_world/hello_world.cpp
@@ -12,6 +12,7 @@
 #include <hpx/execution.hpp>
 #include <hpx/include/actions.hpp>
 #include <hpx/iostream.hpp>
+#include <hpx/runtime.hpp>
 #include <hpx/wrap_main.hpp>
 
 #include <boost/range/irange.hpp>
diff --git a/examples/02_overhead/CMakeLists.txt b/examples/02_overhead/CMakeLists.txt
@@ -6,11 +6,10 @@
 cmake_minimum_required(VERSION 3.0)
 project(overhead CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(future_overhead future_overhead.cpp)
-hpx_setup_target(future_overhead COMPONENT_DEPENDENCIES iostreams)
+target_link_libraries(future_overhead PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/02_overhead/future_overhead.cpp b/examples/02_overhead/future_overhead.cpp
@@ -232,8 +232,8 @@ void measure_function_futures_limiting_executor(
     // start the clock
     high_resolution_timer walltime;
     {
-        hpx::threads::executors::experimental::limiting_executor<Executor>
-            signal_exec(exec, tasks, tasks + 1000);
+        hpx::execution::experimental::limiting_executor<Executor> signal_exec(
+            exec, tasks, tasks + 1000);
         for (std::uint64_t i = 0; i < count; ++i) {
             hpx::apply(signal_exec, [&](){
                 null_function();
diff --git a/examples/03_stencil/CMakeLists.txt b/examples/03_stencil/CMakeLists.txt
@@ -7,27 +7,25 @@ cmake_minimum_required(VERSION 2.8)
 
 project(stencil CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
-include_directories(${CUDA_INCLUDE_DIRS})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(stencil_serial stencil_serial.cpp)
-hpx_setup_target(stencil_serial)
+target_link_libraries(stencil_serial PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(stencil_parallel_0 stencil_parallel_0.cpp)
-hpx_setup_target(stencil_parallel_0)
+target_link_libraries(stencil_parallel_0 PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(stencil_parallel_1 stencil_parallel_1.cpp)
-hpx_setup_target(stencil_parallel_1)
+target_link_libraries(stencil_parallel_1 PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(stencil_parallel_2 stencil_parallel_2.cpp)
-hpx_setup_target(stencil_parallel_2)
+target_link_libraries(stencil_parallel_2 PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(stencil_parallel_3 stencil_parallel_3.cpp)
-hpx_setup_target(stencil_parallel_3)
+target_link_libraries(stencil_parallel_3 PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(stencil_parallel_4 stencil_parallel_4.cpp)
-hpx_setup_target(stencil_parallel_4)
+target_link_libraries(stencil_parallel_4 PRIVATE HPX::hpx HPX::wrap_main)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/04_fibonacci/CMakeLists.txt b/examples/04_fibonacci/CMakeLists.txt
@@ -6,11 +6,10 @@
 cmake_minimum_required(VERSION 3.0)
 project(Fibonacci CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(fibonacci_futures fibonacci_futures.cpp)
-hpx_setup_target(fibonacci_futures COMPONENT_DEPENDENCIES iostreams)
+target_link_libraries(fibonacci_futures PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/04_fibonacci/fibonacci_futures.cpp b/examples/04_fibonacci/fibonacci_futures.cpp
@@ -43,11 +43,7 @@ hpx::future<std::uint64_t> fibonacci_futures(std::uint64_t n)
     hpx::future<std::uint64_t> r = fibonacci_futures(n-2);
 
     return hpx::dataflow(hpx::launch::sync,
-        hpx::util::unwrapping(
-            [](std::uint64_t l, std::uint64_t r)
-            {
-                return l + r;
-            }),
+        hpx::unwrapping([](std::uint64_t l, std::uint64_t r) { return l + r; }),
         f, r);
 }
 
diff --git a/examples/05_saxpy/CMakeLists.txt b/examples/05_saxpy/CMakeLists.txt
@@ -6,23 +6,21 @@
 cmake_minimum_required(VERSION 3.0)
 project(Latency CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
-include_directories(${CUDA_INCLUDE_DIRS})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(saxpy_serial serial.cpp)
-hpx_setup_target(saxpy_serial)
+target_link_libraries(saxpy_serial PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(saxpy_parallel parallel.cpp)
-hpx_setup_target(saxpy_parallel)
+target_link_libraries(saxpy_parallel PRIVATE HPX::hpx HPX::wrap_main)
 
 add_executable(saxpy_parallel_numa parallel_numa.cpp)
-hpx_setup_target(saxpy_parallel_numa)
+target_link_libraries(saxpy_parallel_numa PRIVATE HPX::hpx HPX::wrap_main)
 
 # disabled for the time being
 if (0 AND HPX_WITH_CUDA)
   add_executable(saxpy_parallel_cuda parallel_cuda.cu)
-  hpx_setup_target(saxpy_parallel_cuda)
+  target_link_libraries(saxpy_parallel_cuda PRIVATE HPX::hpx HPX::wrap_main)
   if (TARGET tutorial)
     add_hpx_pseudo_dependencies(tutorial.saxpy saxpy_parallel_cuda)
   endif()
diff --git a/examples/06_named_pool_executor/CMakeLists.txt b/examples/06_named_pool_executor/CMakeLists.txt
@@ -6,11 +6,10 @@
 cmake_minimum_required(VERSION 3.0)
 project(NamedPool CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(named_pool_executor named_pool_executor.cpp)
-hpx_setup_target(named_pool_executor COMPONENT_DEPENDENCIES iostreams)
+target_link_libraries(named_pool_executor PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/07_cuda_futures/CMakeLists.txt b/examples/07_cuda_futures/CMakeLists.txt
@@ -6,18 +6,13 @@
 cmake_minimum_required(VERSION 3.0)
 project(CublasDemo CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
-
-include_directories(${CUDA_INCLUDE_DIRS})
+find_package(HPX 1.7.0 REQUIRED)
 
 add_executable(cublas_matmul cublas_matmul.cpp)
-hpx_setup_target(cublas_matmul COMPONENT_DEPENDENCIES iostreams)
-target_link_libraries(cublas_matmul PRIVATE ${CUDA_LIBRARIES} ${CUDA_cublas_LIBRARY})
+target_link_libraries(saxpy_serial PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
-add_hpx_executable(cuda_future SOURCES cuda_future.cpp trivial_demo.cu)
-#hpx_setup_target(cuda_future COMPONENT_DEPENDENCIES iostreams)
-target_link_libraries(cuda_future PRIVATE ${CUDA_LIBRARIES})
+add_executable(cuda_future cuda_future.cpp trivial_demo.cu)
+target_link_libraries(saxpy_serial PRIVATE HPX::hpx HPX::wrap_main HPX::iostreams_component)
 
 # for tutorial target
 if (TARGET tutorial)
diff --git a/examples/08_sort_test/CMakeLists.txt b/examples/08_sort_test/CMakeLists.txt
@@ -6,9 +6,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(SortTest CXX)
 
-find_package(HPX REQUIRED)
-link_directories(${HPX_LIBRARY_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+find_package(HPX 1.7.0 REQUIRED)
 
 #------------------------------------------------------------------------------
 # TBB
@@ -54,9 +52,9 @@ if (SORT_HAS_TBB)
 endif()
 
 if (SORT_HAS_HPX)
-  include_directories(${HPX_INCLUDE_DIRS})
   add_definitions(-DSORT_HAS_HPX)
-  set(BENCHMARK_LIBRARIES ${BENCHMARK_LIBRARIES} ${HPX_LIBRARIES})
+  set(BENCHMARK_LIBRARIES ${BENCHMARK_LIBRARIES} HPX::hpx HPX::wrap_main
+                          HPX::iostreams_component)
 endif()
 
 if (SORT_HAS_GNU)
@@ -67,7 +65,6 @@ endif()
 # setup exe
 #------------------------------------------------------------------------------
 add_executable(sort_test sort_test.cpp)
-hpx_setup_target(sort_test COMPONENT_DEPENDENCIES iostreams)
 target_link_libraries(sort_test PRIVATE ${BENCHMARK_LIBRARIES})
 
 # for tutorial target
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -60,7 +60,7 @@ endif()
 #--------------------------------------------------
 # Find HPX, disable searching in user builds
 #--------------------------------------------------
-find_package(HPX 1.6.0 REQUIRED NO_CMAKE_PACKAGE_REGISTRY)
+find_package(HPX 1.7.0 REQUIRED NO_CMAKE_PACKAGE_REGISTRY)
 message("\n-------\nTutorial using HPX from ${HPX_DIR}\n-------\n")
 
 #--------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ hpx::future<double> tree_transform_reduce(`
`42`	`42`	`hpx::future<double> right_result = hpx::async(`
`43`	`43`	`&tree_transform_reduce<Transformer, Reducer>, n->right, t, r);`
`44`	`44`
`45`		`- return hpx::dataflow(hpx::util::unwrapping(r), left_result, right_result);`
	`45`	`+ return hpx::dataflow(hpx::unwrapping(r), left_result, right_result);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`int main()`