Do not negate the dependent true traits helper

japlews · Dec 13, 2023 · 76ea3a3 · 76ea3a3
1 parent ed08974
commit 76ea3a3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_MDRange.hpp b/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_MDRange.hpp
@@ -31,8 +31,7 @@ template <class Functor, class Reducer, class Policy,
 struct OpenACCParallelReduceMDRangeHelper {
   OpenACCParallelReduceMDRangeHelper(Functor const&, Reducer const&,
                                      Policy const&) {
-    static_assert(!Kokkos::Impl::always_true<Functor>::value,
-                  "not implemented");
+    static_assert(std::is_void_v<Functor>, "not implemented");
   }
 };
 }  // namespace Kokkos::Experimental::Impl

diff --git a/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_Range.hpp b/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_Range.hpp
@@ -31,8 +31,7 @@ template <class Functor, class Reducer, class Policy,
           bool = std::is_arithmetic_v<typename Reducer::value_type>>
 struct OpenACCParallelReduceHelper {
   OpenACCParallelReduceHelper(Functor const&, Reducer const&, Policy const&) {
-    static_assert(!Kokkos::Impl::always_true<Functor>::value,
-                  "not implemented");
+    static_assert(std::is_void_v<Functor>, "not implemented");
   }
 };
 

diff --git a/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_Team.hpp b/core/src/OpenACC/Kokkos_OpenACC_ParallelReduce_Team.hpp
@@ -40,8 +40,7 @@ template <class Functor, class Reducer, class Policy,
 struct OpenACCParallelReduceTeamHelper {
   OpenACCParallelReduceTeamHelper(Functor const&, Reducer const&,
                                   Policy const&) {
-    static_assert(!Kokkos::Impl::always_true<Functor>::value,
-                  "not implemented");
+    static_assert(std::is_void_v<Functor>, "not implemented");
   }
 };
 
@@ -129,8 +128,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
     const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::OpenACCTeamMember>&
         loop_boundaries,
     const Lambda& lambda, const JoinType& join, ValueType& init_result) {
-  static_assert(!Kokkos::Impl::always_true<Lambda>::value,
-                "custom reduction is not implemented");
+  static_assert(std::is_void_v<Lambda>, "custom reduction is not implemented");
 }
 
 // Hierarchical Parallelism -> Thread vector level implementation
@@ -140,8 +138,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
     const Impl::ThreadVectorRangeBoundariesStruct<
         iType, Impl::OpenACCTeamMember>& loop_boundaries,
     const Lambda& lambda, const JoinType& join, ValueType& init_result) {
-  static_assert(!Kokkos::Impl::always_true<Lambda>::value,
-                "custom reduction is not implemented");
+  static_assert(std::is_void_v<Lambda>, "custom reduction is not implemented");
 }
 
 }  // namespace Kokkos

diff --git a/core/src/OpenACC/Kokkos_OpenACC_Team.hpp b/core/src/OpenACC/Kokkos_OpenACC_Team.hpp
@@ -82,7 +82,7 @@ class OpenACCTeamMember {
   // FIXME_OPENACC: team_broadcast() is not implemented.
   template <class ValueType>
   KOKKOS_FUNCTION void team_broadcast(ValueType& value, int thread_id) const {
-    static_assert(!Kokkos::Impl::always_true<ValueType>::value,
+    static_assert(std::is_void_v<ValueType>,
                   "Kokkos Error: team_broadcast() is not implemented for the "
                   "OpenACC backend");
     return ValueType();
@@ -99,7 +99,7 @@ class OpenACCTeamMember {
   template <class ValueType, class JoinOp>
   KOKKOS_FUNCTION ValueType team_reduce(const ValueType& value,
                                         const JoinOp& op_in) const {
-    static_assert(!Kokkos::Impl::always_true<ValueType>::value,
+    static_assert(std::is_void_v<ValueType>,
                   "Kokkos Error: team_reduce() is not implemented for the "
                   "OpenACC backend");
     return ValueType();
@@ -110,7 +110,7 @@ class OpenACCTeamMember {
   KOKKOS_FUNCTION ArgType team_scan(const ArgType& /*value*/,
                                     ArgType* const /*global_accum*/) const {
     static_assert(
-        !Kokkos::Impl::always_true<ArgType>::value,
+        std::is_void_v<ArgType>,
         "Kokkos Error: team_scan() is not implemented for the OpenACC backend");
     return ArgType();
   }