Unverified Commit 55dbc88c authored by Jason Wang's avatar Jason Wang Committed by GitHub
Browse files

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

Fix a template instantiation issue with GCC 10 in dataman serializer
parents 9641e4c1 63e5d6c0

cmake/DetectOptions.cmake

+9 −7
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ elseif(ADIOS2_USE_MHS) 
endif()



# DataSpaces

if(MPI_FOUND)

    if(ADIOS2_USE_DataSpaces STREQUAL AUTO)

        find_package(DataSpaces 2.1.1)

    elseif(ADIOS2_USE_DataSpaces)
@@ -263,6 +264,7 @@ endif() 
    if(DATASPACES_FOUND)

        set(ADIOS2_HAVE_DataSpaces TRUE)

    endif()

endif()



# HDF5

if(ADIOS2_USE_HDF5 STREQUAL AUTO)

source/adios2/toolkit/format/dataman/DataManSerializer.cpp

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

source/adios2/toolkit/format/dataman/DataManSerializer.h

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ public: 
    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,