Separate out variant_policy

alugowski · Dec 14, 2023 · 18972c9 · 18972c9
1 parent b042b81
commit 18972c9
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 56 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(HEADER_FILES
         include/poolstl/algorithm
         include/poolstl/execution
         include/poolstl/numeric
-        include/poolstl/seq_fwd.hpp
+        include/poolstl/variant_policy.hpp
         include/poolstl/iota_iter.hpp
         include/poolstl/internal/utils.hpp
         include/poolstl/internal/ttp_impl.hpp

diff --git a/include/poolstl/execution b/include/poolstl/execution
@@ -15,10 +15,6 @@
 #include "internal/task_thread_pool.hpp"
 #include "internal/utils.hpp"
 
-#if POOLSTL_HAVE_CXX17
-#include <variant>
-#endif
-
 namespace poolstl {
 
     namespace ttp = task_thread_pool;
@@ -124,27 +120,6 @@ namespace poolstl {
             bool par_ok = true;
         };
 
-
-#if POOLSTL_HAVE_CXX17
-        /**
-         * A policy that allows selecting a policy at runtime.
-         *
-         * @tparam Variant std::variant<> of policy options.
-         */
-        template <typename Variant>
-        struct variant_policy {
-            explicit variant_policy(const Variant& policy): var(policy) {}
-            Variant var;
-        };
-
-        namespace internal {
-            using poolstl_policy_variant = std::variant<
-                poolstl::execution::parallel_policy,
-                poolstl::execution::sequenced_policy>;
-        }
-
-#endif
-
         /**
          * Choose parallel or sequential at runtime.
          *
@@ -180,9 +155,6 @@ namespace poolstl {
     using execution::seq;
     using execution::par;
     using execution::par_if;
-#if POOLSTL_HAVE_CXX17
-    using execution::variant_policy;
-#endif
 
     namespace internal {
         /**
@@ -223,25 +195,6 @@ namespace poolstl {
         template <class ExecPolicy>
         using is_pure_threads_policy = std::is_same<poolstl::execution::pure_threads_policy,
             typename std::remove_cv<typename std::remove_reference<ExecPolicy>::type>::type>;
-
-#if POOLSTL_HAVE_CXX17
-        /**
-         * Helper for enable_if_poolstl_variant
-         */
-        template <typename T> struct is_poolstl_variant_policy : std::false_type {};
-        template <typename V> struct is_poolstl_variant_policy<
-            ::poolstl::execution::variant_policy<V>> :std::true_type {};
-
-        /**
-         * To enable/disable variant_policy (for par_if) overload resolution
-         */
-        template <class ExecPolicy, class Tp>
-        using enable_if_poolstl_variant =
-            typename std::enable_if<
-                is_poolstl_variant_policy<
-                    typename std::remove_cv<typename std::remove_reference<ExecPolicy>::type>::type>::value,
-                Tp>::type;
-#endif
     }
 }
 

diff --git a/include/poolstl/poolstl.hpp b/include/poolstl/poolstl.hpp
@@ -15,7 +15,6 @@
 #include "execution"
 #include "algorithm"
 #include "numeric"
-#include "seq_fwd.hpp"
 
 // Note that iota_iter.hpp is self-contained in its own right.
 #include "iota_iter.hpp"

diff --git a/include/poolstl/seq_fwd.hpp → include/poolstl/variant_policy.hpp b/include/poolstl/seq_fwd.hpp → include/poolstl/variant_policy.hpp
@@ -3,11 +3,55 @@
 // the BSD 2-clause license, the MIT license, or at your choosing the BSL-1.0 license found in the LICENSE.*.txt files.
 // SPDX-License-Identifier: BSD-2-Clause OR MIT OR BSL-1.0
 
-#ifndef POOLSTL_SEQ_FWD_HPP
-#define POOLSTL_SEQ_FWD_HPP
+#ifndef POOLSTL_VARIANT_POLICY_HPP
+#define POOLSTL_VARIANT_POLICY_HPP
 
 #include "execution"
 
+#include <variant>
+
+namespace poolstl {
+    namespace execution {
+        /**
+         * A policy that allows selecting a policy at runtime.
+         *
+         * @tparam Variant std::variant<> of policy options.
+         */
+        template <typename Variant>
+        struct variant_policy {
+            explicit variant_policy(const Variant& policy): var(policy) {}
+            Variant var;
+        };
+
+        namespace internal {
+            using poolstl_policy_variant = std::variant<
+                poolstl::execution::parallel_policy,
+                poolstl::execution::sequenced_policy>;
+        }
+    }
+
+    using execution::variant_policy;
+
+    namespace internal {
+        /**
+         * Helper for enable_if_poolstl_variant
+         */
+        template <typename T> struct is_poolstl_variant_policy : std::false_type {};
+        template <typename V> struct is_poolstl_variant_policy<
+            ::poolstl::execution::variant_policy<V>> :std::true_type {};
+
+        /**
+         * To enable/disable variant_policy (for par_if) overload resolution
+         */
+        template <class ExecPolicy, class Tp>
+        using enable_if_poolstl_variant =
+            typename std::enable_if<
+                is_poolstl_variant_policy<
+                    typename std::remove_cv<typename std::remove_reference<ExecPolicy>::type>::type>::value,
+                Tp>::type;
+    }
+}
+
 /*
  * Forward poolstl::seq to the native sequential (no policy) method.
  */

diff --git a/tests/supplement_test.cpp b/tests/supplement_test.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-2-Clause OR MIT OR BSL-1.0
 
 #include <iostream>
-#include <numeric>
+#include <string>
 #include <variant>
 
 // The <execution> header defines compiler-provided execution policies, but is not always present.
@@ -21,6 +21,10 @@
 #define POOLSTL_STD_SUPPLEMENT
 #include <poolstl/poolstl.hpp>
 
+#ifndef POOLSTL_AMALGAM
+// Test poolstl::variant_policy.
+// Not bundled with the amalgam.
+#include <poolstl/variant_policy.hpp>
 using std_policy_variant = std::variant<std::execution::parallel_policy, std::execution::sequenced_policy>;
 
 /**
@@ -33,6 +37,7 @@ poolstl::variant_policy<std_policy_variant> std_par_if(bool call_par) {
         return poolstl::variant_policy(std_policy_variant(std::execution::seq));
     }
 }
+#endif
 
 int main() {
     if (std::is_same_v<std::execution::parallel_policy, poolstl::execution::parallel_policy>) {
@@ -45,24 +50,26 @@ int main() {
     std::for_each(std::execution::seq, v.cbegin(), v.cend(), [](int x) {
         std::cout << x;
     });
-    std::cout << std::endl;
+    std::cout << " std::execution::seq" << std::endl;
 
     std::for_each(std::execution::par, v.cbegin(), v.cend(), [](int x) {
         std::cout << x;
     });
-    std::cout << std::endl;
+    std::cout << " std::execution::par" << std::endl;
 
     std::for_each(std::execution::par_unseq, v.cbegin(), v.cend(), [](int x) {
         std::cout << x;
     });
-    std::cout << std::endl;
+    std::cout << " std::execution::par_unseq" << std::endl;
 
+#ifndef POOLSTL_AMALGAM
     for (bool is_parallel : {true, false}) {
         std::for_each(std_par_if(is_parallel), v.cbegin(), v.cend(), [](int x) {
             std::cout << x;
         });
-        std::cout << std::endl;
+        std::cout << " std_par_if(" << std::to_string(is_parallel) << ")" << std::endl;
     }
+#endif
 
     return 0;
 }
diff --git a/tools/amalgamate_header.hpp b/tools/amalgamate_header.hpp
@@ -83,3 +83,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+#ifndef POOLSTL_AMALGAM
+#define POOLSTL_AMALGAM
+#endif