Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DataPlane Configuration changes #4121

Merged
merged 2 commits into from
Apr 3, 2024
Merged

DataPlane Configuration changes #4121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee0ba5
DataPlane Configuration changes
eisenhauer Apr 1, 2024
b13b1d9
Change name to include HAVE rather than BUILD
eisenhauer Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,21 @@ foreach(opt IN LISTS ADIOS2_CONFIG_OPTS)
endif()
endforeach()

if (ADIOS2_HAVE_SST AND (ADIOS2_SST_HAVE_LIBFABRIC OR ADIOS2_SST_HAVE_UCX))
message(" RDMA Transport for Staging: Available")
set (HPCDataPlaneList "")
if (ADIOS2_HAVE_SST)
if (ADIOS2_SST_HAVE_LIBFABRIC)
set (HPCDataPlaneList "${HPCDataPlaneList} fabric")
endif()
if (ADIOS2_SST_HAVE_UCX)
set (HPCDataPlaneList "${HPCDataPlaneList} UCX")
endif()
if (ADIOS2_SST_HAVE_MPI_DP)
set (HPCDataPlaneList "${HPCDataPlaneList} MPI")
endif()
endif()
if ({HPCDataPlaneList} STREQUAL "")
message(" Possible RDMA DataPlanes for SST: <none>")
else()
message(" RDMA Transport for Staging: Unconfigured")
message(" Possible RDMA DataPlanes for SST: ${HPCDataPlaneList}")
endif()

9 changes: 7 additions & 2 deletions cmake/DetectOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,14 @@ if(ADIOS2_USE_SST AND NOT WIN32)
"-DLINK_DIRECTORIES=${LIBFABRIC_LIBRARIES}")
message(STATUS "Libfabric support for the HPE CXI provider: ${ADIOS2_SST_HAVE_CRAY_CXI}")
endif()
if(ADIOS2_HAVE_MPI)
if(ADIOS2_HAVE_MPI AND NOT "${ADIOS2_SST_HAVE_MPI_DP}")
set(CMAKE_REQUIRED_LIBRARIES "MPI::MPI_C;Threads::Threads")
include(CheckCXXSourceRuns)
check_cxx_source_runs([=[
#include <chrono>
#include <future>
#include <mpi.h>
#include <thread>
#include <stdlib.h>

#if !defined(MPICH)
Expand All @@ -491,7 +492,11 @@ if(ADIOS2_USE_SST AND NOT WIN32)
ADIOS2_HAVE_MPI_CLIENT_SERVER)
unset(CMAKE_REQUIRED_LIBRARIES)
if (ADIOS2_HAVE_MPI_CLIENT_SERVER)
set(ADIOS2_SST_HAVE_MPI TRUE)
set(ADIOS2_SST_HAVE_MPI_DP TRUE)
else()
if ("${ADIOS2_SST_EXPECT_MPI_DP}")
message(FATAL_ERROR "Expected MPI to support Client-server connection model, but test failed.")
endif()
endif()
endif()
# UCX
Expand Down
2 changes: 1 addition & 1 deletion source/adios2/toolkit/sst/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if(ADIOS2_HAVE_ZFP)
target_link_libraries(sst PRIVATE zfp::zfp)
endif()

if(ADIOS2_SST_HAVE_MPI)
if(ADIOS2_SST_BUILD_MPI_DP)
target_sources(sst PRIVATE dp/mpi_dp.c)
target_link_libraries(sst PRIVATE MPI::MPI_C)
endif()
Expand Down