Merge branch 'master' into lf_multiple_parcels

Conflicts: hpx/runtime/parcelset/parcelport_impl.hpp
STEllAR-GROUP · Jun 5, 2017 · 5ac0d87 · 5ac0d87
2 parents 38605df + 2aaf99f
commit 5ac0d87
Show file tree

Hide file tree

Showing 368 changed files with 3,861 additions and 1,809 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -543,6 +543,8 @@ hpx_option(HPX_WITH_GOOGLE_PERFTOOLS BOOL
 if(HPX_WITH_GOOGLE_PERFTOOLS)
   hpx_add_config_define(HPX_HAVE_GOOGLE_PERFTOOLS)
 endif()
+
+
 hpx_option(HPX_WITH_ITTNOTIFY BOOL
   "Enable Amplifier (ITT) instrumentation support." OFF CATEGORY "Profiling")
 
@@ -576,13 +578,6 @@ foreach(_scheduler ${HPX_WITH_THREAD_SCHEDULERS_UC})
     hpx_add_config_define(HPX_HAVE_STATIC_SCHEDULER)
     set(HPX_WITH_STATIC_SCHEDULER ON CACHE INTERNAL "")
   endif()
-  # The throttle scheduler is not supported neither on Windows nor on Mac
-  if(HPX_WITH_APEX AND NOT WIN32 AND NOT APPLE)
-    if(_scheduler STREQUAL "THROTTLE" OR _all)
-      hpx_add_config_define(HPX_HAVE_THROTTLE_SCHEDULER)
-      set(HPX_WITH_THROTTLE_SCHEDULER ON CACHE INTERNAL "")
-    endif()
-  endif()
   if(_scheduler STREQUAL "HIERARCHY" OR _all)
     hpx_add_config_define(HPX_HAVE_HIERARCHY_SCHEDULER)
     set(HPX_WITH_HIERARCHY_SCHEDULER ON CACHE INTERNAL "")
@@ -591,6 +586,13 @@ foreach(_scheduler ${HPX_WITH_THREAD_SCHEDULERS_UC})
     hpx_add_config_define(HPX_HAVE_PERIODIC_PRIORITY_SCHEDULER)
     set(HPX_WITH_PERIODIC_PRIORITY_SCHEDULER ON CACHE INTERNAL "")
   endif()
+  # The throttling scheduler has not been tested neither on Windows nor on Mac
+  if(NOT WIN32 AND NOT APPLE)
+    if(_scheduler STREQUAL "THROTTLLING" OR _all)
+      hpx_add_config_define(HPX_HAVE_THROTTLING_SCHEDULER)
+      set(HPX_WITH_THROTTLING_SCHEDULER ON CACHE INTERNAL "")
+    endif()
+  endif()
   unset(_all)
 endforeach()
 
@@ -845,6 +847,14 @@ if(HPX_WITH_ASYNC_FUNCTION_COMPATIBILITY)
   hpx_add_config_define(HPX_HAVE_ASYNC_FUNCTION_COMPATIBILITY)
 endif()
 
+# HPX_WITH_QUEUE_COMPATIBILITY: introduced in V1.1.0
+hpx_option(HPX_WITH_QUEUE_COMPATIBILITY BOOL
+    "Enable old style queue components in API (default: OFF)"
+    OFF ADVANCED)
+if(HPX_WITH_QUEUE_COMPATIBILITY)
+  hpx_add_config_define(HPX_HAVE_QUEUE_COMPATIBILITY)
+endif()
+
 # BADBAD: This enables an overload of swap which is necessary to work around the
 #         problems caused by zip_iterator not being a real random access iterator.
 #         Dereferencing zip_iterator does not yield a true reference but
@@ -918,8 +928,8 @@ if(CMAKE_COMPILER_IS_GNUCXX AND HPX_WITH_GCC_VERSION_CHECK)
 endif()
 
 if(MSVC)
-  if(NOT (MSVC11 OR MSVC12 OR MSVC14))
-    hpx_error("MSVC x64 2012 or higher is required.")
+  if(NOT (MSVC14))
+    hpx_error("MSVC x64 2015 or higher is required.")
   elseif(NOT CMAKE_CL_64)
     hpx_warn("MSVC (32Bit) will compile but will fail running larger applications because of limitations in the Windows OS.")
   endif()
@@ -1156,15 +1166,13 @@ if(WIN32)
     # VS2013 and above know how to do link time constant data segment folding
     # VS2013 update 2 and above know how to remove debug information for
     #     non-referenced functions and data (-Zc:inline)
-    if(MSVC12 OR MSVC14)
-      hpx_add_target_compile_option(-Zc:inline)
-      hpx_add_target_compile_option(-Gw
-        CONFIGURATIONS Release RelWithDebInfo MinSizeRelease)
-      hpx_add_target_compile_option(-Zo CONFIGURATIONS RelWithDebInfo)
-      if(HPX_WITH_DATAPAR_VC)
-        hpx_add_target_compile_option(-std:c++latest)
-        hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
-      endif()
+    hpx_add_target_compile_option(-Zc:inline)
+    hpx_add_target_compile_option(-Gw
+      CONFIGURATIONS Release RelWithDebInfo MinSizeRelease)
+    hpx_add_target_compile_option(-Zo CONFIGURATIONS RelWithDebInfo)
+    if(HPX_WITH_DATAPAR_VC)
+      hpx_add_target_compile_option(-std:c++latest)
+      hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
     endif()
 
     # Exceptions

diff --git a/cmake/FindAmplifier.cmake b/cmake/FindAmplifier.cmake
@@ -4,7 +4,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_AMPLIFIER QUIET amplifier)
 
 find_path(AMPLIFIER_INCLUDE_DIR ittnotify.h

diff --git a/cmake/FindGooglePerftools.cmake b/cmake/FindGooglePerftools.cmake
@@ -12,7 +12,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_GOOGLE_PERFTOOLS QUIET libprofiler)
 
 find_path(GOOGLE_PERFTOOLS_INCLUDE_DIR google/profiler.h

diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake
@@ -6,7 +6,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_HWLOC QUIET hwloc)
 
 find_path(HWLOC_INCLUDE_DIR hwloc.h

diff --git a/cmake/FindIbverbs.cmake b/cmake/FindIbverbs.cmake
@@ -6,7 +6,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_IBVERBS QUIET libibverbs)
 
 find_path(IBVERBS_INCLUDE_DIR infiniband/verbs.h

diff --git a/cmake/FindJemalloc.cmake b/cmake/FindJemalloc.cmake
@@ -7,7 +7,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
 
 find_path(JEMALLOC_INCLUDE_DIR jemalloc/jemalloc.h

diff --git a/cmake/FindLibfabric.cmake b/cmake/FindLibfabric.cmake
@@ -3,7 +3,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBFABRIC QUIET libfabric)
 
 find_path(LIBFABRIC_INCLUDE_DIR rdma/fabric.h

diff --git a/cmake/FindMSR.cmake b/cmake/FindMSR.cmake
@@ -7,7 +7,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_MSR QUIET libmsr)
 
 find_path(MSR_INCLUDE_DIR msr_core.h

diff --git a/cmake/FindOrangeFS.cmake b/cmake/FindOrangeFS.cmake
@@ -4,7 +4,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_ORANGEFS QUIET orangefs)
 
 find_path(ORANGEFS_INCLUDE_DIR NAMES pxfs.h orange.h

diff --git a/cmake/FindPAPI.cmake b/cmake/FindPAPI.cmake
@@ -6,7 +6,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_PAPI QUIET papi)
 
 find_path(PAPI_INCLUDE_DIR papi.h

diff --git a/cmake/FindPMI.cmake b/cmake/FindPMI.cmake
@@ -3,7 +3,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 # look for cray pmi...
 pkg_check_modules(PC_PMI_CRAY QUIET cray-pmi)
 # look for the rest if we couldn't find the cray package

diff --git a/cmake/FindQThreads.cmake b/cmake/FindQThreads.cmake
@@ -4,7 +4,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_QTHREADS QUIET swarm)
 
 find_path(QTHREADS_INCLUDE_DIR qthread/qthread.h

diff --git a/cmake/FindRdmacm.cmake b/cmake/FindRdmacm.cmake
@@ -6,7 +6,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_RDMACM QUIET libibverbs)
 
 find_path(RDMACM_INCLUDE_DIR rdma/rdma_cma.h

diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake
@@ -4,7 +4,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SNAPPY QUIET snappy)
 
 find_path(SNAPPY_INCLUDE_DIR snappy.h

diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
@@ -4,7 +4,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_TBB QUIET libtbb)
 
 find_path(TBB_INCLUDE_DIR tbb/tbb.h

diff --git a/cmake/FindTBBmalloc.cmake b/cmake/FindTBBmalloc.cmake
@@ -6,7 +6,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_TBBMALLOC QUIET libtbbmalloc)
 
 find_path(TBBMALLOC_INCLUDE_DIR tbb/scalable_allocator.h

diff --git a/cmake/FindTCMalloc.cmake b/cmake/FindTCMalloc.cmake
@@ -7,7 +7,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_TCMALLOC_MINIMAL QUIET libtcmalloc_minimal)
 pkg_check_modules(PC_TCMALLOC QUIET libtcmalloc)
 

diff --git a/cmake/FindValgrind.cmake b/cmake/FindValgrind.cmake
@@ -7,7 +7,7 @@
 # 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)
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_VALGRIND QUIET valgrind)
 
 find_path(VALGRIND_INCLUDE_DIR valgrind/valgrind.h

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -28,7 +28,7 @@ macro(hpx_perform_cxx_feature_tests)
     DEFINITIONS HPX_HAVE_CXX11_SFINAE_EXPRESSION)
 
   hpx_check_for_cxx11_defaulted_functions(
-    DEFINITIONS HPX_HAVE_CXX11_DEFAULTED_FUNCTIONS)
+    REQUIRED "HPX needs support for C++11 defaulted functions")
 
   hpx_check_for_cxx11_deleted_functions(
     REQUIRED "HPX needs support for C++11 deleted functions")
@@ -46,13 +46,13 @@ macro(hpx_perform_cxx_feature_tests)
     REQUIRED "HPX needs support for C++11 defaulted function template arguments")
 
   hpx_check_for_cxx11_inline_namespaces(
-    DEFINITIONS HPX_HAVE_CXX11_INLINE_NAMESPACES)
+    REQUIRED "HPX needs support for C++11 inline namespaces")
 
   hpx_check_for_cxx11_lambdas(
     REQUIRED "HPX needs support for C++11 lambdas")
 
   hpx_check_for_cxx11_noexcept(
-    DEFINITIONS HPX_HAVE_CXX11_NOEXCEPT)
+    REQUIRED "HPX needs support for C++11 noexcept")
 
   hpx_check_for_cxx11_nullptr(
     REQUIRED "HPX needs support for C++11 nullptr")

diff --git a/cmake/HPX_SetupBoost.cmake b/cmake/HPX_SetupBoost.cmake
@@ -131,8 +131,7 @@ if(MSVC)
   hpx_option(HPX_WITH_BOOST_ALL_DYNAMIC_LINK BOOL
     "Add BOOST_ALL_DYN_LINK to compile flags (default: OFF)"
     OFF ADVANCED)
-  if (HPX_WITH_BOOST_ALL_DYNAMIC_LINK OR HPX_WITH_VCPKG)
-    set(HPX_WITH_BOOST_ALL_DYNAMIC_LINK ON)
+  if (HPX_WITH_BOOST_ALL_DYNAMIC_LINK)
     hpx_add_config_cond_define(BOOST_ALL_DYN_LINK)
   endif()
 else()
@@ -149,7 +148,7 @@ endif()
 
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
-if((NOT MSVC) OR HPX_WITH_BOOST_ALL_DYNAMIC_LINK)
+if((NOT MSVC) OR HPX_WITH_BOOST_ALL_DYNAMIC_LINK OR HPX_WITH_VCPKG)
   hpx_libraries(${Boost_LIBRARIES})
 else()
   hpx_library_dir(${Boost_LIBRARY_DIRS})

diff --git a/cmake/templates/autodoc.doxy.in b/cmake/templates/autodoc.doxy.in
@@ -13,4 +13,5 @@ XML_OUTPUT = @doxygen_output_file@
 OUTPUT_DIRECTORY = @doxygen_output_dir@
 GENERATE_LATEX = NO
 INPUT = @doxygen_inputs@
+EXCLUDE_SYMBOLS = detail
 
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -72,6 +72,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/for_loop_induction.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/for_loop_reduction.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/generate.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/is_heap.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/includes.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/inclusive_scan.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/is_partitioned.hpp"
@@ -113,8 +114,9 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/transform.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/auto_chunk_size.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/dynamic_chunk_size.hpp"
-    "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/executor_traits.hpp"
-    "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/executor_parameter_traits.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_fwd.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_information_fwd.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/execution_parameter_fwd.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/guided_chunk_size.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/parallel_executor.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/persistent_auto_chunk_size.hpp"
@@ -123,6 +125,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/static_chunk_size.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/thread_pool_executors.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/timed_executor_traits.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime_fwd.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/applier_fwd.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/basename_registration.hpp"
@@ -171,9 +174,12 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/lcos/when_some.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/lcos/wait_each.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/lcos/when_each.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/traits/is_execution_policy.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/util/invoke.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/util/invoke_fused.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/util/unwrapped.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp")
 
-
 foreach(doxygen_input ${doxygen_dependencies})
   set(doxygen_inputs "${doxygen_inputs} ${doxygen_input}")
 endforeach()