Merge pull request #3165 from JasonRuonanWang/fix-dataman-test

Fix a template instantiation issue with GCC 10 in dataman serializer
ornladios · Apr 16, 2022 · 6a2d579 · 6a2d579
2 parents 6d7c995 + 63e5d6c
commit 6a2d579
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -255,13 +255,15 @@ elseif(ADIOS2_USE_MHS)
 endif()
 
 # DataSpaces
-if(ADIOS2_USE_DataSpaces STREQUAL AUTO)
-  find_package(DataSpaces 2.1.1)
-elseif(ADIOS2_USE_DataSpaces)
-  find_package(DataSpaces 2.1.1 REQUIRED)
-endif()
-if(DATASPACES_FOUND)
-  set(ADIOS2_HAVE_DataSpaces TRUE)
+if(MPI_FOUND)
+    if(ADIOS2_USE_DataSpaces STREQUAL AUTO)
+        find_package(DataSpaces 2.1.1)
+    elseif(ADIOS2_USE_DataSpaces)
+        find_package(DataSpaces 2.1.1 REQUIRED)
+    endif()
+    if(DATASPACES_FOUND)
+        set(ADIOS2_HAVE_DataSpaces TRUE)
+    endif()
 endif()
 
 # HDF5

diff --git a/source/adios2/toolkit/format/dataman/DataManSerializer.cpp b/source/adios2/toolkit/format/dataman/DataManSerializer.cpp
@@ -622,7 +622,6 @@ void DataManSerializer::Log(const int level, const std::string &message,
     }
 }
 
-template <>
 void DataManSerializer::PutData(
     const std::string *inputData, const std::string &varName,
     const Dims &varShape, const Dims &varStart, const Dims &varCount,

diff --git a/source/adios2/toolkit/format/dataman/DataManSerializer.h b/source/adios2/toolkit/format/dataman/DataManSerializer.h
@@ -93,6 +93,14 @@ class DataManSerializer
     void PutAttributes(core::IO &io);
 
     // put a variable for writer
+    void PutData(const std::string *inputData, const std::string &varName,
+                 const Dims &varShape, const Dims &varStart,
+                 const Dims &varCount, const Dims &varMemStart,
+                 const Dims &varMemCount, const std::string &doid,
+                 const size_t step, const int rank, const std::string &address,
+                 const std::vector<std::shared_ptr<core::Operator>> &ops,
+                 VecPtr localBuffer = nullptr, JsonPtr metadataJson = nullptr);
+
     template <class T>
     void PutData(const T *inputData, const std::string &varName,
                  const Dims &varShape, const Dims &varStart,