From a2a5590d9560d90c2f996bc25c621fc1bc6d7168 Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Fri, 31 May 2024 17:03:50 -0500 Subject: [PATCH 1/5] ENH: Fix build issue and add tests for CArrayKokkos WIP --- test/CMakeLists.txt | 24 +++++-- test/test_cases/CMakeLists.txt | 15 ++-- test/test_cases/test_CArrayKokkos.cpp | 99 +++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 test/test_cases/test_CArrayKokkos.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dd1cd286..8f7fa4c2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,8 +2,23 @@ cmake_minimum_required(VERSION 3.1.3) project (matartest) +find_package(Matar REQUIRED) + +#------------------------------------------- +# Testing stuff +#------------------------------------------- +if (NOT KOKKOS) + add_subdirectory(googletest) + add_subdirectory(test_cases) + add_executable(test_csr CSRArray.cpp) + target_link_libraries(test_csr matar gtest_main) + add_executable(test_csc CSCArray.cpp) + target_link_libraries(test_csc matar gtest_main) +endif() + if (KOKKOS) find_package(Kokkos REQUIRED) #new + add_definitions(-DHAVE_KOKKOS=1) if (CUDA) add_definitions(-DHAVE_CUDA=1) @@ -14,16 +29,13 @@ if (KOKKOS) elseif (THREADS) add_definitions(-DHAVE_THREADS=1) endif() -endif() -#------------------------------------------- -# Testing stuff -#------------------------------------------- -if (TEST) add_subdirectory(googletest) add_subdirectory(test_cases) add_executable(test_csr CSRArray.cpp) target_link_libraries(test_csr matar gtest_main) add_executable(test_csc CSCArray.cpp) target_link_libraries(test_csc matar gtest_main) -endif(TEST) + + +endif() diff --git a/test/test_cases/CMakeLists.txt b/test/test_cases/CMakeLists.txt index ec5156ad..74feb6b4 100644 --- a/test/test_cases/CMakeLists.txt +++ b/test/test_cases/CMakeLists.txt @@ -3,16 +3,23 @@ cmake_minimum_required(VERSION 3.1.3) set(This mater_test) set(Sources - standared_types_tests.cpp + standard_types_tests.cpp ) add_executable(${This} ${Sources}) - target_link_libraries(${This} matar gtest_main ) + + + +add_executable(test_CArrayKokkos test_CArrayKokkos.cpp) +target_link_libraries(test_CArrayKokkos matar gtest_main) + + if (KOKKOKS) - target_link_libraries(${This} Kokkos::kokkos) -endif (KOKKOS) + target_link_libraries(${This} Kokkos::kokkos) + target_link_libraries(test_CArrayKokkos Kokkos::kokkos) +endif() diff --git a/test/test_cases/test_CArrayKokkos.cpp b/test/test_cases/test_CArrayKokkos.cpp new file mode 100644 index 00000000..a502b8c9 --- /dev/null +++ b/test/test_cases/test_CArrayKokkos.cpp @@ -0,0 +1,99 @@ +#include "matar.h" +#include "gtest/gtest.h" +#include + +using namespace mtr; // matar namespace + + +// Test size function +TEST(Test_1D_CArrayKokkos, size) +{ + const int size = 1000; + CArrayKokkos A(size); + + FOR_ALL (i, 0, size, { + A(i) = 1.0; + }); // end parallel for + + EXPECT_EQ(size, A.size()); +} + +// Test extent function +TEST(Test_1D_CArrayKokkos, extent) +{ + const int size = 1000; + CArrayKokkos A(size); + + FOR_ALL (i, 0, size, { + A(i) = 1.0; + }); // end parallel for + + int length = size; + EXPECT_EQ(length, A.extent()); +} + +// Test dims function +TEST(Test_1D_CArrayKokkos, dims) +{ + const int size = 1000; + CArrayKokkos A(size); + + FOR_ALL (i, 0, size, { + A(i) = 1.0; + }); // end parallel for + + int dims = size; + EXPECT_EQ(dims, A.dims(0)); + + // Note: extend to other dims when initialized to zero +} + +// Test order function +TEST(Test_1D_CArrayKokkos, order) +{ + const int size = 1000; + CArrayKokkos A(size); + + FOR_ALL (i, 0, size, { + A(i) = 1.0; + }); // end parallel for + + int order = 1; + EXPECT_EQ(order, A.order()); +} + +// Test pointer function +TEST(Test_1D_CArrayKokkos, pointer) +{ + const int size = 1000; + CArrayKokkos A(size); + + FOR_ALL (i, 0, size, { + A(i) = 1.0; + }); // end parallel for + + auto a = A.get_kokkos_view(); + + EXPECT_EQ(&a[0], A.pointer()); +} + + +int main(int argc, char* argv[]) +{ + + + Kokkos::initialize(argc, argv); + { + + int result = 0; + + testing::InitGoogleTest(&argc, argv); + + result = RUN_ALL_TESTS(); + + return result; + + } + Kokkos::finalize(); + +} From 38461382bab60788827a5f732e52c0967b0bf711 Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Fri, 31 May 2024 17:12:37 -0500 Subject: [PATCH 2/5] ENH: Extending CArrayKokkos tests WIP --- scripts/cmake_build_test.sh | 2 +- test/test_cases/test_CArrayKokkos.cpp | 79 ++++++++++++++++++++------- 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/scripts/cmake_build_test.sh b/scripts/cmake_build_test.sh index 509ae6a6..440cc8ed 100644 --- a/scripts/cmake_build_test.sh +++ b/scripts/cmake_build_test.sh @@ -2,7 +2,7 @@ kokkos_build_type="${1}" -if [ ! -d "${TEST_SOURCE_DIR}/phaseFieldMPI/heffte" ] +if [ ! -d "${TEST_SOURCE_DIR}/googletest" ] then echo "Missing googletest for testing, downloading...." git clone https://github.com/google/googletest.git ${TEST_SOURCE_DIR}/googletest diff --git a/test/test_cases/test_CArrayKokkos.cpp b/test/test_cases/test_CArrayKokkos.cpp index a502b8c9..004c68e1 100644 --- a/test/test_cases/test_CArrayKokkos.cpp +++ b/test/test_cases/test_CArrayKokkos.cpp @@ -4,6 +4,7 @@ using namespace mtr; // matar namespace +// ************ 1D ************ // // Test size function TEST(Test_1D_CArrayKokkos, size) @@ -11,10 +12,6 @@ TEST(Test_1D_CArrayKokkos, size) const int size = 1000; CArrayKokkos A(size); - FOR_ALL (i, 0, size, { - A(i) = 1.0; - }); // end parallel for - EXPECT_EQ(size, A.size()); } @@ -24,10 +21,6 @@ TEST(Test_1D_CArrayKokkos, extent) const int size = 1000; CArrayKokkos A(size); - FOR_ALL (i, 0, size, { - A(i) = 1.0; - }); // end parallel for - int length = size; EXPECT_EQ(length, A.extent()); } @@ -37,10 +30,6 @@ TEST(Test_1D_CArrayKokkos, dims) { const int size = 1000; CArrayKokkos A(size); - - FOR_ALL (i, 0, size, { - A(i) = 1.0; - }); // end parallel for int dims = size; EXPECT_EQ(dims, A.dims(0)); @@ -53,10 +42,6 @@ TEST(Test_1D_CArrayKokkos, order) { const int size = 1000; CArrayKokkos A(size); - - FOR_ALL (i, 0, size, { - A(i) = 1.0; - }); // end parallel for int order = 1; EXPECT_EQ(order, A.order()); @@ -68,9 +53,65 @@ TEST(Test_1D_CArrayKokkos, pointer) const int size = 1000; CArrayKokkos A(size); - FOR_ALL (i, 0, size, { - A(i) = 1.0; - }); // end parallel for + auto a = A.get_kokkos_view(); + + EXPECT_EQ(&a[0], A.pointer()); +} + + +// ************ 2D ************ // + +// Test size function +TEST(Test_2D_CArrayKokkos, size) +{ + const int size0 = 100; + const int size1 = 50; + CArrayKokkos A(size0, size1); + + EXPECT_EQ(size0*size1, A.size()); +} + +// Test extent function +TEST(Test_2D_CArrayKokkos, extent) +{ + const int size0 = 100; + const int size1 = 50; + CArrayKokkos A(size0, size1); + + int length = size0*size1; + EXPECT_EQ(length, A.extent()); +} + +// Test dims function +TEST(Test_2D_CArrayKokkos, dims) +{ + const int size0 = 100; + const int size1 = 50; + CArrayKokkos A(size0, size1); + + int dims0 = size0; + int dims1 = size1; + EXPECT_EQ(dims0, A.dims(0)); + EXPECT_EQ(dims1, A.dims(1)); + + // Note: extend to other dims when initialized to zero +} + +// Test order function +TEST(Test_2D_CArrayKokkos, order) +{ + const int size = 100; + CArrayKokkos A(size, size); + + int order = 2; + EXPECT_EQ(order, A.order()); +} + +// Test pointer function +TEST(Test_2D_CArrayKokkos, pointer) +{ + const int size = 100; + CArrayKokkos A(size, size); auto a = A.get_kokkos_view(); From 132ff6affec6661cd5308e3d69e711605588c18d Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Tue, 4 Jun 2024 15:05:37 -0500 Subject: [PATCH 3/5] ENH: Make test dimension independent --- test/test_cases/test_CArrayKokkos.cpp | 197 ++++++++++++++++---------- 1 file changed, 125 insertions(+), 72 deletions(-) diff --git a/test/test_cases/test_CArrayKokkos.cpp b/test/test_cases/test_CArrayKokkos.cpp index 004c68e1..becf2589 100644 --- a/test/test_cases/test_CArrayKokkos.cpp +++ b/test/test_cases/test_CArrayKokkos.cpp @@ -4,118 +4,171 @@ using namespace mtr; // matar namespace -// ************ 1D ************ // + + +CArrayKokkos return_CArrayKokkos(int dims, std::vector sizes) +{ + + CArrayKokkos A; + + if(dims == 1){ + A = CArrayKokkos(sizes[0], "A_1D_CArrayKokkos"); + } + else if(dims == 2){ + A = CArrayKokkos(sizes[0], sizes[1], "A_2D_CArrayKokkos"); + } + else if(dims == 3){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], "A_3D_CArrayKokkos"); + } + else if(dims == 4){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], "A_4D_CArrayKokkos"); + } + else if(dims == 5){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], "A_5D_CArrayKokkos"); + } + else if(dims == 6){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], "A_7D_CArrayKokkos"); + } + else if(dims == 7){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], sizes[6], "A_7D_CArrayKokkos"); + } + else{ + std::cout<<"Dims must be between 1 and 7 for CArrayKokkos" << std::endl; + } + return A; +} // Test size function -TEST(Test_1D_CArrayKokkos, size) +TEST(Test_CArrayKokkos, size) { - const int size = 1000; - CArrayKokkos A(size); + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data + + for(int i = 0; i < 7; i++){ - EXPECT_EQ(size, A.size()); + int dims = i+1; + + sizes.push_back(dims*2); + + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + val*= dims*2; + + EXPECT_EQ(val, A.size()); + } } + // Test extent function -TEST(Test_1D_CArrayKokkos, extent) +TEST(Test_CArrayKokkos, extent) { - const int size = 1000; - CArrayKokkos A(size); + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data + + for(int i = 0; i < 7; i++){ + + int dims = i+1; - int length = size; - EXPECT_EQ(length, A.extent()); + sizes.push_back(dims*2); + + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + val*= dims*2; + + EXPECT_EQ(val, A.extent()); + } } // Test dims function -TEST(Test_1D_CArrayKokkos, dims) +TEST(Test_CArrayKokkos, dims) { - const int size = 1000; - CArrayKokkos A(size); - - int dims = size; - EXPECT_EQ(dims, A.dims(0)); // Note: extend to other dims when initialized to zero + + std::vector sizes; + for(int i = 0; i < 7; i++){ + + int dims = i+1; + + sizes.push_back(dims*2); + + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + + EXPECT_EQ(sizes[i], A.dims(i)); + } } // Test order function -TEST(Test_1D_CArrayKokkos, order) +TEST(Test_CArrayKokkos, order) { - const int size = 1000; - CArrayKokkos A(size); - - int order = 1; - EXPECT_EQ(order, A.order()); + std::vector sizes; + for(int i = 0; i < 7; i++){ + + int dims = i+1; + sizes.push_back(dims*2); + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + EXPECT_EQ(dims, A.order()); + } } -// Test pointer function -TEST(Test_1D_CArrayKokkos, pointer) + +// Test order function +TEST(Test_CArrayKokkos, pointer) { - const int size = 1000; - CArrayKokkos A(size); + std::vector sizes; + for(int i = 0; i < 7; i++){ - auto a = A.get_kokkos_view(); + int dims = i+1; + sizes.push_back(dims*2); + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + auto a = A.get_kokkos_view(); - EXPECT_EQ(&a[0], A.pointer()); + EXPECT_EQ(&a[0], A.pointer()); + } } - -// ************ 2D ************ // - -// Test size function -TEST(Test_2D_CArrayKokkos, size) +// Add test for late initialization +TEST(Test_CArrayKokkos, late_init) { - const int size0 = 100; - const int size1 = 50; - CArrayKokkos A(size0, size1); + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data - EXPECT_EQ(size0*size1, A.size()); -} + CArrayKokkos A; -// Test extent function -TEST(Test_2D_CArrayKokkos, extent) -{ - const int size0 = 100; - const int size1 = 50; - CArrayKokkos A(size0, size1); + for(int i = 0; i < 7; i++){ - int length = size0*size1; - EXPECT_EQ(length, A.extent()); -} + int dims = i+1; -// Test dims function -TEST(Test_2D_CArrayKokkos, dims) -{ - const int size0 = 100; - const int size1 = 50; - CArrayKokkos A(size0, size1); - - int dims0 = size0; - int dims1 = size1; - EXPECT_EQ(dims0, A.dims(0)); - EXPECT_EQ(dims1, A.dims(1)); + sizes.push_back(dims*2); - // Note: extend to other dims when initialized to zero -} + A = return_CArrayKokkos(dims, sizes); + val*= dims*2; -// Test order function -TEST(Test_2D_CArrayKokkos, order) -{ - const int size = 100; - CArrayKokkos A(size, size); - - int order = 2; - EXPECT_EQ(order, A.order()); + EXPECT_EQ(val, A.size()); + } } -// Test pointer function -TEST(Test_2D_CArrayKokkos, pointer) + +// Add test for operator = overload +TEST(Test_CArrayKokkos, eq_overload) { const int size = 100; CArrayKokkos A(size, size); - auto a = A.get_kokkos_view(); + CArrayKokkos B(size, size); + + for(int i = 0; i < size; i++){ + for(int j = 0; j < size; j++){ + A(i,j) = (double)i + (double)j; + } + } - EXPECT_EQ(&a[0], A.pointer()); + B = A; + + for(int i = 0; i < size; i++){ + for(int j = 0; j < size; j++){ + + EXPECT_EQ(B(i,j), (double)i + (double)j); + } + } } From e300e4cd03eda40d0ddc8c122eac4ae34f65501c Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Tue, 4 Jun 2024 15:08:19 -0500 Subject: [PATCH 4/5] STYLE: Convert tabs to spaces --- test/test_cases/test_CArrayKokkos.cpp | 200 +++++++++++++------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/test/test_cases/test_CArrayKokkos.cpp b/test/test_cases/test_CArrayKokkos.cpp index becf2589..2dcbae6b 100644 --- a/test/test_cases/test_CArrayKokkos.cpp +++ b/test/test_cases/test_CArrayKokkos.cpp @@ -9,166 +9,166 @@ using namespace mtr; // matar namespace CArrayKokkos return_CArrayKokkos(int dims, std::vector sizes) { - CArrayKokkos A; - - if(dims == 1){ - A = CArrayKokkos(sizes[0], "A_1D_CArrayKokkos"); - } - else if(dims == 2){ - A = CArrayKokkos(sizes[0], sizes[1], "A_2D_CArrayKokkos"); - } - else if(dims == 3){ - A = CArrayKokkos(sizes[0], sizes[1], sizes[2], "A_3D_CArrayKokkos"); - } - else if(dims == 4){ - A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], "A_4D_CArrayKokkos"); - } - else if(dims == 5){ - A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], "A_5D_CArrayKokkos"); - } - else if(dims == 6){ - A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], "A_7D_CArrayKokkos"); - } - else if(dims == 7){ - A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], sizes[6], "A_7D_CArrayKokkos"); - } - else{ - std::cout<<"Dims must be between 1 and 7 for CArrayKokkos" << std::endl; - } - return A; + CArrayKokkos A; + + if(dims == 1){ + A = CArrayKokkos(sizes[0], "A_1D_CArrayKokkos"); + } + else if(dims == 2){ + A = CArrayKokkos(sizes[0], sizes[1], "A_2D_CArrayKokkos"); + } + else if(dims == 3){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], "A_3D_CArrayKokkos"); + } + else if(dims == 4){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], "A_4D_CArrayKokkos"); + } + else if(dims == 5){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], "A_5D_CArrayKokkos"); + } + else if(dims == 6){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], "A_7D_CArrayKokkos"); + } + else if(dims == 7){ + A = CArrayKokkos(sizes[0], sizes[1], sizes[2], sizes[3], sizes[4], sizes[5], sizes[6], "A_7D_CArrayKokkos"); + } + else{ + std::cout<<"Dims must be between 1 and 7 for CArrayKokkos" << std::endl; + } + return A; } // Test size function TEST(Test_CArrayKokkos, size) { - std::vector sizes; // Size of each dimension - int val = 1; // Expected total length of data + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data - for(int i = 0; i < 7; i++){ + for(int i = 0; i < 7; i++){ - int dims = i+1; + int dims = i+1; - sizes.push_back(dims*2); + sizes.push_back(dims*2); - CArrayKokkos A = return_CArrayKokkos(dims, sizes); - val*= dims*2; + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + val*= dims*2; - EXPECT_EQ(val, A.size()); - } + EXPECT_EQ(val, A.size()); + } } // Test extent function TEST(Test_CArrayKokkos, extent) { - std::vector sizes; // Size of each dimension - int val = 1; // Expected total length of data + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data - for(int i = 0; i < 7; i++){ + for(int i = 0; i < 7; i++){ - int dims = i+1; + int dims = i+1; - sizes.push_back(dims*2); + sizes.push_back(dims*2); - CArrayKokkos A = return_CArrayKokkos(dims, sizes); - val*= dims*2; + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + val*= dims*2; - EXPECT_EQ(val, A.extent()); - } + EXPECT_EQ(val, A.extent()); + } } // Test dims function TEST(Test_CArrayKokkos, dims) { - // Note: extend to other dims when initialized to zero + // Note: extend to other dims when initialized to zero - std::vector sizes; - for(int i = 0; i < 7; i++){ + std::vector sizes; + for(int i = 0; i < 7; i++){ - int dims = i+1; + int dims = i+1; - sizes.push_back(dims*2); + sizes.push_back(dims*2); - CArrayKokkos A = return_CArrayKokkos(dims, sizes); + CArrayKokkos A = return_CArrayKokkos(dims, sizes); - EXPECT_EQ(sizes[i], A.dims(i)); - } + EXPECT_EQ(sizes[i], A.dims(i)); + } } // Test order function TEST(Test_CArrayKokkos, order) { - std::vector sizes; - for(int i = 0; i < 7; i++){ - - int dims = i+1; - sizes.push_back(dims*2); - CArrayKokkos A = return_CArrayKokkos(dims, sizes); - EXPECT_EQ(dims, A.order()); - } + std::vector sizes; + for(int i = 0; i < 7; i++){ + + int dims = i+1; + sizes.push_back(dims*2); + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + EXPECT_EQ(dims, A.order()); + } } // Test order function TEST(Test_CArrayKokkos, pointer) { - std::vector sizes; - for(int i = 0; i < 7; i++){ + std::vector sizes; + for(int i = 0; i < 7; i++){ - int dims = i+1; - sizes.push_back(dims*2); - CArrayKokkos A = return_CArrayKokkos(dims, sizes); - auto a = A.get_kokkos_view(); + int dims = i+1; + sizes.push_back(dims*2); + CArrayKokkos A = return_CArrayKokkos(dims, sizes); + auto a = A.get_kokkos_view(); - EXPECT_EQ(&a[0], A.pointer()); - } + EXPECT_EQ(&a[0], A.pointer()); + } } // Add test for late initialization TEST(Test_CArrayKokkos, late_init) { - std::vector sizes; // Size of each dimension - int val = 1; // Expected total length of data + std::vector sizes; // Size of each dimension + int val = 1; // Expected total length of data - CArrayKokkos A; + CArrayKokkos A; - for(int i = 0; i < 7; i++){ + for(int i = 0; i < 7; i++){ - int dims = i+1; + int dims = i+1; - sizes.push_back(dims*2); + sizes.push_back(dims*2); - A = return_CArrayKokkos(dims, sizes); - val*= dims*2; + A = return_CArrayKokkos(dims, sizes); + val*= dims*2; - EXPECT_EQ(val, A.size()); - } + EXPECT_EQ(val, A.size()); + } } // Add test for operator = overload TEST(Test_CArrayKokkos, eq_overload) { - const int size = 100; - CArrayKokkos A(size, size); + const int size = 100; + CArrayKokkos A(size, size); - CArrayKokkos B(size, size); + CArrayKokkos B(size, size); - for(int i = 0; i < size; i++){ - for(int j = 0; j < size; j++){ - A(i,j) = (double)i + (double)j; - } - } + for(int i = 0; i < size; i++){ + for(int j = 0; j < size; j++){ + A(i,j) = (double)i + (double)j; + } + } - B = A; + B = A; - for(int i = 0; i < size; i++){ - for(int j = 0; j < size; j++){ + for(int i = 0; i < size; i++){ + for(int j = 0; j < size; j++){ - EXPECT_EQ(B(i,j), (double)i + (double)j); - } - } + EXPECT_EQ(B(i,j), (double)i + (double)j); + } + } } @@ -176,18 +176,18 @@ int main(int argc, char* argv[]) { - Kokkos::initialize(argc, argv); + Kokkos::initialize(argc, argv); { - int result = 0; + int result = 0; - testing::InitGoogleTest(&argc, argv); + testing::InitGoogleTest(&argc, argv); - result = RUN_ALL_TESTS(); + result = RUN_ALL_TESTS(); - return result; + return result; - } - Kokkos::finalize(); + } + Kokkos::finalize(); } From 4dd6af47daedcf3750db7e08355bd82f4b4571de Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Tue, 4 Jun 2024 15:09:39 -0500 Subject: [PATCH 5/5] STYLE: Tidy up --- test/test_cases/test_CArrayKokkos.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/test_cases/test_CArrayKokkos.cpp b/test/test_cases/test_CArrayKokkos.cpp index 2dcbae6b..845c8465 100644 --- a/test/test_cases/test_CArrayKokkos.cpp +++ b/test/test_cases/test_CArrayKokkos.cpp @@ -4,8 +4,6 @@ using namespace mtr; // matar namespace - - CArrayKokkos return_CArrayKokkos(int dims, std::vector sizes) { @@ -174,20 +172,12 @@ TEST(Test_CArrayKokkos, eq_overload) int main(int argc, char* argv[]) { - - Kokkos::initialize(argc, argv); { - int result = 0; - testing::InitGoogleTest(&argc, argv); - result = RUN_ALL_TESTS(); - return result; - } Kokkos::finalize(); - }