Merge branch 'master' into fix_hello

STEllAR-GROUP · Jan 23, 2018 · baacf09 · baacf09
2 parents 4af283e + 24ee1d0
commit baacf09
Show file tree

Hide file tree

Showing 178 changed files with 4,709 additions and 1,424 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+## Expected Behavior
+
+... Please describe the behavior you would have expected.
+
+## Actual Behavior
+
+... Please describe the behavior you actually observed.
+
+
+## Steps to Reproduce the Problem
+
+... Please be as specific as possible while describing how to reproduce your problem.
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+... Please describe your environment
+
+  - HPX Version:
+  - Platform (compiler, OS):
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+
+Fixes #
+
+## Proposed Changes
+
+  -
+  -
+  -
+
+## Any background context you want to provide?
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -883,22 +883,6 @@ hpx_option(HPX_WITH_VIM_YCM BOOL
 ################################################################################
 # Backwards compatibility options (edit for each release)
 
-# HPX_WITH_COLOCATED_BACKWARDS_COMPATIBILITY: introduced in V0.9.11
-hpx_option(HPX_WITH_COLOCATED_BACKWARDS_COMPATIBILITY BOOL
-    "Enable backwards compatibility for apply_colocated, async_colocated and friends"
-    OFF ADVANCED)
-if(HPX_WITH_COLOCATED_BACKWARDS_COMPATIBILITY)
-  hpx_add_config_define(HPX_HAVE_COLOCATED_BACKWARDS_COMPATIBILITY)
-endif()
-
-# HPX_WITH_COMPONENT_GET_GID_COMPATIBILITY: introduced in V0.9.11
-hpx_option(HPX_WITH_COMPONENT_GET_GID_COMPATIBILITY BOOL
-    "Enable backwards compatibility for component::get_gid() functions"
-    OFF ADVANCED)
-if(HPX_WITH_COMPONENT_GET_GID_COMPATIBILITY)
-  hpx_add_config_define(HPX_HAVE_COMPONENT_GET_GID_COMPATIBILITY)
-endif()
-
 # HPX_WITH_LOCAL_DATAFLOW_COMPATIBILITY: introduced in V0.9.99
 hpx_option(HPX_WITH_LOCAL_DATAFLOW_COMPATIBILITY BOOL
     "Enable backwards compatibility for hpx::lcos::local::dataflow() functions"
@@ -1184,6 +1168,13 @@ endif()
 hpx_check_for_mm_prefetch(
   DEFINITIONS HPX_HAVE_MM_PREFETCH)
 
+hpx_check_for_stable_inplace_merge(
+  DEFINITIONS HPX_HAVE_STABLE_INPLACE_MERGE)
+
+if(NOT HPX_WITH_STABLE_INPLACE_MERGE)
+  hpx_warn("The standard library you are using (libc++ version < 6) does not have a stable inplace_merge implementation.")
+endif()
+
 ################################################################################
 # Check for misc system headers
 ################################################################################

diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -575,7 +575,8 @@ endmacro()
 macro(hpx_check_for_cxx14_lambdas)
   add_hpx_config_test(HPX_WITH_CXX14_LAMBDAS
     SOURCE cmake/tests/cxx14_lambdas.cpp
-    FILE ${ARGN})
+    FILE ${ARGN}
+    CMAKECXXFEATURE cxx_lambda_init_captures)
 endmacro()
 
 ###############################################################################
@@ -656,3 +657,10 @@ macro(hpx_check_for_mm_prefetch)
     SOURCE cmake/tests/mm_prefetch.cpp
     FILE ${ARGN})
 endmacro()
+
+###############################################################################
+macro(hpx_check_for_stable_inplace_merge)
+  add_hpx_config_test(HPX_WITH_STABLE_INPLACE_MERGE
+    SOURCE cmake/tests/stable_inplace_merge.cpp
+    FILE ${ARGN})
+endmacro()
diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -180,12 +180,6 @@ macro(hpx_perform_cxx_feature_tests)
       DEFINITIONS HPX_HAVE_CXX14_DEPRECATED_ATTRIBUTE)
 
     hpx_check_for_cxx14_return_type_deduction()
-
-    # check for experimental facilities
-
-    # check for Library Fundamentals TS v2's experimental/optional
-    hpx_check_for_libfun_std_experimental_optional(
-      DEFINITIONS HPX_HAVE_LIBFUN_STD_EXPERIMENTAL_OPTIONAL)
   endif()
 
   if(HPX_WITH_CXX1Z OR HPX_WITH_CXX17)

diff --git a/cmake/tests/libfun_std_experimental_optional.cpp b/cmake/tests/libfun_std_experimental_optional.cpp
diff --git a/cmake/tests/stable_inplace_merge.cpp b/cmake/tests/stable_inplace_merge.cpp
@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright (c) 2017-2018 Mikael Simberg
+//
+//  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 <ciso646>
+
+#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 6000)
+#  error "libc++ inplace_merge implementation is not stable"
+#endif
+
+int main()
+{
+    return 0;
+}
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -86,6 +86,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/partition.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/reduce.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/reduce_by_key.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/remove.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/remove_copy.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/replace.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/algorithms/reverse.hpp"
@@ -116,6 +117,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/merge.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/minmax.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/partition.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/remove.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/remove_copy.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/replace.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/container_algorithms/reverse.hpp"

diff --git a/docs/hpx.idx b/docs/hpx.idx
@@ -272,6 +272,10 @@ parallel::reduction_bit_xor           "reduction_bit_xor" "hpx\.parallel\.v2\.re
 parallel::reduction_min               "reduction_min" "hpx\.parallel\.v2\.reduction_min"
 parallel::reduction_max               "reduction_max" "hpx\.parallel\.v2\.reduction_max"
 
+# hpx/parallel/algorithms/remove.hpp
+parallel::remove                      "remove" "hpx\.parallel\.v1\.remove_id.*"
+parallel::remove_if                   "remove_if" "hpx\.parallel\.v1\.remove_if_id.*"
+
 # hpx/parallel/algorithms/remove_copy.hpp
 parallel::remove_copy                  "remove_copy" "hpx\.parallel\.v1\.remove_copy$"
 parallel::remove_copy_if               "remove_copy_if" "hpx\.parallel\.v1\.remove_copy_if.*"

diff --git a/docs/hpx.qbk b/docs/hpx.qbk
@@ -1,5 +1,5 @@
 [/==============================================================================
-    Copyright (C) 2007-2017 Hartmut Kaiser
+    Copyright (C) 2007-2018 Hartmut Kaiser
     Copyright (C) 2012 Bryce Adelstein-Lelbach
     Copyright (c) 2012-2016 Adrian Serio
 
@@ -12,7 +12,7 @@
     [id hpx]
     [authors [STE||AR Group, The]]
     [version 1.1.0]
-    [copyright 2011 2012 2013 2014 2015 2016 2017 The STE||AR Group (http://stellar-group.org)]
+    [copyright 2011 2012 2013 2014 2015 2016 2017 2018 The STE||AR Group (http://stellar-group.org)]
     [license
         Distributed under the Boost Software License, Version 1.0. (See
         accompanying file [@http://www.boost.org/LICENSE_1_0.txt LICENSE_1_0.txt]
@@ -38,7 +38,7 @@
 [def __0_9_10__                 [link hpx.whats_new.hpx_previous.hpx_0_9_10 V0.9.10]]
 [def __0_9_11__                 [link hpx.whats_new.hpx_previous.hpx_0_9_11 V0.9.11]]
 [def __0_9_99__                 [link hpx.whats_new.hpx_previous.hpx_0_9_99 V0.9.99]]
-[def __1_0_0__                  [link hpx.whats_new.hpx_1_0_0 V1.0.0]]
+[def __1_0_0__                  [link hpx.whats_new.hpx_previous.hpx_1_0_0 V1.0.0]]
 [def __1_1_0__                  [link hpx.whats_new.hpx_1_1_0 V1.1.0]]
 
 [def __version__                __1_1_0__]
@@ -142,6 +142,7 @@
 [def __vc__                     [@https://github.com/VcDevel/Vc Vc Library]]
 
 [def __cpp11__                  [@http://www.open-std.org/jtc1/sc22/wg21 C++11 Standard]]
+[def __cpp17__                  [@http://www.open-std.org/jtc1/sc22/wg21 C++17 Standard]]
 [def __cpp11_n3632__            [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3632.html N3632]]
 [def __cpp11_n3634__            [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n3857.pdf N3857]]
 [def __cpp11_n3562__            [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3562.pdf N3562]]

diff --git a/docs/manual/parallel_algorithms.qbk b/docs/manual/parallel_algorithms.qbk
@@ -266,6 +266,17 @@ __hpx__ provides implementations of the following parallel algorithms:
      [`<hpx/include/parallel_generate.hpp>`]
      [[cpprefalgodocs generate_n]]
     ]
+    [[ [algoref remove] ]
+     [Removes the elements from a range that are equal to the given value.]
+     [`<hpx/include/parallel_remove.hpp>`]
+     [[cpprefalgodocs remove]]
+    ]
+    [[ [algoref remove_if] ]
+     [Removes the elements from a range that are equal to the given
+      predicate is `false`.]
+     [`<hpx/include/parallel_remove.hpp>`]
+     [[cpprefalgodocs remove]]
+    ]
     [[ [algoref remove_copy] ]
      [Copies the elements from a range to a new location that are not equal to
       the given value.]