From 593cbfd5f0ebf71b70594be96c552657c8960752 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Wed, 22 May 2024 15:54:58 +0200 Subject: [PATCH 1/2] #308: Rename KOKKOS macros --- src/CMakeLists.txt | 2 +- src/checkpoint/container/kokkos_complex_serialize.h | 4 ++-- src/checkpoint/container/kokkos_pair_serialize.h | 4 ++-- .../container/kokkos_unordered_map_serialize.h | 4 ++-- src/checkpoint/container/view_equality.h | 4 ++-- src/checkpoint/container/view_serialize.h | 8 ++++---- src/checkpoint/container/view_traits_extract.h | 4 ++-- src/checkpoint/container/view_traverse_manual.h | 4 ++-- src/checkpoint/container/view_traverse_ndim.h | 4 ++-- tests/unit/main.cc | 6 +++--- tests/unit/test_commons.h | 4 ++-- tests/unit/test_footprinter.cc | 4 ++-- tests/unit/test_kokkos_integration_commons.h | 10 +++++----- tests/unit/test_kokkos_serialize_0d.cc | 2 +- tests/unit/test_kokkos_serialize_1d.cc | 2 +- tests/unit/test_kokkos_serialize_2d.cc | 2 +- tests/unit/test_kokkos_serialize_3d_left.cc | 2 +- tests/unit/test_kokkos_serialize_3d_right.cc | 2 +- tests/unit/test_kokkos_serialize_3d_stride.cc | 2 +- tests/unit/test_kokkos_serialize_complex.cc | 4 ++-- tests/unit/test_kokkos_serialize_dynrankview.cc | 2 +- tests/unit/test_kokkos_serialize_integration.cc | 2 +- tests/unit/test_kokkos_serialize_nd.cc | 2 +- tests/unit/test_kokkos_serialize_pair.cc | 4 ++-- tests/unit/test_kokkos_serialize_special.cc | 2 +- tests/unit/test_kokkos_serialize_unordered_map.cc | 4 ++-- tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc | 2 +- tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_left.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_right.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_left.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_right.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc | 2 +- .../tests_mpi/test_kokkos_serialize_integration_mpi.cc | 2 +- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9741dbca..afccbeda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ if (${kokkos_DIR_FOUND}) endif() target_compile_definitions( ${CHECKPOINT_LIBRARY} PUBLIC - KOKKOS_ENABLED_CHECKPOINT=1 KOKKOS_KERNELS_ENABLED=${KERNELS} + MAGISTRATE_ENABLED_KOKKOS=1 MAGISTRATE_ENABLED_KOKKOS_KERNELS=${KERNELS} ) message(STATUS "Checkpoint: Kokkos enabled") target_link_libraries(${CHECKPOINT_LIBRARY} PUBLIC Kokkos::kokkos) diff --git a/src/checkpoint/container/kokkos_complex_serialize.h b/src/checkpoint/container/kokkos_complex_serialize.h index 7355e556..c88256d9 100644 --- a/src/checkpoint/container/kokkos_complex_serialize.h +++ b/src/checkpoint/container/kokkos_complex_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include @@ -65,6 +65,6 @@ void serialize(SerializerT& s, Kokkos::complex& complex) } // namespace checkpoint -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_COMPLEX_SERIALIZE_H*/ diff --git a/src/checkpoint/container/kokkos_pair_serialize.h b/src/checkpoint/container/kokkos_pair_serialize.h index 892e08a2..5708ceaf 100644 --- a/src/checkpoint/container/kokkos_pair_serialize.h +++ b/src/checkpoint/container/kokkos_pair_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include @@ -71,6 +71,6 @@ void serialize(SerializerT& s, Kokkos::pair& pair) } // namespace checkpoint -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_PAIR_SERIALIZE_H*/ diff --git a/src/checkpoint/container/kokkos_unordered_map_serialize.h b/src/checkpoint/container/kokkos_unordered_map_serialize.h index 1b5de430..4a74b56b 100644 --- a/src/checkpoint/container/kokkos_unordered_map_serialize.h +++ b/src/checkpoint/container/kokkos_unordered_map_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include @@ -156,6 +156,6 @@ typename std::enable_if_t< } // namespace checkpoint -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_UNORDERED_MAP_SERIALIZE_H*/ diff --git a/src/checkpoint/container/view_equality.h b/src/checkpoint/container/view_equality.h index 6a3bd277..8bc8b200 100644 --- a/src/checkpoint/container/view_equality.h +++ b/src/checkpoint/container/view_equality.h @@ -50,7 +50,7 @@ #include "checkpoint/container/view_traverse_manual.h" #include "checkpoint/container/view_traverse_ndim.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -344,6 +344,6 @@ struct ViewEquality { } /* end namespace checkpoint */ -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_EQUALITY_H*/ diff --git a/src/checkpoint/container/view_serialize.h b/src/checkpoint/container/view_serialize.h index a753670e..ebc4dc1d 100644 --- a/src/checkpoint/container/view_serialize.h +++ b/src/checkpoint/container/view_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/container/view_traverse_manual.h" #include "checkpoint/container/view_traverse_ndim.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -62,7 +62,7 @@ #define CHECKPOINT_KOKKOS_WITHOUTINIT #endif -#if KOKKOS_KERNELS_ENABLED +#if MAGISTRATE_ENABLED_KOKKOS_KERNELS #include #include #endif @@ -588,7 +588,7 @@ void serializeContentsOnly(SerializerT& s, Kokkos::View& v) { deepCopyWithLocalFence(v, values); } -#if KOKKOS_KERNELS_ENABLED +#if MAGISTRATE_ENABLED_KOKKOS_KERNELS template< typename Serializer, typename T, typename... Ts > inline void serialize( Serializer &s, Kokkos::StaticCrsGraph &graph ) { s | graph.entries | graph.row_map | graph.row_block_offsets; @@ -611,6 +611,6 @@ inline void serialize( Serializer &s, KokkosSparse::CrsMatrix &matrix } /* end namespace checkpoint */ -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_SERIALIZE_H*/ diff --git a/src/checkpoint/container/view_traits_extract.h b/src/checkpoint/container/view_traits_extract.h index cc3a7756..a9b5de0c 100644 --- a/src/checkpoint/container/view_traits_extract.h +++ b/src/checkpoint/container/view_traits_extract.h @@ -47,7 +47,7 @@ #include "checkpoint/common.h" #include "checkpoint/serializers/serializers_headers.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -117,6 +117,6 @@ struct CountDims { } /* end namespace checkpoint */ -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAITS_EXTRACT_H*/ diff --git a/src/checkpoint/container/view_traverse_manual.h b/src/checkpoint/container/view_traverse_manual.h index 45522a86..77eae1f3 100644 --- a/src/checkpoint/container/view_traverse_manual.h +++ b/src/checkpoint/container/view_traverse_manual.h @@ -48,7 +48,7 @@ #include "checkpoint/serializers/serializers_headers.h" #include "checkpoint/container/view_traits_extract.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -345,6 +345,6 @@ struct TraverseManual { } /* end namespace checkpoint */ -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAVERSE_MANUAL_H*/ diff --git a/src/checkpoint/container/view_traverse_ndim.h b/src/checkpoint/container/view_traverse_ndim.h index ea9b0639..cb42fe88 100644 --- a/src/checkpoint/container/view_traverse_ndim.h +++ b/src/checkpoint/container/view_traverse_ndim.h @@ -48,7 +48,7 @@ #include "checkpoint/serializers/serializers_headers.h" #include "checkpoint/container/view_traits_extract.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -274,6 +274,6 @@ struct TraverseRecursive { } /* end namespace checkpoint */ -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAVERSE_NDIM_H*/ diff --git a/tests/unit/main.cc b/tests/unit/main.cc index 88c792a7..52dd2ac4 100644 --- a/tests/unit/main.cc +++ b/tests/unit/main.cc @@ -50,7 +50,7 @@ #endif #include "test_harness.h" -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #endif @@ -72,14 +72,14 @@ int main(int argc, char **argv) { int ret = 0; { -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS Kokkos::initialize(); #endif checkpoint::tests::unit::TestHarness::store_cmdline_args(argc, argv); ret = RUN_ALL_TESTS(); -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS Kokkos::finalize(); #endif } diff --git a/tests/unit/test_commons.h b/tests/unit/test_commons.h index 41792e6f..36ef661a 100644 --- a/tests/unit/test_commons.h +++ b/tests/unit/test_commons.h @@ -49,7 +49,7 @@ #include #include -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include #include @@ -88,7 +88,7 @@ static void compareBasic(ViewT const& k1, ViewT const& k2) { EqualityType::template compareMeta(k1,k2); } -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS template struct KokkosViewTest : ::testing::TestWithParam { }; #endif diff --git a/tests/unit/test_footprinter.cc b/tests/unit/test_footprinter.cc index ec0669df..f5e52feb 100644 --- a/tests/unit/test_footprinter.cc +++ b/tests/unit/test_footprinter.cc @@ -634,7 +634,7 @@ TEST_F(TestFootprinter, test_no_serialize) { ); } -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS TEST_F(TestFootprinter, test_kokkos_unordered_map) { // empty map { @@ -698,6 +698,6 @@ TEST_F(TestFootprinter, test_kokkos_complex) { } -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ }}} // end namespace checkpoint::tests::unit diff --git a/tests/unit/test_kokkos_integration_commons.h b/tests/unit/test_kokkos_integration_commons.h index 39bfe427..0a37e075 100644 --- a/tests/unit/test_kokkos_integration_commons.h +++ b/tests/unit/test_kokkos_integration_commons.h @@ -78,7 +78,7 @@ struct Data : BaseData { using Kokkos_ViewType2 = ::Kokkos::View; using Kokkos_ViewType3 = ::Kokkos::View; using Kokkos_ViewType4 = ::Kokkos::View; - #if KOKKOS_KERNELS_ENABLED + #if MAGISTRATE_ENABLED_KOKKOS_KERNELS using Kokkos_CrsType = ::Kokkos::StaticCrsGraph; using Kokkos_CrsMatrix = ::KokkosSparse::CrsMatrix; #endif @@ -122,7 +122,7 @@ struct Data : BaseData { v3 = v3_tmp; v4 = v4_tmp; - #if KOKKOS_KERNELS_ENABLED + #if MAGISTRATE_ENABLED_KOKKOS_KERNELS std::vector< std::vector< int > > graph( d1_a ); for ( size_t i = 0 ; i < d1_a; ++i ) { @@ -207,7 +207,7 @@ struct Data : BaseData { EXPECT_EQ(in.v4.operator()(i,1), v4val(i,1)); } - #if KOKKOS_KERNELS_ENABLED + #if MAGISTRATE_ENABLED_KOKKOS_KERNELS std::vector< std::vector< int > > graph( d1_a ); for ( size_t i = 0 ; i < d1_a; ++i ) { @@ -251,7 +251,7 @@ struct Data : BaseData { s | vec; s | val1 | val2; s | v0 | v1 | v2 | v3 | v4; - #if KOKKOS_KERNELS_ENABLED + #if MAGISTRATE_ENABLED_KOKKOS_KERNELS s | crs; s | crs_mat; #endif @@ -265,7 +265,7 @@ struct Data : BaseData { Kokkos_ViewType2 v2; Kokkos_ViewType3 v3; Kokkos_ViewType4 v4; - #if KOKKOS_KERNELS_ENABLED + #if MAGISTRATE_ENABLED_KOKKOS_KERNELS Kokkos_CrsType crs; Kokkos_CrsMatrix crs_mat; #endif diff --git a/tests/unit/test_kokkos_serialize_0d.cc b/tests/unit/test_kokkos_serialize_0d.cc index e0406703..a75d260e 100644 --- a/tests/unit/test_kokkos_serialize_0d.cc +++ b/tests/unit/test_kokkos_serialize_0d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_1d.cc b/tests/unit/test_kokkos_serialize_1d.cc index bad7f601..3117dbe0 100644 --- a/tests/unit/test_kokkos_serialize_1d.cc +++ b/tests/unit/test_kokkos_serialize_1d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_commons.h" #include "test_kokkos_1d_commons.h" diff --git a/tests/unit/test_kokkos_serialize_2d.cc b/tests/unit/test_kokkos_serialize_2d.cc index 33eb853d..0606b543 100644 --- a/tests/unit/test_kokkos_serialize_2d.cc +++ b/tests/unit/test_kokkos_serialize_2d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_left.cc b/tests/unit/test_kokkos_serialize_3d_left.cc index 3ca6d83d..ae952dd8 100644 --- a/tests/unit/test_kokkos_serialize_3d_left.cc +++ b/tests/unit/test_kokkos_serialize_3d_left.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_right.cc b/tests/unit/test_kokkos_serialize_3d_right.cc index 3a57a536..cb5ce868 100644 --- a/tests/unit/test_kokkos_serialize_3d_right.cc +++ b/tests/unit/test_kokkos_serialize_3d_right.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_stride.cc b/tests/unit/test_kokkos_serialize_3d_stride.cc index 7a2fa1e9..18063070 100644 --- a/tests/unit/test_kokkos_serialize_3d_stride.cc +++ b/tests/unit/test_kokkos_serialize_3d_stride.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_complex.cc b/tests/unit/test_kokkos_serialize_complex.cc index f3b5e79d..8e580fa8 100644 --- a/tests/unit/test_kokkos_serialize_complex.cc +++ b/tests/unit/test_kokkos_serialize_complex.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_commons.h" @@ -76,4 +76,4 @@ TEST_F(KokkosComplexTest, test_kokkos_complex) { }}} // namespace checkpoint::tests::unit -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ diff --git a/tests/unit/test_kokkos_serialize_dynrankview.cc b/tests/unit/test_kokkos_serialize_dynrankview.cc index 86ee0285..9d63ed33 100644 --- a/tests/unit/test_kokkos_serialize_dynrankview.cc +++ b/tests/unit/test_kokkos_serialize_dynrankview.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_commons.h" #include "test_harness.h" diff --git a/tests/unit/test_kokkos_serialize_integration.cc b/tests/unit/test_kokkos_serialize_integration.cc index c2f93f72..7a26c456 100644 --- a/tests/unit/test_kokkos_serialize_integration.cc +++ b/tests/unit/test_kokkos_serialize_integration.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_nd.cc b/tests/unit/test_kokkos_serialize_nd.cc index de817391..045ff397 100644 --- a/tests/unit/test_kokkos_serialize_nd.cc +++ b/tests/unit/test_kokkos_serialize_nd.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_pair.cc b/tests/unit/test_kokkos_serialize_pair.cc index 8b243d17..22f38276 100644 --- a/tests/unit/test_kokkos_serialize_pair.cc +++ b/tests/unit/test_kokkos_serialize_pair.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_commons.h" @@ -79,4 +79,4 @@ TEST_F(KokkosPairTest, test_kokkos_pair) { }}} // namespace checkpoint::tests::unit -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ diff --git a/tests/unit/test_kokkos_serialize_special.cc b/tests/unit/test_kokkos_serialize_special.cc index 5d1f4303..9deb6412 100644 --- a/tests/unit/test_kokkos_serialize_special.cc +++ b/tests/unit/test_kokkos_serialize_special.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_unordered_map.cc b/tests/unit/test_kokkos_serialize_unordered_map.cc index 60fb8aff..d994e0be 100644 --- a/tests/unit/test_kokkos_serialize_unordered_map.cc +++ b/tests/unit/test_kokkos_serialize_unordered_map.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_commons.h" @@ -109,4 +109,4 @@ TEST_F(KokkosUnorderedMapTest, test_kokkos_unordered_map) { }}} // namespace checkpoint::tests::unit -#endif /*KOKKOS_ENABLED_CHECKPOINT*/ +#endif /*MAGISTRATE_ENABLED_KOKKOS*/ diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc index efd7f7ee..596d5e8c 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_0d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc index ddb53452..7bd913e7 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_1d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc index 4147e380..d9ebe860 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc index 65676cdc..80b9626b 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc index 8581bb72..dec5e1b5 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc index eace4609..ee90901a 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc index 0e6c28b0..5a7e9d15 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc index 92d43813..467e7589 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc index b1f822bf..931e9ad3 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if KOKKOS_ENABLED_CHECKPOINT +#if MAGISTRATE_ENABLED_KOKKOS #include "test_kokkos_integration_commons.h" #include "test_kokkos_1d_commons.h" From 0fb01b28a559edae0958efb250921b28b24473aa Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Thu, 23 May 2024 14:13:43 +0200 Subject: [PATCH 2/2] #308: Update the macros names to follow format used in vt --- src/CMakeLists.txt | 2 +- src/checkpoint/container/kokkos_complex_serialize.h | 4 ++-- src/checkpoint/container/kokkos_pair_serialize.h | 4 ++-- .../container/kokkos_unordered_map_serialize.h | 4 ++-- src/checkpoint/container/view_equality.h | 4 ++-- src/checkpoint/container/view_serialize.h | 8 ++++---- src/checkpoint/container/view_traits_extract.h | 4 ++-- src/checkpoint/container/view_traverse_manual.h | 4 ++-- src/checkpoint/container/view_traverse_ndim.h | 4 ++-- tests/unit/main.cc | 6 +++--- tests/unit/test_commons.h | 4 ++-- tests/unit/test_footprinter.cc | 4 ++-- tests/unit/test_kokkos_integration_commons.h | 10 +++++----- tests/unit/test_kokkos_serialize_0d.cc | 2 +- tests/unit/test_kokkos_serialize_1d.cc | 2 +- tests/unit/test_kokkos_serialize_2d.cc | 2 +- tests/unit/test_kokkos_serialize_3d_left.cc | 2 +- tests/unit/test_kokkos_serialize_3d_right.cc | 2 +- tests/unit/test_kokkos_serialize_3d_stride.cc | 2 +- tests/unit/test_kokkos_serialize_complex.cc | 4 ++-- tests/unit/test_kokkos_serialize_dynrankview.cc | 2 +- tests/unit/test_kokkos_serialize_integration.cc | 2 +- tests/unit/test_kokkos_serialize_nd.cc | 2 +- tests/unit/test_kokkos_serialize_pair.cc | 4 ++-- tests/unit/test_kokkos_serialize_special.cc | 2 +- tests/unit/test_kokkos_serialize_unordered_map.cc | 4 ++-- tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc | 2 +- tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_left.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_right.cc | 2 +- .../tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_left.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_right.cc | 2 +- .../tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc | 2 +- .../tests_mpi/test_kokkos_serialize_integration_mpi.cc | 2 +- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index afccbeda..c3205d9a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ if (${kokkos_DIR_FOUND}) endif() target_compile_definitions( ${CHECKPOINT_LIBRARY} PUBLIC - MAGISTRATE_ENABLED_KOKKOS=1 MAGISTRATE_ENABLED_KOKKOS_KERNELS=${KERNELS} + MAGISTRATE_KOKKOS_ENABLED=1 MAGISTRATE_KOKKOS_KERNELS_ENABLED=${KERNELS} ) message(STATUS "Checkpoint: Kokkos enabled") target_link_libraries(${CHECKPOINT_LIBRARY} PUBLIC Kokkos::kokkos) diff --git a/src/checkpoint/container/kokkos_complex_serialize.h b/src/checkpoint/container/kokkos_complex_serialize.h index c88256d9..326a0375 100644 --- a/src/checkpoint/container/kokkos_complex_serialize.h +++ b/src/checkpoint/container/kokkos_complex_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include @@ -65,6 +65,6 @@ void serialize(SerializerT& s, Kokkos::complex& complex) } // namespace checkpoint -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_COMPLEX_SERIALIZE_H*/ diff --git a/src/checkpoint/container/kokkos_pair_serialize.h b/src/checkpoint/container/kokkos_pair_serialize.h index 5708ceaf..109e67fb 100644 --- a/src/checkpoint/container/kokkos_pair_serialize.h +++ b/src/checkpoint/container/kokkos_pair_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include @@ -71,6 +71,6 @@ void serialize(SerializerT& s, Kokkos::pair& pair) } // namespace checkpoint -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_PAIR_SERIALIZE_H*/ diff --git a/src/checkpoint/container/kokkos_unordered_map_serialize.h b/src/checkpoint/container/kokkos_unordered_map_serialize.h index 4a74b56b..aba6eafb 100644 --- a/src/checkpoint/container/kokkos_unordered_map_serialize.h +++ b/src/checkpoint/container/kokkos_unordered_map_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/dispatch/dispatch.h" #include "checkpoint/dispatch/reconstructor.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include @@ -156,6 +156,6 @@ typename std::enable_if_t< } // namespace checkpoint -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_KOKKOS_UNORDERED_MAP_SERIALIZE_H*/ diff --git a/src/checkpoint/container/view_equality.h b/src/checkpoint/container/view_equality.h index 8bc8b200..b90842f8 100644 --- a/src/checkpoint/container/view_equality.h +++ b/src/checkpoint/container/view_equality.h @@ -50,7 +50,7 @@ #include "checkpoint/container/view_traverse_manual.h" #include "checkpoint/container/view_traverse_ndim.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -344,6 +344,6 @@ struct ViewEquality { } /* end namespace checkpoint */ -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_EQUALITY_H*/ diff --git a/src/checkpoint/container/view_serialize.h b/src/checkpoint/container/view_serialize.h index ebc4dc1d..e1d1f61a 100644 --- a/src/checkpoint/container/view_serialize.h +++ b/src/checkpoint/container/view_serialize.h @@ -50,7 +50,7 @@ #include "checkpoint/container/view_traverse_manual.h" #include "checkpoint/container/view_traverse_ndim.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -62,7 +62,7 @@ #define CHECKPOINT_KOKKOS_WITHOUTINIT #endif -#if MAGISTRATE_ENABLED_KOKKOS_KERNELS +#if MAGISTRATE_KOKKOS_KERNELS_ENABLED #include #include #endif @@ -588,7 +588,7 @@ void serializeContentsOnly(SerializerT& s, Kokkos::View& v) { deepCopyWithLocalFence(v, values); } -#if MAGISTRATE_ENABLED_KOKKOS_KERNELS +#if MAGISTRATE_KOKKOS_KERNELS_ENABLED template< typename Serializer, typename T, typename... Ts > inline void serialize( Serializer &s, Kokkos::StaticCrsGraph &graph ) { s | graph.entries | graph.row_map | graph.row_block_offsets; @@ -611,6 +611,6 @@ inline void serialize( Serializer &s, KokkosSparse::CrsMatrix &matrix } /* end namespace checkpoint */ -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_SERIALIZE_H*/ diff --git a/src/checkpoint/container/view_traits_extract.h b/src/checkpoint/container/view_traits_extract.h index a9b5de0c..63a37c6f 100644 --- a/src/checkpoint/container/view_traits_extract.h +++ b/src/checkpoint/container/view_traits_extract.h @@ -47,7 +47,7 @@ #include "checkpoint/common.h" #include "checkpoint/serializers/serializers_headers.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -117,6 +117,6 @@ struct CountDims { } /* end namespace checkpoint */ -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAITS_EXTRACT_H*/ diff --git a/src/checkpoint/container/view_traverse_manual.h b/src/checkpoint/container/view_traverse_manual.h index 77eae1f3..5dd8f07f 100644 --- a/src/checkpoint/container/view_traverse_manual.h +++ b/src/checkpoint/container/view_traverse_manual.h @@ -48,7 +48,7 @@ #include "checkpoint/serializers/serializers_headers.h" #include "checkpoint/container/view_traits_extract.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -345,6 +345,6 @@ struct TraverseManual { } /* end namespace checkpoint */ -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAVERSE_MANUAL_H*/ diff --git a/src/checkpoint/container/view_traverse_ndim.h b/src/checkpoint/container/view_traverse_ndim.h index cb42fe88..d41d6ce5 100644 --- a/src/checkpoint/container/view_traverse_ndim.h +++ b/src/checkpoint/container/view_traverse_ndim.h @@ -48,7 +48,7 @@ #include "checkpoint/serializers/serializers_headers.h" #include "checkpoint/container/view_traits_extract.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -274,6 +274,6 @@ struct TraverseRecursive { } /* end namespace checkpoint */ -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ #endif /*INCLUDED_CHECKPOINT_CONTAINER_VIEW_TRAVERSE_NDIM_H*/ diff --git a/tests/unit/main.cc b/tests/unit/main.cc index 52dd2ac4..a6215806 100644 --- a/tests/unit/main.cc +++ b/tests/unit/main.cc @@ -50,7 +50,7 @@ #endif #include "test_harness.h" -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #endif @@ -72,14 +72,14 @@ int main(int argc, char **argv) { int ret = 0; { -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED Kokkos::initialize(); #endif checkpoint::tests::unit::TestHarness::store_cmdline_args(argc, argv); ret = RUN_ALL_TESTS(); -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED Kokkos::finalize(); #endif } diff --git a/tests/unit/test_commons.h b/tests/unit/test_commons.h index 36ef661a..c8df5aa8 100644 --- a/tests/unit/test_commons.h +++ b/tests/unit/test_commons.h @@ -49,7 +49,7 @@ #include #include -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include #include @@ -88,7 +88,7 @@ static void compareBasic(ViewT const& k1, ViewT const& k2) { EqualityType::template compareMeta(k1,k2); } -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED template struct KokkosViewTest : ::testing::TestWithParam { }; #endif diff --git a/tests/unit/test_footprinter.cc b/tests/unit/test_footprinter.cc index f5e52feb..4cfc1af2 100644 --- a/tests/unit/test_footprinter.cc +++ b/tests/unit/test_footprinter.cc @@ -634,7 +634,7 @@ TEST_F(TestFootprinter, test_no_serialize) { ); } -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED TEST_F(TestFootprinter, test_kokkos_unordered_map) { // empty map { @@ -698,6 +698,6 @@ TEST_F(TestFootprinter, test_kokkos_complex) { } -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ }}} // end namespace checkpoint::tests::unit diff --git a/tests/unit/test_kokkos_integration_commons.h b/tests/unit/test_kokkos_integration_commons.h index 0a37e075..8fd46db6 100644 --- a/tests/unit/test_kokkos_integration_commons.h +++ b/tests/unit/test_kokkos_integration_commons.h @@ -78,7 +78,7 @@ struct Data : BaseData { using Kokkos_ViewType2 = ::Kokkos::View; using Kokkos_ViewType3 = ::Kokkos::View; using Kokkos_ViewType4 = ::Kokkos::View; - #if MAGISTRATE_ENABLED_KOKKOS_KERNELS + #if MAGISTRATE_KOKKOS_KERNELS_ENABLED using Kokkos_CrsType = ::Kokkos::StaticCrsGraph; using Kokkos_CrsMatrix = ::KokkosSparse::CrsMatrix; #endif @@ -122,7 +122,7 @@ struct Data : BaseData { v3 = v3_tmp; v4 = v4_tmp; - #if MAGISTRATE_ENABLED_KOKKOS_KERNELS + #if MAGISTRATE_KOKKOS_KERNELS_ENABLED std::vector< std::vector< int > > graph( d1_a ); for ( size_t i = 0 ; i < d1_a; ++i ) { @@ -207,7 +207,7 @@ struct Data : BaseData { EXPECT_EQ(in.v4.operator()(i,1), v4val(i,1)); } - #if MAGISTRATE_ENABLED_KOKKOS_KERNELS + #if MAGISTRATE_KOKKOS_KERNELS_ENABLED std::vector< std::vector< int > > graph( d1_a ); for ( size_t i = 0 ; i < d1_a; ++i ) { @@ -251,7 +251,7 @@ struct Data : BaseData { s | vec; s | val1 | val2; s | v0 | v1 | v2 | v3 | v4; - #if MAGISTRATE_ENABLED_KOKKOS_KERNELS + #if MAGISTRATE_KOKKOS_KERNELS_ENABLED s | crs; s | crs_mat; #endif @@ -265,7 +265,7 @@ struct Data : BaseData { Kokkos_ViewType2 v2; Kokkos_ViewType3 v3; Kokkos_ViewType4 v4; - #if MAGISTRATE_ENABLED_KOKKOS_KERNELS + #if MAGISTRATE_KOKKOS_KERNELS_ENABLED Kokkos_CrsType crs; Kokkos_CrsMatrix crs_mat; #endif diff --git a/tests/unit/test_kokkos_serialize_0d.cc b/tests/unit/test_kokkos_serialize_0d.cc index a75d260e..55cda235 100644 --- a/tests/unit/test_kokkos_serialize_0d.cc +++ b/tests/unit/test_kokkos_serialize_0d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_1d.cc b/tests/unit/test_kokkos_serialize_1d.cc index 3117dbe0..6e3f7366 100644 --- a/tests/unit/test_kokkos_serialize_1d.cc +++ b/tests/unit/test_kokkos_serialize_1d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_commons.h" #include "test_kokkos_1d_commons.h" diff --git a/tests/unit/test_kokkos_serialize_2d.cc b/tests/unit/test_kokkos_serialize_2d.cc index 0606b543..64875af2 100644 --- a/tests/unit/test_kokkos_serialize_2d.cc +++ b/tests/unit/test_kokkos_serialize_2d.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_left.cc b/tests/unit/test_kokkos_serialize_3d_left.cc index ae952dd8..cdedb459 100644 --- a/tests/unit/test_kokkos_serialize_3d_left.cc +++ b/tests/unit/test_kokkos_serialize_3d_left.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_right.cc b/tests/unit/test_kokkos_serialize_3d_right.cc index cb5ce868..78526ad7 100644 --- a/tests/unit/test_kokkos_serialize_3d_right.cc +++ b/tests/unit/test_kokkos_serialize_3d_right.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_3d_stride.cc b/tests/unit/test_kokkos_serialize_3d_stride.cc index 18063070..3dd3d6f1 100644 --- a/tests/unit/test_kokkos_serialize_3d_stride.cc +++ b/tests/unit/test_kokkos_serialize_3d_stride.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_complex.cc b/tests/unit/test_kokkos_serialize_complex.cc index 8e580fa8..69fcd7ad 100644 --- a/tests/unit/test_kokkos_serialize_complex.cc +++ b/tests/unit/test_kokkos_serialize_complex.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_commons.h" @@ -76,4 +76,4 @@ TEST_F(KokkosComplexTest, test_kokkos_complex) { }}} // namespace checkpoint::tests::unit -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ diff --git a/tests/unit/test_kokkos_serialize_dynrankview.cc b/tests/unit/test_kokkos_serialize_dynrankview.cc index 9d63ed33..a7237afb 100644 --- a/tests/unit/test_kokkos_serialize_dynrankview.cc +++ b/tests/unit/test_kokkos_serialize_dynrankview.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_commons.h" #include "test_harness.h" diff --git a/tests/unit/test_kokkos_serialize_integration.cc b/tests/unit/test_kokkos_serialize_integration.cc index 7a26c456..8c444d77 100644 --- a/tests/unit/test_kokkos_serialize_integration.cc +++ b/tests/unit/test_kokkos_serialize_integration.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_nd.cc b/tests/unit/test_kokkos_serialize_nd.cc index 045ff397..c82b9211 100644 --- a/tests/unit/test_kokkos_serialize_nd.cc +++ b/tests/unit/test_kokkos_serialize_nd.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_pair.cc b/tests/unit/test_kokkos_serialize_pair.cc index 22f38276..1857c9df 100644 --- a/tests/unit/test_kokkos_serialize_pair.cc +++ b/tests/unit/test_kokkos_serialize_pair.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_commons.h" @@ -79,4 +79,4 @@ TEST_F(KokkosPairTest, test_kokkos_pair) { }}} // namespace checkpoint::tests::unit -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ diff --git a/tests/unit/test_kokkos_serialize_special.cc b/tests/unit/test_kokkos_serialize_special.cc index 9deb6412..4ab8d407 100644 --- a/tests/unit/test_kokkos_serialize_special.cc +++ b/tests/unit/test_kokkos_serialize_special.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_harness.h" #include "test_commons.h" diff --git a/tests/unit/test_kokkos_serialize_unordered_map.cc b/tests/unit/test_kokkos_serialize_unordered_map.cc index d994e0be..62078377 100644 --- a/tests/unit/test_kokkos_serialize_unordered_map.cc +++ b/tests/unit/test_kokkos_serialize_unordered_map.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_commons.h" @@ -109,4 +109,4 @@ TEST_F(KokkosUnorderedMapTest, test_kokkos_unordered_map) { }}} // namespace checkpoint::tests::unit -#endif /*MAGISTRATE_ENABLED_KOKKOS*/ +#endif /*MAGISTRATE_KOKKOS_ENABLED*/ diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc index 596d5e8c..f23c1b07 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_0d_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_0d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc index 7bd913e7..7d941c5b 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_1d_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_1d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc index d9ebe860..c9de5c01 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_left.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc index 80b9626b..02e39279 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_right.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc index dec5e1b5..12ff1ec8 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_2d_mpi_stride.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_2d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc index ee90901a..5c6c762a 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_left.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc index 5a7e9d15..4e5d1b5d 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_right.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc index 467e7589..c608e607 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_3d_mpi_stride.cc @@ -41,7 +41,7 @@ //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_3d_commons.h" #include "tests_mpi/test_commons_mpi.h" diff --git a/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc b/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc index 931e9ad3..ea22df42 100644 --- a/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc +++ b/tests/unit/tests_mpi/test_kokkos_serialize_integration_mpi.cc @@ -40,7 +40,7 @@ // ***************************************************************************** //@HEADER */ -#if MAGISTRATE_ENABLED_KOKKOS +#if MAGISTRATE_KOKKOS_ENABLED #include "test_kokkos_integration_commons.h" #include "test_kokkos_1d_commons.h"