Merge branch 'main' into lapack-backend

CExA-project · Jul 1, 2024 · 037d163 · 037d163
2 parents 5b56d56 + 729cd84
commit 037d163
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -142,12 +142,12 @@ jobs:
           'cpu-clang')
             export CC=clang
             export CXX=clang++
-            DDC_CMAKE_CXX_FLAGS="-Werror=extra-semi -Werror=old-style-cast"
+            DDC_CMAKE_CXX_FLAGS="-Wextra-semi -Wextra-semi-stmt -Wold-style-cast"
           ;;
           'cpu-gcc')
             export CC=gcc
             export CXX=g++
-            DDC_CMAKE_CXX_FLAGS="-Werror=extra-semi -Werror=old-style-cast"
+            DDC_CMAKE_CXX_FLAGS="-Wextra-semi -Wold-style-cast"
             if [ 'xDebug' = 'x${{matrix.cmake_build_type}}' ]
             then
               DDC_CMAKE_CXX_FLAGS="${DDC_CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=address"

diff --git a/include/ddc/parallel_for_each.hpp b/include/ddc/parallel_for_each.hpp
@@ -167,7 +167,7 @@ void parallel_for_each(
  * @param[in] f      a functor taking an index as parameter
  */
 template <class ExecSpace, class... DDims, class Functor>
-void parallel_for_each(
+std::enable_if_t<Kokkos::is_execution_space_v<ExecSpace>> parallel_for_each(
         ExecSpace const& execution_space,
         DiscreteDomain<DDims...> const& domain,
         Functor&& f) noexcept

diff --git a/include/ddc/parallel_transform_reduce.hpp b/include/ddc/parallel_transform_reduce.hpp
@@ -329,7 +329,7 @@ T parallel_transform_reduce(
  *            range. The return type must be acceptable as input to reduce
  */
 template <class ExecSpace, class... DDims, class T, class BinaryReductionOp, class UnaryTransformOp>
-T parallel_transform_reduce(
+std::enable_if_t<Kokkos::is_execution_space_v<ExecSpace>, T> parallel_transform_reduce(
         ExecSpace const& execution_space,
         DiscreteDomain<DDims...> const& domain,
         T neutral,