From 2f7318d205a85503fc7e8e4bd1bc71dea56b456c Mon Sep 17 00:00:00 2001 From: hgangwar Date: Mon, 13 Jul 2026 12:10:51 -0400 Subject: [PATCH 1/2] add_global_comm_header --- src/pcms/coupler/CMakeLists.txt | 1 + src/pcms/coupler/coupler.hpp | 45 ++++++++++++++++++++++++ src/pcms/coupler/global_communicator.h | 48 ++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 src/pcms/coupler/global_communicator.h diff --git a/src/pcms/coupler/CMakeLists.txt b/src/pcms/coupler/CMakeLists.txt index 82afceb3..6a498c62 100644 --- a/src/pcms/coupler/CMakeLists.txt +++ b/src/pcms/coupler/CMakeLists.txt @@ -7,6 +7,7 @@ set(PCMS_COUPLER_HEADERS field_exchange_planner.h partition.h overlap_mask.h + global_communicator.h ) diff --git a/src/pcms/coupler/coupler.hpp b/src/pcms/coupler/coupler.hpp index d2d12cb1..5706d350 100644 --- a/src/pcms/coupler/coupler.hpp +++ b/src/pcms/coupler/coupler.hpp @@ -11,11 +11,47 @@ #include "pcms/utility/assert.h" #include "pcms/utility/common.h" #include "pcms/utility/profile.h" +#include "pcms/coupler/global_communicator.h" #include namespace pcms { +template +class GlobalDataInterface +{ +public: + GlobalDataInterface(const std::string& name, + MPI_Comm mpi_comm, + redev::Channel& channel) + : mpi_comm_(mpi_comm), + type_info_(typeid(T)), + comm_(name, mpi_comm_, channel) + { + PCMS_FUNCTION_TIMER; + } + + void SendData(T* msg, + std::string VarName, + size_t msg_size, + Mode mode = Mode::Synchronous) + { + PCMS_FUNCTION_TIMER; + comm_.Send(msg, std::move(VarName), msg_size, mode); + } + + std::vector ReceiveData(std::string VarName, + size_t msg_size, + Mode mode = Mode::Synchronous) + { + PCMS_FUNCTION_TIMER; + return comm_.Receive(std::move(VarName), msg_size, mode); + } +private: + MPI_Comm mpi_comm_; + const std::type_info& type_info_; + GlobalCommunicator comm_; +}; class Application; template @@ -70,6 +106,8 @@ class Application FieldHandle AddField(std::string name, Field&& field, std::unique_ptr> serializer, bool participates = true); + template + std::unique_ptr> AddData(std::string name, MPI_Comm mpi_comm); void SendField(const std::string& name, redev::Mode mode = redev::Mode::Synchronous) @@ -162,6 +200,13 @@ class Application std::map> layout_overlap_masks_; }; +template +std::unique_ptr> +Application::AddData(std::string name, MPI_Comm mpi_comm) +{ + PCMS_FUNCTION_TIMER; + return std::make_unique>(name, mpi_comm, channel_); +} class Coupler { private: diff --git a/src/pcms/coupler/global_communicator.h b/src/pcms/coupler/global_communicator.h new file mode 100644 index 00000000..b02b2187 --- /dev/null +++ b/src/pcms/coupler/global_communicator.h @@ -0,0 +1,48 @@ +#ifndef PCMS_GLOBAL_COMMUNICATOR_H +#define PCMS_GLOBAL_COMMUNICATOR_H +#include +#include +namespace pcms +{ + using redev::Mode; + template + struct GlobalCommunicator + { + using value_type = T; + public: + GlobalCommunicator(std::string name, MPI_Comm mpi_comm, redev::Channel& channel) + : mpi_comm(mpi_comm), + channel_(channel), + name_(std::move(name)) + { + PCMS_FUNCTION_TIMER; + comm_ = channel_.CreateComm(name_, mpi_comm, redev::CommType::Global ); + } + GlobalCommunicator(const GlobalCommunicator&) = delete; + GlobalCommunicator& operator=(const GlobalCommunicator&) = delete; + GlobalCommunicator(GlobalCommunicator&&)= default; + GlobalCommunicator& operator=(GlobalCommunicator&&) = default; + + void Send(T* msg, std::string VarName, size_t msg_size, Mode mode = Mode::Synchronous) + { + PCMS_FUNCTION_TIMER; + PCMS_ALWAYS_ASSERT(channel_.InSendCommunicationPhase()); + comm_.SetCommParams( VarName, msg_size); + comm_.Send(msg, mode); + } + std::vector Receive(std::string VarName, size_t msg_size, Mode mode = Mode::Synchronous) + { + PCMS_FUNCTION_TIMER; + PCMS_ALWAYS_ASSERT(channel_.InReceiveCommunicationPhase()); + comm_.SetCommParams(VarName, msg_size); + auto data = comm_.Recv(mode); + return data; + } + private: + MPI_Comm mpi_comm; + redev::Channel& channel_; + std::string name_; + redev::BidirectionalComm comm_; + }; +} +#endif // PCMS_GLOBAL_COMMUNICATOR_H \ No newline at end of file From 313df5e4991981dd91f21579fe1e369eccc773d9 Mon Sep 17 00:00:00 2001 From: hgangwar Date: Mon, 13 Jul 2026 12:19:54 -0400 Subject: [PATCH 2/2] add_test_case --- test/CMakeLists.txt | 40 ++++++++++---- test/test_GDI.cpp | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 test/test_GDI.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1c603c45..698e697b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -96,6 +96,37 @@ if(PCMS_ENABLE_OMEGA_H) ${d3d16p} ignored) endif() + add_exe(test_GDI) + tri_mpi_test( + TESTNAME + test_GDI + TIMEOUT + 20 + NAME1 + app + EXE1 + ./test_GDI + PROCS1 + 1 + ARGS1 + 1 + NAME2 + rdv + EXE2 + ./test_GDI + PROCS2 + 1 + ARGS2 + -1 + NAME3 + app + EXE3 + ./test_GDI + PROCS3 + 1 + ARGS3 + 0 + ) set(d3d8p ${PCMS_TEST_DATA_DIR}/d3d/d3d-full_9k_sfc_p8.osh/) add_exe(test_twoClientOverlap) @@ -380,7 +411,6 @@ if(Catch2_FOUND) APPEND PCMS_UNIT_TEST_SOURCES test_error_handling.cpp - test_eqdsk.cpp test_uniform_grid.cpp test_field_evaluation.cpp test_field_interpolation.cpp @@ -401,7 +431,6 @@ if(Catch2_FOUND) test_omega_h_lagrange_field.cpp test_point_evaluator.cpp) endif() - if(PCMS_ENABLE_MESHFIELDS) list(APPEND PCMS_UNIT_TEST_SOURCES test_load_vector.cpp) @@ -426,13 +455,6 @@ if(Catch2_FOUND) target_link_libraries(unit_tests PRIVATE PETSc::PETSc) endif() - target_link_libraries(unit_tests PUBLIC - Catch2::Catch2 - pcms::core - pcms_transfer - pcms_transfer - ) - target_include_directories(unit_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_executable(test_interpolation_on_ltx_mesh test_interpolation_on_ltx_mesh.cpp) diff --git a/test/test_GDI.cpp b/test/test_GDI.cpp new file mode 100644 index 00000000..846404c0 --- /dev/null +++ b/test/test_GDI.cpp @@ -0,0 +1,128 @@ + +#include +#include +#include "test_support.h" +#include "pcms/coupler/coupler.hpp" +#include +static constexpr bool done = true; +static constexpr int COMM_ROUNDS = 1; + +void xgc_delta_f(MPI_Comm comm) +{ + pcms::Coupler coupler("proxy_couple", comm, false, {}); + pcms::Application* app = coupler.AddApplication("proxy_couple_xgc_delta_f"); + + const auto GDI = app->AddData("global_comm", comm); + auto mean = std::vector(1); + mean[0] = 16; + do { + for (int i = 0; i < COMM_ROUNDS; ++i) { + app->BeginSendPhase(); + GDI->SendData(mean.data(), "mean", mean.size()); + app->EndSendPhase(); + printf("delta Sent mean:%d\n", mean[0]); + app->BeginReceivePhase(); + mean = GDI->ReceiveData("mean", mean.size()); + app->EndReceivePhase(); + mean[0] = mean[0]/2; + } + } while (!done); + printf("final Mean = %d\n", mean[0]); + assert(std::fabs(mean[0] - 1.0) < 1e-12); + printf("GDI test successful.\n"); +} +void xgc_total_f(MPI_Comm comm) +{ + pcms::Coupler coupler("proxy_couple", comm, false, {}); + pcms::Application* app = coupler.AddApplication("proxy_couple_xgc_total_f"); + + auto GDI = app->AddData("global_comm", comm); + auto mean = std::vector(1); + do { + for (int i = 0; i < COMM_ROUNDS; ++i) { + app->BeginReceivePhase(); + mean = GDI->ReceiveData("mean", mean.size()); + app->EndReceivePhase(); + printf("total Recieved mean:%d\n", mean[0]); + mean[0] = mean[0]/2; + app->BeginSendPhase(); + GDI->SendData(mean.data(), "mean", mean.size()); + app->EndSendPhase(); + printf("total Sent mean:%d\n", mean[0]); + } + } while (!done); +} +void xgc_coupler(MPI_Comm comm) +{ + // Define Partition + redev::LO dim = 3; + redev::LOs ranks(1); + std::iota(ranks.begin(), ranks.end(), 0); + redev::Reals cuts = {0}; + auto partition = redev::Partition{redev::RCBPtn{dim, ranks, cuts}}; + + pcms::Coupler cpl("proxy_couple", comm, true, + partition); + auto* total_f = cpl.AddApplication("proxy_couple_xgc_total_f"); + auto* delta_f = cpl.AddApplication("proxy_couple_xgc_delta_f"); + + auto GDI_total = total_f->AddData("global_comm", comm); + auto GDI_delta = delta_f->AddData("global_comm", comm); + auto mean = std::vector(1); + do { + for (int i = 0; i < COMM_ROUNDS; ++i) { + delta_f->BeginReceivePhase(); + mean = GDI_delta->ReceiveData("mean", 1); + delta_f->EndReceivePhase(); + printf("delta Received mean:%d\n", mean[0]); + mean[0] = mean[0]/2; + const auto msg_size = mean.size(); + total_f->BeginSendPhase(); + GDI_total->SendData(mean.data(), "mean", msg_size); + total_f->EndSendPhase(); + printf("total sent mean:%d\n", mean[0]); + total_f->BeginReceivePhase(); + mean = GDI_total->ReceiveData("mean", msg_size); + total_f->EndReceivePhase(); + printf("delta Received mean:%d\n", mean[0]); + mean[0] = mean[0]/2; + delta_f->BeginSendPhase(); + GDI_delta->SendData(mean.data(), "mean", msg_size); + delta_f->EndSendPhase(); + printf("detla sent mean:%d\n", mean[0]); + } + } while (!done); +} + +int main(int argc, char** argv) +{ + MPI_Init(&argc, &argv); + + OMEGA_H_CHECK(argc == 2); + + const auto clientId = std::atoi(argv[1]); + REDEV_ALWAYS_ASSERT(clientId >= -1 && clientId <= 1); + + MPI_Comm comm = MPI_COMM_WORLD; + + switch (clientId) { + case -1: + xgc_coupler(comm); + break; + + case 0: + xgc_delta_f(comm); + break; + + case 1: + xgc_total_f(comm); + break; + + default: + std::cerr << "Unhandled client id; expected -1, 0, or 1\n"; + MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE); + } + + MPI_Finalize(); + return 0; +}