Daos Engine Merge (#4477)

* Daos Engine merge.  No testing yet.

* format

Author: eisenhauer

CMakeLists.txt

@@ -160,6 +160,7 @@ mark_as_advanced(CLEAR BUILD_TESTING)
 adios_option(BigWhoop   "Enable support for BigWhoop transforms" AUTO)
 adios_option(Blosc2     "Enable support for c-blosc-2 transforms" AUTO)
 adios_option(BZip2      "Enable support for BZip2 transforms" AUTO)
+adios_option(Caliper    "Enable support for Caliper" AUTO)
 adios_option(ZFP        "Enable support for ZFP transforms" AUTO)
 adios_option(SZ         "Enable support for SZ transforms" AUTO)
 adios_option(LIBPRESSIO "Enable support for LIBPRESSIO transforms" AUTO)

bindings/Fortran/f2c/adios2_f2c_variable.cpp

@@ -71,7 +71,7 @@ void FC_GLOBAL(adios2_variable_shape_f2c,
         return;
     }
 
-    size_t shapeC[ndims];
+    size_t shapeC[adios2::helper::MAX_DIMS];
     *ierr = static_cast<int>(adios2_variable_shape(shapeC, *variable));
     if (*ierr > 0)
     {

cmake/DetectOptions.cmake

@@ -529,6 +529,12 @@ if(DAOS_FOUND)
   set(ADIOS2_HAVE_DAOS TRUE)
 endif()
 
+# Caliper
+find_package(Caliper)
+if(Caliper_FOUND)
+  set(ADIOS2_HAVE_Caliper TRUE)
+endif()
+
 #SysV IPC
 if(UNIX)
   include(CheckSymbolExists)

source/adios2/CMakeLists.txt

@@ -276,7 +276,7 @@ if(ADIOS2_HAVE_DAOS)
     engine/daos/DaosWriter_TwoLevelShm.cpp
     engine/daos/DaosReader.cpp engine/daos/DaosReader.tcc
     engine/daos/DaosWriter.cpp engine/daos/DaosWriter.tcc)
-  target_link_libraries(adios2_core PRIVATE DAOS::DAOS)
+  target_link_libraries(adios2_core PRIVATE DAOS::DAOS Caliper::Caliper)
 endif()
 
 if(ADIOS2_HAVE_MPI)