Merge pull request #10 from uliegecsm/concepts-exec-mem

 concepts(core): ExecutionSpace, MemorySpace and Space concepts for C++20

.devcontainer/devcontainer.json

@@ -2,6 +2,7 @@
     "dockerFile": "dockerfile",
     "extensions" : [
         "ms-vscode.cmake-tools",
+        "eamodio.gitlens",
         "mhutchie.git-graph",
         "ms-azuretools.vscode-docker"
     ],

CMakeLists.txt

@@ -55,6 +55,10 @@ target_sources(
         include/kokkos-utils/atomics/InsertOp.hpp
 
         include/kokkos-utils/concepts/DualView.hpp
+
+        include/kokkos-utils/concepts/ExecutionSpace.hpp
+        include/kokkos-utils/concepts/MemorySpace.hpp
+        include/kokkos-utils/concepts/Space.hpp
         include/kokkos-utils/concepts/View.hpp
 )
 

include/kokkos-utils/concepts/ExecutionSpace.hpp

@@ -0,0 +1,15 @@
+#ifndef KOKKOS_UTILS_CONCEPTS_EXECUTIONSPACE_HPP
+#define KOKKOS_UTILS_CONCEPTS_EXECUTIONSPACE_HPP
+
+#include "Kokkos_Concepts.hpp"
+
+namespace Kokkos::utils::concepts
+{
+
+//! Concept to specify that a type is a @c Kokkos execution space.
+template <typename T>
+concept ExecutionSpace = Kokkos::is_execution_space_v<T>;
+
+} // namespace Kokkos::utils::concepts
+
+#endif // KOKKOS_UTILS_CONCEPTS_EXECUTIONSPACE_HPP

include/kokkos-utils/concepts/MemorySpace.hpp

@@ -0,0 +1,15 @@
+#ifndef KOKKOS_UTILS_CONCEPTS_MEMORYSPACE_HPP
+#define KOKKOS_UTILS_CONCEPTS_MEMORYSPACE_HPP
+
+#include "Kokkos_Concepts.hpp"
+
+namespace Kokkos::utils::concepts
+{
+
+//! Concept to specify that a type is a @c Kokkos memory space.
+template <typename T>
+concept MemorySpace = Kokkos::is_memory_space_v<T>;
+
+} // namespace Kokkos::utils::concepts
+
+#endif // KOKKOS_UTILS_CONCEPTS_MEMORYSPACE_HPP

include/kokkos-utils/concepts/Space.hpp

@@ -0,0 +1,15 @@
+#ifndef KOKKOS_UTILS_CONCEPTS_SPACE_HPP
+#define KOKKOS_UTILS_CONCEPTS_SPACE_HPP
+
+#include "Kokkos_Concepts.hpp"
+
+namespace Kokkos::utils::concepts
+{
+
+//! Concept to specify that a type is a @c Kokkos space.
+template <typename T>
+concept Space = Kokkos::is_space<T>::value;
+
+} // namespace Kokkos::utils::concepts
+
+#endif // KOKKOS_UTILS_CONCEPTS_SPACE_HPP

tests/concepts/CMakeLists.txt

@@ -3,8 +3,22 @@ add_one_test(
     TEST_NAME DualView
 )
 
+### TEST : ExecutionSpace ###
+add_one_test(
+    TEST_NAME ExecutionSpace
+)
+
+### TEST : MemorySpace ###
+add_one_test(
+    TEST_NAME MemorySpace
+)
+
+### TEST : Space ###
+add_one_test(
+    TEST_NAME Space
+)
+
 ### TEST : View ###
 add_one_test(
     TEST_NAME View
 )
-

tests/concepts/test_ExecutionSpace.cpp

@@ -0,0 +1,30 @@
+#include "gtest/gtest.h"
+
+#include "Kokkos_Core.hpp"
+
+#include "kokkos-utils/concepts/ExecutionSpace.hpp"
+
+using execution_space = Kokkos::DefaultExecutionSpace;
+
+/**
+ * @file
+ *
+ * @addtogroup unittests
+ *
+ * **Concepts related to @c Kokkos execution space**
+ *
+ * This group of tests check the behavior of our concepts related to @c Kokkos execution space.
+ */
+
+namespace Kokkos::utils::tests::concepts
+{
+
+//! @test Check that @ref Kokkos::utils::concepts::ExecutionSpace works as expected.
+TEST(concepts, ExecutionSpace)
+{
+    static_assert(  Kokkos::utils::concepts::ExecutionSpace<typename execution_space::execution_space>);
+    static_assert(! Kokkos::utils::concepts::ExecutionSpace<typename execution_space::memory_space>);
+    static_assert(! Kokkos::utils::concepts::ExecutionSpace<Kokkos::Device<typename execution_space::execution_space, typename execution_space::memory_space>>);
+}
+
+} // namespace Kokkos::utils::tests::concepts

tests/concepts/test_MemorySpace.cpp

@@ -0,0 +1,30 @@
+#include "gtest/gtest.h"
+
+#include "Kokkos_Core.hpp"
+
+#include "kokkos-utils/concepts/MemorySpace.hpp"
+
+using execution_space = Kokkos::DefaultExecutionSpace;
+
+/**
+ * @file
+ *
+ * @addtogroup unittests
+ *
+ * **Concepts related to @c Kokkos memory space**
+ *
+ * This group of tests check the behavior of our concepts related to @c Kokkos memory space.
+ */
+
+namespace Kokkos::utils::tests::concepts
+{
+
+//! @test Check that @ref Kokkos::utils::concepts::MemorySpace works as expected.
+TEST(concepts, MemorySpace)
+{
+    static_assert(! Kokkos::utils::concepts::MemorySpace<typename execution_space::execution_space>);
+    static_assert(  Kokkos::utils::concepts::MemorySpace<typename execution_space::memory_space>);
+    static_assert(! Kokkos::utils::concepts::MemorySpace<Kokkos::Device<typename execution_space::execution_space, typename execution_space::memory_space>>);
+}
+
+} // namespace Kokkos::utils::tests::concepts

tests/concepts/test_Space.cpp

@@ -0,0 +1,30 @@
+#include "gtest/gtest.h"
+
+#include "Kokkos_Core.hpp"
+
+#include "kokkos-utils/concepts/Space.hpp"
+
+using execution_space = Kokkos::DefaultExecutionSpace;
+
+/**
+ * @file
+ *
+ * @addtogroup unittests
+ *
+ * **Concepts related to @c Kokkos space**
+ *
+ * This group of tests check the behavior of our concepts related to @c Kokkos space.
+ */
+
+namespace Kokkos::utils::tests::concepts
+{
+
+//! @test Check that @ref Kokkos::utils::concepts::Space works as expected.
+TEST(concepts, Space)
+{
+    static_assert(Kokkos::utils::concepts::Space<typename execution_space::execution_space>);
+    static_assert(Kokkos::utils::concepts::Space<typename execution_space::memory_space>);
+    static_assert(Kokkos::utils::concepts::Space<Kokkos::Device<typename execution_space::execution_space, typename execution_space::memory_space>>);
+}
+
+} // namespace Kokkos::utils::tests::concepts