Merge remote-tracking branch 'origin/master' into release

STEllAR-GROUP · Aug 26, 2020 · 3148105 · 3148105
2 parents d6521ad + 63729e8
commit 3148105
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 65 deletions.
diff --git a/components/iostreams/include/hpx/include/iostreams.hpp b/components/iostreams/include/hpx/include/iostreams.hpp
@@ -11,7 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/iostream.hpp>
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
 #pragma message("The header hpx/include/iostreams.hpp is deprecated, \
     please include hpx/iostream.hpp instead")

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -41,11 +41,11 @@ set(HPX_CANDIDATE_LIBS
     coroutines
     datastructures
     debugging
-    distributed_executors
     errors
     execution
     execution_base
     executors
+    executors_distributed
     filesystem
     format
     functional

diff --git a/libs/all_modules.rst b/libs/all_modules.rst
@@ -43,11 +43,11 @@ All modules
    /libs/coroutines/docs/index.rst
    /libs/datastructures/docs/index.rst
    /libs/debugging/docs/index.rst
-   /libs/distributed_executors/docs/index.rst
    /libs/errors/docs/index.rst
    /libs/execution/docs/index.rst
    /libs/execution_base/docs/index.rst
    /libs/executors/docs/index.rst
+   /libs/executors_distributed/docs/index.rst
    /libs/filesystem/docs/index.rst
    /libs/format/docs/index.rst
    /libs/functional/docs/index.rst

diff --git a/libs/async_cuda/include/hpx/async_cuda/cuda_event.hpp b/libs/async_cuda/include/hpx/async_cuda/cuda_event.hpp
@@ -19,10 +19,9 @@ namespace hpx { namespace cuda { namespace experimental {
     // Since allocation of a cuda event passes into the cuda runtime
     // it might be an expensive operation, so we pre-allocate a pool
     // of them at startup.
-    // For now - Assume a maximum of 64 outstanding events is enough
     struct cuda_event_pool
     {
-        static constexpr int max_events_in_pool = 64;
+        static constexpr int initial_events_in_pool = 128;
 
         static cuda_event_pool& get_event_pool()
         {
@@ -32,34 +31,35 @@ namespace hpx { namespace cuda { namespace experimental {
 
         // create a bunch of events on initialization
         cuda_event_pool()
+          : free_list_(initial_events_in_pool)
         {
-            for (int i = 0; i < max_events_in_pool; ++i)
+            for (int i = 0; i < initial_events_in_pool; ++i)
             {
-                cudaEvent_t event;
-                // Create an cuda_event to query a CUDA/CUBLAS kernel for completion.
-                // Timing is disabled for performance. [1]
-                //
-                // [1]: CUDA Runtime API, section 5.5 cuda_event Management
-                check_cuda_error(
-                    cudaEventCreateWithFlags(&event, cudaEventDisableTiming));
-                free_list_.push(event);
+                add_event_to_pool();
             }
         }
 
         // on destruction, all objects in stack will be freed
         ~cuda_event_pool()
         {
             cudaEvent_t event;
-            for (int i = 0; i < max_events_in_pool; ++i)
+            bool ok = true;
+            while (ok)
             {
-                free_list_.pop(event);
-                check_cuda_error(cudaEventDestroy(event));
+                ok = free_list_.pop(event);
+                if (ok)
+                    check_cuda_error(cudaEventDestroy(event));
             }
         }
 
         inline bool pop(cudaEvent_t& event)
         {
-            return free_list_.pop(event);
+            // pop an event off the pool, if that fails, create a new one
+            while (!free_list_.pop(event))
+            {
+                add_event_to_pool();
+            }
+            return true;
         }
 
         inline bool push(cudaEvent_t event)
@@ -68,10 +68,20 @@ namespace hpx { namespace cuda { namespace experimental {
         }
 
     private:
-        // using a fixed capacity stack means no allocations are
-        // needed , throws an exception if the capacity is exceeded
-        boost::lockfree::stack<cudaEvent_t,
-            boost::lockfree::capacity<max_events_in_pool>>
+        void add_event_to_pool()
+        {
+            cudaEvent_t event;
+            // Create an cuda_event to query a CUDA/CUBLAS kernel for completion.
+            // Timing is disabled for performance. [1]
+            //
+            // [1]: CUDA Runtime API, section 5.5 cuda_event Management
+            check_cuda_error(
+                cudaEventCreateWithFlags(&event, cudaEventDisableTiming));
+            free_list_.push(event);
+        }
+
+        // pool is dynamically sized and can grow if needed
+        boost::lockfree::stack<cudaEvent_t, boost::lockfree::fixed_sized<false>>
             free_list_;
     };
 }}}    // namespace hpx::cuda::experimental
diff --git a/libs/config/include/hpx/config/attributes.hpp b/libs/config/include/hpx/config/attributes.hpp
@@ -63,7 +63,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // handle [[deprecated]]
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #  define HPX_DEPRECATED_MSG \
    "This functionality is deprecated and will be removed in the future."
 #  define HPX_DEPRECATED(x) [[deprecated(x)]]

diff --git a/libs/distributed_executors/CMakeLists.txt → libs/executors_distributed/CMakeLists.txt b/libs/distributed_executors/CMakeLists.txt → libs/executors_distributed/CMakeLists.txt
@@ -12,22 +12,22 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-set(distributed_executors_headers
-    hpx/distributed_executors/distribution_policy_executor.hpp
+set(executors_distributed_headers
+    hpx/executors_distributed/distribution_policy_executor.hpp
 )
 
-set(distributed_executors_compat_headers
+set(executors_distributed_compat_headers
     hpx/parallel/executors/distribution_policy_executor.hpp
 )
 
 include(HPX_AddModule)
 add_hpx_module(
-  distributed_executors
+  executors_distributed
   COMPATIBILITY_HEADERS ON
   DEPRECATION_WARNINGS
   GLOBAL_HEADER_GEN ON
-  HEADERS ${distributed_executors_headers}
-  COMPAT_HEADERS ${distributed_executors_compat_headers}
+  HEADERS ${executors_distributed_headers}
+  COMPAT_HEADERS ${executors_distributed_compat_headers}
   DEPENDENCIES hpx_async_distributed hpx_config hpx_execution hpx_functional
                hpx_type_support
   CMAKE_SUBDIRS examples tests

diff --git a/libs/distributed_executors/README.rst → libs/executors_distributed/README.rst b/libs/distributed_executors/README.rst → libs/executors_distributed/README.rst
@@ -7,10 +7,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 =====================
-distributed_executors
+executors_distributed
 =====================
 
 This library is part of HPX.
 
 Documentation can be found `here
-<https://hpx-docs.stellar-group.org/latest/html/libs/distributed_executors/docs/index.html>`__.
+<https://hpx-docs.stellar-group.org/latest/html/libs/executors_distributed/docs/index.html>`__.
diff --git a/libs/distributed_executors/docs/index.rst → libs/executors_distributed/docs/index.rst b/libs/distributed_executors/docs/index.rst → libs/executors_distributed/docs/index.rst
@@ -5,16 +5,16 @@
     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)
 
-.. _libs_distributed_executors:
+.. _libs_executors_distributed:
 
 =====================
-distributed_executors
+executors_distributed
 =====================
 
 This module provides the executor
 :cpp:class:`hpx::parallel::execution::disribution_policy_executor`. It allows
 one to create work that is implicitly distributed over multiple localities.
 
-See the :ref:`API reference <libs_distributed_executors_api>` of this module for more
+See the :ref:`API reference <libs_executors_distributed_api>` of this module for more
 details.
 
diff --git a/...ributed_executors/examples/CMakeLists.txt → ...utors_distributed/examples/CMakeLists.txt b/...ributed_executors/examples/CMakeLists.txt → ...utors_distributed/examples/CMakeLists.txt
@@ -5,17 +5,17 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 if(HPX_WITH_EXAMPLES)
-  add_hpx_pseudo_target(examples.modules.distributed_executors)
+  add_hpx_pseudo_target(examples.modules.executors_distributed)
   add_hpx_pseudo_dependencies(
-    examples.modules examples.modules.distributed_executors
+    examples.modules examples.modules.executors_distributed
   )
   if(HPX_WITH_TESTS
      AND HPX_WITH_TESTS_EXAMPLES
-     AND HPX_DISTRIBUTED_EXECUTORS_WITH_TESTS
+     AND HPX_EXECUTORS_DISTRIBUTED_WITH_TESTS
   )
-    add_hpx_pseudo_target(tests.examples.modules.distributed_executors)
+    add_hpx_pseudo_target(tests.examples.modules.executors_distributed)
     add_hpx_pseudo_dependencies(
-      tests.examples.modules tests.examples.modules.distributed_executors
+      tests.examples.modules tests.examples.modules.executors_distributed
     )
   endif()
 endif()
diff --git a/...xecutors/distribution_policy_executor.hpp → ...tributed/distribution_policy_executor.hpp b/...xecutors/distribution_policy_executor.hpp → ...tributed/distribution_policy_executor.hpp
diff --git a/...xecutors/distribution_policy_executor.hpp → ...xecutors/distribution_policy_executor.hpp b/...xecutors/distribution_policy_executor.hpp → ...xecutors/distribution_policy_executor.hpp
@@ -7,19 +7,19 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/distributed_executors/config/defines.hpp>
-#include <hpx/modules/distributed_executors.hpp>
+#include <hpx/executors_distributed/config/defines.hpp>
+#include <hpx/modules/executors_distributed.hpp>
 
-#if HPX_EXECUTION_HAVE_DEPRECATION_WARNINGS
+#if HPX_EXECUTORS_DISTRIBUTED_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
 #pragma message(                                                               \
     "The header hpx/parallel/executors/distribution_policy_executor.hpp is \
     deprecated, please include \
-    hpx/modules/distributed_executors.hpp instead")
+    hpx/modules/executors_distributed.hpp instead")
 #else
 #warning                                                                       \
     "The header hpx/parallel/executors/distribution_policy_executor.hpp is \
     deprecated, please include \
-    hpx/modules/distributed_executors.hpp instead"
+    hpx/modules/executors_distributed.hpp instead"
 #endif
 #endif
diff --git a/...istributed_executors/tests/CMakeLists.txt → ...xecutors_distributed/tests/CMakeLists.txt b/...istributed_executors/tests/CMakeLists.txt → ...xecutors_distributed/tests/CMakeLists.txt
@@ -9,44 +9,44 @@ include(HPX_Option)
 
 if(NOT HPX_WITH_TESTS AND HPX_TOP_LEVEL)
   hpx_set_option(
-    HPX_DISTRIBUTED_EXECUTORS_WITH_TESTS
+    HPX_EXECUTORS_DISTRIBUTED_WITH_TESTS
     VALUE OFF
     FORCE
   )
   return()
 endif()
 
-if(HPX_DISTRIBUTED_EXECUTORS_WITH_TESTS)
+if(HPX_EXECUTORS_DISTRIBUTED_WITH_TESTS)
   if(HPX_WITH_TESTS_UNIT)
-    add_hpx_pseudo_target(tests.unit.modules.distributed_executors)
+    add_hpx_pseudo_target(tests.unit.modules.executors_distributed)
     add_hpx_pseudo_dependencies(
-      tests.unit.modules tests.unit.modules.distributed_executors
+      tests.unit.modules tests.unit.modules.executors_distributed
     )
     add_subdirectory(unit)
   endif()
 
   if(HPX_WITH_TESTS_REGRESSIONS)
-    add_hpx_pseudo_target(tests.regressions.modules.distributed_executors)
+    add_hpx_pseudo_target(tests.regressions.modules.executors_distributed)
     add_hpx_pseudo_dependencies(
-      tests.regressions.modules tests.regressions.modules.distributed_executors
+      tests.regressions.modules tests.regressions.modules.executors_distributed
     )
     add_subdirectory(regressions)
   endif()
 
   if(HPX_WITH_TESTS_BENCHMARKS)
-    add_hpx_pseudo_target(tests.performance.modules.distributed_executors)
+    add_hpx_pseudo_target(tests.performance.modules.executors_distributed)
     add_hpx_pseudo_dependencies(
-      tests.performance.modules tests.performance.modules.distributed_executors
+      tests.performance.modules tests.performance.modules.executors_distributed
     )
     add_subdirectory(performance)
   endif()
 
   if(HPX_WITH_TESTS_HEADERS)
     add_hpx_header_tests(
-      modules.distributed_executors
-      HEADERS ${distributed_executors_headers}
+      modules.executors_distributed
+      HEADERS ${executors_distributed_headers}
       HEADER_ROOT ${PROJECT_SOURCE_DIR}/include
-      DEPENDENCIES hpx_distributed_executors
+      DEPENDENCIES hpx_executors_distributed
     )
   endif()
 endif()
diff --git a/...xecutors/tests/performance/CMakeLists.txt → ...tributed/tests/performance/CMakeLists.txt b/...xecutors/tests/performance/CMakeLists.txt → ...tributed/tests/performance/CMakeLists.txt
diff --git a/...xecutors/tests/regressions/CMakeLists.txt → ...tributed/tests/regressions/CMakeLists.txt b/...xecutors/tests/regressions/CMakeLists.txt → ...tributed/tests/regressions/CMakeLists.txt
diff --git a/...buted_executors/tests/unit/CMakeLists.txt → ...ors_distributed/tests/unit/CMakeLists.txt b/...buted_executors/tests/unit/CMakeLists.txt → ...ors_distributed/tests/unit/CMakeLists.txt
@@ -12,7 +12,7 @@ foreach(test ${tests})
 
   source_group("Source Files" FILES ${sources})
 
-  set(folder_name "Tests/Unit/Modules/DistributedExecutors")
+  set(folder_name "Tests/Unit/Modules/ExecutorsDistributed")
 
   add_hpx_executable(
     ${test}_test INTERNAL_FLAGS
@@ -22,6 +22,6 @@ foreach(test ${tests})
   )
 
   add_hpx_unit_test(
-    "modules.distributed_executors" ${test} ${${test}_PARAMETERS}
+    "modules.executors_distributed" ${test} ${${test}_PARAMETERS}
   )
 endforeach()
diff --git a/...sts/unit/distribution_policy_executor.cpp → ...sts/unit/distribution_policy_executor.cpp b/...sts/unit/distribution_policy_executor.cpp → ...sts/unit/distribution_policy_executor.cpp
@@ -9,7 +9,7 @@
 #include <hpx/include/async.hpp>
 #include <hpx/include/components.hpp>
 #include <hpx/include/util.hpp>
-#include <hpx/modules/distributed_executors.hpp>
+#include <hpx/modules/executors_distributed.hpp>
 #include <hpx/modules/testing.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/libs/include/include/hpx/include/compression.hpp b/libs/include/include/hpx/include/compression.hpp
@@ -14,7 +14,7 @@
 #include <hpx/plugins/binary_filter/zlib_serialization_filter.hpp>
 #endif
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
 #pragma message("The header hpx/include/compression.hpp is deprecated, \
     please include directly the corresponding header \

diff --git a/libs/include/include/hpx/include/compression_registration.hpp b/libs/include/include/hpx/include/compression_registration.hpp
@@ -14,7 +14,7 @@
 #include <hpx/plugins/binary_filter/zlib_serialization_filter_registration.hpp>
 #endif
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
 #pragma message(                                                               \
     "The header hpx/include/compression_registration.hpp is deprecated, \

diff --git a/libs/synchronization/include/hpx/synchronization/latch.hpp b/libs/synchronization/include/hpx/synchronization/latch.hpp
@@ -88,13 +88,12 @@ namespace hpx { namespace lcos { namespace local {
         {
             HPX_ASSERT(update >= 0);
 
-            std::unique_lock<mutex_type> l(mtx_.data_);
-
             std::ptrdiff_t new_count = (counter_ -= update);
             HPX_ASSERT(new_count >= 0);
 
             if (new_count == 0)
             {
+                std::unique_lock<mutex_type> l(mtx_.data_);
                 notified_ = true;
                 cond_.data_.notify_all(std::move(l));    // release the threads
             }

diff --git a/plugins/binary_filter/bzip2/include/hpx/include/compression_bzip2.hpp b/plugins/binary_filter/bzip2/include/hpx/include/compression_bzip2.hpp
@@ -9,7 +9,7 @@
 #include <hpx/config.hpp>
 #include <hpx/plugins/binary_filter/bzip2_serialization_filter.hpp>
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
   #pragma message("The header hpx/include/compression_bzip2.hpp is deprecated, \
     please include \

diff --git a/plugins/binary_filter/snappy/include/hpx/include/compression_snappy.hpp b/plugins/binary_filter/snappy/include/hpx/include/compression_snappy.hpp
@@ -9,7 +9,7 @@
 #include <hpx/config.hpp>
 #include <hpx/plugins/binary_filter/snappy_serialization_filter.hpp>
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
   #pragma message("The header hpx/include/compression_snappy.hpp is deprecated, \
     please include \

diff --git a/plugins/binary_filter/zlib/include/hpx/include/compression_zlib.hpp b/plugins/binary_filter/zlib/include/hpx/include/compression_zlib.hpp
@@ -9,7 +9,7 @@
 #include <hpx/config.hpp>
 #include <hpx/plugins/binary_filter/zlib_serialization_filter.hpp>
 
-#if (HPX_HAVE_DEPRECATION_WARNINGS != 0)
+#if HPX_HAVE_DEPRECATION_WARNINGS
 #if defined(HPX_MSVC)
   #pragma message("The header hpx/include/compression_zlib.hpp is deprecated, \
     please include \