IOSS: Try to get adios2 build working with adios master

sandialabs · Aug 10, 2023 · 7bb73bd · 7bb73bd
1 parent 5208556
commit 7bb73bd
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 29 deletions.
diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
@@ -243,6 +243,20 @@ jobs:
             extra: "MODERN=YES",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
+        - {
+            name: "ADIOS2 enabled",
+            os: ubuntu-latest,
+            compiler: "mpi",
+            debug: "NO",
+            threadsafe: "NO",
+            fortran: "YES",
+            use_kokkos: "NO",
+            use_adios2: "YES",
+            use_catalyst2: "NO",
+            gtest: "YES",
+            extra: "",
+            sanitizer: "NO" # address, integer, thread, memory, undefined
+          }
     steps:
 
       - uses: actions/checkout@v3

diff --git a/TPL/adios2/runcmake.sh b/TPL/adios2/runcmake.sh
@@ -28,11 +28,10 @@ ${RPATH} \
 -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \
 -D CMAKE_INSTALL_LIBDIR:PATH=lib \
 -D ADIOS2_USE_MPI:BOOL=${MPI} \
+-D ADIOS2_HAVE_MPI:BOOL=${MPI} \
 -D ADIOS2_BUILD_EXAMPLES:BOOL=OFF \
--D ADIOS2_BUILD_TESTING:BOOL=OFF \
 -D INSTALL_GTEST:BOOL=OFF \
 -D ADIOS2_USE_Fortran:BOOL=OFF \
--D ADIOS_USE_Profiling=OFF \
 $EXTRA_ARGS \
 ..
 

diff --git a/TPL/netcdf/runcmake.sh b/TPL/netcdf/runcmake.sh
@@ -67,6 +67,8 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
          -DENABLE_MMAP:BOOL=ON \
          -DENABLE_DAP:BOOL=OFF \
          -DENABLE_V2_API:BOOL=OFF \
+	 -DENABLE_FILTER_TESTING:BOOL=OFF \
+	 -DENABLE_TESTS:BOOL=OFF \
          ${LOCAL_ZLIB} \
          ${LOCAL_SZIP} \
          ${EXTRA_DEPS} \

diff --git a/install-tpl.sh b/install-tpl.sh
@@ -853,7 +853,6 @@ then
         then
             echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}"
             cd ADIOS2 || exit
-            git checkout v2.5.0
             rm -rf build
             mkdir build
             cd build || exit

diff --git a/packages/seacas/cmake/tpls/FindTPLADIOS2.cmake b/packages/seacas/cmake/tpls/FindTPLADIOS2.cmake
@@ -80,7 +80,7 @@ ENDIF()
 #
 TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( ADIOS2
   REQUIRED_HEADERS adios2.h
-  REQUIRED_LIBS_NAMES adios2
+  REQUIRED_LIBS_NAMES adios2_cxx11_mpi,adios2_cxx11,adios2_core_mpi,adios2_core
   )
 
 # NOTE: If FIND_PACKAGE(ADIOS2 ...) was called and successfully found ADIOS2, then

diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h
@@ -55,6 +55,7 @@ inline std::string IOSS_SYM_TENSOR() { return std::string("sym_tensor_33"); }
 #include <mpi.h>
 using Ioss_MPI_Comm = MPI_Comm;
 #define IOSS_PAR_UNUSED(x)
+#define ADIOS2_USE_MPI 1
 #else
 using Ioss_MPI_Comm = int;
 #if (__cplusplus >= 201703L)

diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h
@@ -8,6 +8,7 @@
 
 #include "ioad_export.h"
 
+#include <Ioss_CodeTypes.h>
 #include <Ioss_PropertyManager.h>
 #include <adios2.h>
 #include <string>

diff --git a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt
@@ -24,9 +24,3 @@ generate_export_header(Ioad)
 target_include_directories(Ioad
   PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
-
-IF (BUILD_TESTING)
-  ENABLE_TESTING()
-ENDIF()
-
-TRIBITS_ADD_TEST_DIRECTORIES(utest)
diff --git a/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt
diff --git a/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt b/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt
@@ -122,6 +122,18 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
 )
 ENDIF()
 
+IF (TPL_ENABLE_ADIOS2)
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+	Ut_ioad
+	NAME Ut_ioad
+	SOURCES Ut_ioad.C
+	NOEXEPREFIX
+	NOEXESUFFIX
+	INSTALLABLE
+	NUM_MPI_PROCS 1
+)
+ENDIF()
+
 TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/../"
   "${CMAKE_CURRENT_BINARY_DIR}/../"

diff --git a/.../libraries/ioss/src/adios/utest/Ut_ioad.C → ...seacas/libraries/ioss/src/utest/Ut_ioad.C b/.../libraries/ioss/src/adios/utest/Ut_ioad.C → ...seacas/libraries/ioss/src/utest/Ut_ioad.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 #ifdef SEACAS_HAVE_MPI
   MPI_Init(&argc, &argv);
 #endif
-  const int result = doctest::Context().run(argc, argv);
+  const int result = doctest::Context().run();
 #ifdef SEACAS_HAVE_MPI
   MPI_Finalize();
 #endif
@@ -423,7 +423,7 @@ void create_database(std::string type, std::string file_name)
 DOCTEST_TEST_CASE("Ioad")
 {
 
-  Ioss::Init::Initializer::initialize_ioss();
+  Ioss::Init::Initializer init_db;
   std::string exodus_db_name = "phantom.e";
   std::string adios_db_name  = "phantom.bp";
   create_database("exodus", exodus_db_name);