From d4b30457fb1eee0269a50e67358521ea4c162312 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Santos Date: Mon, 4 Nov 2024 21:16:51 +0100 Subject: [PATCH] chore: fix `include` in CMake & format --- src/KokkosComm/CMakeLists.txt | 2 +- unit_tests/mpi/test_allgather.cpp | 9 ++++++--- unit_tests/mpi/test_alltoall.cpp | 6 ++++-- unit_tests/mpi/test_isendrecv.cpp | 12 ++++++++---- unit_tests/mpi/test_reduce.cpp | 3 ++- unit_tests/mpi/test_sendrecv.cpp | 12 ++++++++---- unit_tests/test_sendrecv.cpp | 9 ++++++--- 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/KokkosComm/CMakeLists.txt b/src/KokkosComm/CMakeLists.txt index 782ab481..7c0b09cc 100644 --- a/src/KokkosComm/CMakeLists.txt +++ b/src/KokkosComm/CMakeLists.txt @@ -82,7 +82,7 @@ if(KOKKOSCOMM_ENABLE_MPI) endif() # --- COMPILE FLAGS --- # -src(CheckCXXCompilerFlag) +include(CheckCXXCompilerFlag) macro(kokkoscomm_check_and_add_compile_options) set(target ${ARGV0}) diff --git a/unit_tests/mpi/test_allgather.cpp b/unit_tests/mpi/test_allgather.cpp index 372995b9..e8449f82 100644 --- a/unit_tests/mpi/test_allgather.cpp +++ b/unit_tests/mpi/test_allgather.cpp @@ -39,12 +39,14 @@ void test_allgather_0d() { Kokkos::View rv("rv", size); // fill send buffer - Kokkos::parallel_for(sv.extent(0), KOKKOS_LAMBDA(const int) { sv() = rank; }); + Kokkos::parallel_for( + sv.extent(0), KOKKOS_LAMBDA(const int) { sv() = rank; }); KokkosComm::mpi::allgather(Kokkos::DefaultExecutionSpace(), sv, rv, MPI_COMM_WORLD); int errs; - Kokkos::parallel_reduce(rv.extent(0), KOKKOS_LAMBDA(const int &src, int &lsum) { lsum += rv(src) != src; }, errs); + Kokkos::parallel_reduce( + rv.extent(0), KOKKOS_LAMBDA(const int &src, int &lsum) { lsum += rv(src) != src; }, errs); EXPECT_EQ(errs, 0); } @@ -62,7 +64,8 @@ void test_allgather_1d_contig() { Kokkos::View rv("rv", size * nContrib); // fill send buffer - Kokkos::parallel_for(sv.extent(0), KOKKOS_LAMBDA(const int i) { sv(i) = rank + i; }); + Kokkos::parallel_for( + sv.extent(0), KOKKOS_LAMBDA(const int i) { sv(i) = rank + i; }); KokkosComm::mpi::allgather(Kokkos::DefaultExecutionSpace(), sv, rv, MPI_COMM_WORLD); diff --git a/unit_tests/mpi/test_alltoall.cpp b/unit_tests/mpi/test_alltoall.cpp index a4ef4b8a..f9e1c2e4 100644 --- a/unit_tests/mpi/test_alltoall.cpp +++ b/unit_tests/mpi/test_alltoall.cpp @@ -41,7 +41,8 @@ void test_alltoall_1d_contig() { Kokkos::View rv("rv", size * nContrib); // fill send buffer - Kokkos::parallel_for(sv.extent(0), KOKKOS_LAMBDA(const int i) { sv(i) = rank + i; }); + Kokkos::parallel_for( + sv.extent(0), KOKKOS_LAMBDA(const int i) { sv(i) = rank + i; }); KokkosComm::Impl::alltoall(Kokkos::DefaultExecutionSpace(), sv, nContrib, rv, nContrib, MPI_COMM_WORLD); @@ -70,7 +71,8 @@ void test_alltoall_1d_inplace_contig() { Kokkos::View rv("rv", size * nContrib); // fill send buffer - Kokkos::parallel_for(rv.extent(0), KOKKOS_LAMBDA(const int i) { rv(i) = rank + i; }); + Kokkos::parallel_for( + rv.extent(0), KOKKOS_LAMBDA(const int i) { rv(i) = rank + i; }); KokkosComm::Impl::alltoall(Kokkos::DefaultExecutionSpace(), rv, nContrib, MPI_COMM_WORLD); diff --git a/unit_tests/mpi/test_isendrecv.cpp b/unit_tests/mpi/test_isendrecv.cpp index 4994e986..576c2c2d 100644 --- a/unit_tests/mpi/test_isendrecv.cpp +++ b/unit_tests/mpi/test_isendrecv.cpp @@ -49,14 +49,16 @@ void isend_comm_mode_1d_contig() { if (0 == h.rank()) { int dst = 1; - Kokkos::parallel_for(a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); + Kokkos::parallel_for( + a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); KokkosComm::Req req = KokkosComm::mpi::isend(h, a, dst, 0, IsendMode{}); KokkosComm::wait(req); } else if (1 == h.rank()) { int src = 0; KokkosComm::mpi::recv(h.space(), a, src, 0, h.mpi_comm()); int errs; - Kokkos::parallel_reduce(a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); + Kokkos::parallel_reduce( + a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); ASSERT_EQ(errs, 0); } } @@ -78,14 +80,16 @@ void isend_comm_mode_1d_noncontig() { if (0 == h.rank()) { int dst = 1; - Kokkos::parallel_for(a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); + Kokkos::parallel_for( + a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); KokkosComm::Req req = KokkosComm::mpi::isend(h, a, dst, 0, IsendMode{}); KokkosComm::wait(req); } else if (1 == h.rank()) { int src = 0; KokkosComm::mpi::recv(h.space(), a, src, 0, h.mpi_comm()); int errs; - Kokkos::parallel_reduce(a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); + Kokkos::parallel_reduce( + a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); ASSERT_EQ(errs, 0); } } diff --git a/unit_tests/mpi/test_reduce.cpp b/unit_tests/mpi/test_reduce.cpp index 289f74db..501b13ad 100644 --- a/unit_tests/mpi/test_reduce.cpp +++ b/unit_tests/mpi/test_reduce.cpp @@ -47,7 +47,8 @@ void test_reduce_1d_contig() { } // fill send buffer - Kokkos::parallel_for(sendv.extent(0), KOKKOS_LAMBDA(const int i) { sendv(i) = rank + i; }); + Kokkos::parallel_for( + sendv.extent(0), KOKKOS_LAMBDA(const int i) { sendv(i) = rank + i; }); KokkosComm::mpi::reduce(Kokkos::DefaultExecutionSpace(), sendv, recvv, MPI_SUM, 0, MPI_COMM_WORLD); diff --git a/unit_tests/mpi/test_sendrecv.cpp b/unit_tests/mpi/test_sendrecv.cpp index 1bcb78e0..787bbe75 100644 --- a/unit_tests/mpi/test_sendrecv.cpp +++ b/unit_tests/mpi/test_sendrecv.cpp @@ -50,13 +50,15 @@ void send_comm_mode_1d_contig() { if (0 == rank) { int dst = 1; - Kokkos::parallel_for(a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); + Kokkos::parallel_for( + a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); KokkosComm::mpi::send(Kokkos::DefaultExecutionSpace(), a, dst, 0, MPI_COMM_WORLD, SendMode{}); } else if (1 == rank) { int src = 0; KokkosComm::mpi::recv(Kokkos::DefaultExecutionSpace(), a, src, 0, MPI_COMM_WORLD); int errs; - Kokkos::parallel_reduce(a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != i; }, errs); + Kokkos::parallel_reduce( + a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != i; }, errs); ASSERT_EQ(errs, 0); } } @@ -76,13 +78,15 @@ void send_comm_mode_1d_noncontig() { if (0 == rank) { int dst = 1; - Kokkos::parallel_for(a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); + Kokkos::parallel_for( + a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); KokkosComm::mpi::send(Kokkos::DefaultExecutionSpace(), a, dst, 0, MPI_COMM_WORLD, SendMode{}); } else if (1 == rank) { int src = 0; KokkosComm::mpi::recv(Kokkos::DefaultExecutionSpace(), a, src, 0, MPI_COMM_WORLD); int errs; - Kokkos::parallel_reduce(a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != i; }, errs); + Kokkos::parallel_reduce( + a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != i; }, errs); ASSERT_EQ(errs, 0); } } diff --git a/unit_tests/test_sendrecv.cpp b/unit_tests/test_sendrecv.cpp index 94d94c0a..0c26d9bc 100644 --- a/unit_tests/test_sendrecv.cpp +++ b/unit_tests/test_sendrecv.cpp @@ -43,13 +43,15 @@ void test_1d(const View1D &a) { if (0 == h.rank()) { int dst = 1; - Kokkos::parallel_for(a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); + Kokkos::parallel_for( + a.extent(0), KOKKOS_LAMBDA(const int i) { a(i) = i; }); KokkosComm::wait(KokkosComm::send(h, a, dst)); } else if (1 == h.rank()) { int src = 0; KokkosComm::wait(KokkosComm::recv(h, a, src)); int errs; - Kokkos::parallel_reduce(a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); + Kokkos::parallel_reduce( + a.extent(0), KOKKOS_LAMBDA(const int &i, int &lsum) { lsum += a(i) != Scalar(i); }, errs); ASSERT_EQ(errs, 0); } } @@ -69,7 +71,8 @@ void test_2d(const View2D &a) { if (0 == h.rank()) { int dst = 1; - Kokkos::parallel_for(policy, KOKKOS_LAMBDA(int i, int j) { a(i, j) = i * a.extent(0) + j; }); + Kokkos::parallel_for( + policy, KOKKOS_LAMBDA(int i, int j) { a(i, j) = i * a.extent(0) + j; }); KokkosComm::wait(KokkosComm::send(h, a, dst)); } else if (1 == h.rank()) { int src = 0;