Commit cc5ebdb1 authored by Chuck Atkins's avatar Chuck Atkins Committed by Kitware Robot

Merge topic 'adios2-libfabric'

cf91550a paraview: Enable adios2 support
619d57bb adios2 and zfp: override install LIBDIR to "lib"
6cc6d313 adios2: Enable ffi for internal SST dependencies
42cb7106 libfabric: Enable for use within adios2
ad2ce7f2 adios2: Always enable ZFP support
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !627
parents 6990ce2c cf91550a
Pipeline #143044 failed with stage
in 0 seconds
......@@ -116,6 +116,7 @@ function (superbuild_find_projects var)
fontconfig
glproto
gperf
libfabric
llvm
mesa
osmesa
......
cmake_dependent_option(adios2_USE_FABRIC
"Enable the use of RDMA fabrics for the SST engine" OFF
"CMAKE_SYSTEM_NAME MATCHES Linux" OFF)
mark_as_advanced(adios2_USE_FABRIC)
set(adios2_extra_deps)
if(adios2_USE_FABRIC)
list(APPEND adios2_extra_deps libfabric)
else()
list(APPEND adios2_extra_args -DPC_LIBFABRIC_FOUND:STRING=IGNORE)
endif()
if(UNIX)
list(APPEND adios2_extra_deps ffi)
endif()
superbuild_add_project(adios2
CAN_USE_SYSTEM
DEPENDS
cxx11
cxx11 zfp ${adios2_extra_deps}
DEPENDS_OPTIONAL
mpi zfp
mpi
CMAKE_ARGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_LIBDIR:STRING=lib
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DBUILD_TESTING:BOOL=OFF
-DADIOS2_BUILD_EXAMPLES:BOOL=OFF
......@@ -20,10 +37,12 @@ superbuild_add_project(adios2
-DADIOS2_USE_Profiling:STRING=OFF
-DADIOS2_USE_Python:STRING=OFF
-DADIOS2_USE_SSC:STRING=ON
-DADIOS2_USE_SST:STRING=OFF
-DADIOS2_USE_SST:STRING=ON
-DADIOS2_USE_SZ:STRING=OFF
-DADIOS2_USE_ZFP:STRING=${zfp_enabled}
-DADIOS2_USE_ZeroMQ:STRING=OFF)
-DADIOS2_USE_ZeroMQ:STRING=OFF
-DEVPATH_TRANSPORT_MODULES:BOOL=OFF
${adios2_extra_args})
superbuild_apply_patch(adios2 cmake-update-findmpi
"Fix issues with FindMPI in downstream dependees")
......@@ -138,7 +138,7 @@ superbuild_add_project(paraview
DEPENDS
hdf5
DEPENDS_OPTIONAL
cuda boost matplotlib mpi numpy png
adios2 cuda boost matplotlib mpi numpy png
python python2 python3 qt5 visitbridge zlib silo las
xdmf3 ospray vrpn vtkm tbb netcdf
nlohmannjson
......@@ -163,6 +163,7 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled}
-DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled}
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
-DPARAVIEW_ENABLE_ADIOS2:BOOL=${adios2_enabled}
-DPARAVIEW_ENABLE_MOTIONFX:BOOL=${PARAVIEW_ENABLE_MOTIONFX}
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=${visitbridge_enabled}
......
if(BUILD_SHARED_LIBS)
set(libfabric_args_shared --enable-shared --disable-static)
else()
set(libfabric_args_shared --disable-shared --enable-static)
endif()
superbuild_add_project(libfabric
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
${libfabric_args_shared}
BUILD_COMMAND
$(MAKE)
INSTALL_COMMAND
make install
BUILD_IN_SOURCE 1)
......@@ -4,4 +4,5 @@ superbuild_add_project(zfp
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_LIBDIR:STRING=lib)
......@@ -194,3 +194,7 @@ superbuild_set_revision(zfp
superbuild_set_revision(adios2
URL "https://www.paraview.org/files/dependencies/adios2-v2.4.0.tar.gz"
URL_MD5 "4b0e66392b5c91cc4822be9ce800a2e8")
superbuild_set_revision(libfabric
URL "http://www.paraview.org/files/dependencies/libfabric-1.8.0.tar.bz2"
URL_MD5 "c19c257856cb6e5094e73bf727e2d76c")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment