Commit 736e3cea authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by Bolea Sanchez, Vicente Adolfo
Browse files

DataPlane Configuration changes (#4121) 

* DataPlane Configuration changes

* Change name to include HAVE rather than BUILD
parent 84ea59b5

CMakeLists.txt

+15 −3
Original line number Diff line number Diff line
@@ -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()

cmake/DetectOptions.cmake

+7 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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

source/adios2/toolkit/sst/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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()