Address compile warnings accross the project

- Add multiple EXPECT_THROW in tests - Corrects a integer overflow in InSituMPISchedules.cpp - Corrects a printf modifier in H5VolUtil.cpp - Enforce coding style across the project Co-authored-by: Chuck Atkins <chuck.atkins@kitware.com> Co-authored-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
ornladios · Jun 11, 2021 · c29e222 · c29e222
1 parent a741ab5
commit c29e222
Show file tree

Hide file tree

Showing 63 changed files with 1,086 additions and 561 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,6 +58,26 @@ if(MSVC)
   )
 endif()
 
+function(append_str_list_once var x)
+  foreach(item IN ITEMS ${${var}})
+    if(item STREQUAL x)
+      return()
+    endif()
+  endforeach()
+  set(out ${${var}} ${x})
+  string(REPLACE ";" " " out "${out}")
+  set(${var} "${out}" PARENT_SCOPE)
+endfunction()
+
+if(NOT MSVC)
+  set(CMAKE_C_COMPILER_FLAGS_DEBUG "${CMAKE_C_COMPILER_FLAGS_DEBUG}"
+    CACHE STRING "" FORCE
+  )
+  set(CMAKE_CXX_COMPILER_FLAGS_DEBUG "${CMAKE_CXX_COMPILER_FLAGS_DEBUG}"
+    CACHE STRING "" FORCE
+  )
+endif()
+
 #------------------------------------------------------------------------------#
 # Deal with any pre-installation cleanup tasks
 #------------------------------------------------------------------------------#

diff --git a/bindings/CXX11/adios2/cxx11/Engine.tcc b/bindings/CXX11/adios2/cxx11/Engine.tcc
@@ -237,7 +237,6 @@ template <class T>
 void Engine::Get(Variable<T> variable, typename Variable<T>::Info &info,
                  const Mode launch)
 {
-    using IOType = typename TypeInfo<T>::IOType;
     adios2::helper::CheckForNullptr(m_Engine, "in call to Engine::Get");
     if (m_Engine->m_EngineType == "NULL")
     {

diff --git a/examples/heatTransfer/write/IO_ph5.cpp b/examples/heatTransfer/write/IO_ph5.cpp
@@ -176,6 +176,10 @@ void HDF5NativeWriter::WriteScalar(const std::string &varName, const void *data,
 
     herr_t status = H5Dwrite(dsetID, h5Type, H5S_ALL, H5S_ALL, plistID, data);
 
+    if (status < 0)
+    {
+        std::cerr << " Write failed. " << std::endl;
+    }
     H5Sclose(filespaceID);
     H5Dclose(dsetID);
 }

diff --git a/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp b/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
             hdf5IO.Open("myVector.h5", adios2::Mode::Write);
 
         /** Write variable for buffering */
-        hdf5Writer.Get<float>(bpFloats, myFloats.data());
+        hdf5Writer.Put<float>(bpFloats, myFloats.data());
 
         /** Create bp file, engine becomes unreachable after this*/
         hdf5Writer.Close();

diff --git a/examples/query/test.cpp b/examples/query/test.cpp
@@ -125,6 +125,9 @@ bool testMe(std::string &queryConfigFile, std::string const &doubleVarName,
     adios2::IO inIO = ad.DeclareIO("query");
     adios2::Engine reader = inIO.Open(dataFileName, adios2::Mode::Read, comm);
 
+    //  to be continued
+    if (!reader)
+        return false;
     // std::vector<double> dataOutput;
     // std::vector<adios2::Dims> coordinateOutput;
 

diff --git a/scripts/ci/cmake/ci-el7-intel18-ohpc.cmake b/scripts/ci/cmake/ci-el7-intel18-ohpc.cmake
diff --git a/scripts/ci/cmake/ci-el7-intel18-openmpi-ohpc.cmake b/scripts/ci/cmake/ci-el7-intel18-openmpi-ohpc.cmake
diff --git a/source/adios2/core/ADIOS.cpp b/source/adios2/core/ADIOS.cpp
@@ -65,8 +65,8 @@ namespace core
 
 ADIOS::ADIOS(const std::string configFile, helper::Comm comm,
              const std::string hostLanguage)
-: m_ConfigFile(configFile), m_HostLanguage(hostLanguage),
-  m_Comm(std::move(comm))
+: m_HostLanguage(hostLanguage), m_Comm(std::move(comm)),
+  m_ConfigFile(configFile)
 {
     if (!configFile.empty())
     {

diff --git a/source/adios2/core/Attribute.cpp b/source/adios2/core/Attribute.cpp
@@ -12,61 +12,15 @@
 #include "Attribute.tcc"
 
 #include "adios2/common/ADIOSMacros.h"
-#include "adios2/helper/adiosFunctions.h" //GetDataType<T>
-
-#include <type_traits>
 
 namespace adios2
 {
 namespace core
 {
 
-namespace // anonymous
-{
-
-template <class T>
-struct RequiresZeroPadding : std::false_type
-{
-};
-
-template <>
-struct RequiresZeroPadding<long double> : std::true_type
-{
-};
-}
-
-#define declare_type(T)                                                        \
-                                                                               \
-    template <>                                                                \
-    Attribute<T>::Attribute(const Attribute<T> &other)                         \
-    : AttributeBase(other), m_DataArray(other.m_DataArray)                     \
-    {                                                                          \
-        if (RequiresZeroPadding<T>::value)                                     \
-            std::memset(&m_DataSingleValue, 0, sizeof(m_DataSingleValue));     \
-        m_DataSingleValue = other.m_DataSingleValue;                           \
-    }                                                                          \
-                                                                               \
-    template <>                                                                \
-    Attribute<T>::Attribute(const std::string &name, const T *array,           \
-                            const size_t elements)                             \
-    : AttributeBase(name, helper::GetDataType<T>(), elements)                  \
-    {                                                                          \
-        if (RequiresZeroPadding<T>::value)                                     \
-            std::memset(&m_DataSingleValue, 0, sizeof(m_DataSingleValue));     \
-        m_DataArray = std::vector<T>(array, array + elements);                 \
-    }                                                                          \
-                                                                               \
-    template <>                                                                \
-    Attribute<T>::Attribute(const std::string &name, const T &value)           \
-    : AttributeBase(name, helper::GetDataType<T>())                            \
-    {                                                                          \
-        if (RequiresZeroPadding<T>::value)                                     \
-            std::memset(&m_DataSingleValue, 0, sizeof(m_DataSingleValue));     \
-        m_DataSingleValue = value;                                             \
-    }
-
-ADIOS2_FOREACH_ATTRIBUTE_STDTYPE_1ARG(declare_type)
-#undef declare_type
+#define declare_template_instantiation(T) template class Attribute<T>;
+ADIOS2_FOREACH_ATTRIBUTE_STDTYPE_1ARG(declare_template_instantiation)
+#undef declare_template_instantiation
 
 } // end namespace core
 } // end namespace adios2
diff --git a/source/adios2/core/Attribute.tcc b/source/adios2/core/Attribute.tcc
@@ -13,14 +13,76 @@
 
 #include "Attribute.h"
 
+#include "adios2/helper/adiosFunctions.h" //GetDataType<T>
 #include "adios2/helper/adiosType.h"
 
+#include <cstring>
+
+#include <type_traits>
+
 namespace adios2
 {
 namespace core
 {
 
-template <class T>
+namespace // anonymous
+{
+template <typename T, typename Enable = void>
+struct Pad;
+
+template <typename T, typename Enable>
+struct Pad
+{
+    static void Zero(T &arg) {}
+};
+
+template <typename T>
+struct Pad<T, typename std::enable_if<std::is_trivial<T>::value>::type>
+{
+    static void Zero(T &arg) { std::memset(&arg, 0, sizeof(arg)); }
+};
+
+template <typename T>
+struct Pad<T, typename std::enable_if<std::is_same<
+                  T, std::complex<typename T::value_type>>::value>::type>
+{
+    static void Zero(T &arg)
+    {
+        Pad<typename T::value_type>::Zero(
+            reinterpret_cast<typename T::value_type(&)[2]>(arg)[0]);
+        Pad<typename T::value_type>::Zero(
+            reinterpret_cast<typename T::value_type(&)[2]>(arg)[1]);
+    }
+};
+
+}
+
+template <typename T>
+Attribute<T>::Attribute(const Attribute<T> &other)
+: AttributeBase(other), m_DataArray(other.m_DataArray)
+{
+    Pad<T>::Zero(m_DataSingleValue);
+    m_DataSingleValue = other.m_DataSingleValue;
+}
+
+template <typename T>
+Attribute<T>::Attribute(const std::string &name, const T *array,
+                        const size_t elements)
+: AttributeBase(name, helper::GetDataType<T>(), elements)
+{
+    Pad<T>::Zero(m_DataSingleValue);
+    m_DataArray = std::vector<T>(array, array + elements);
+}
+
+template <typename T>
+Attribute<T>::Attribute(const std::string &name, const T &value)
+: AttributeBase(name, helper::GetDataType<T>())
+{
+    Pad<T>::Zero(m_DataSingleValue);
+    m_DataSingleValue = value;
+}
+
+template <typename T>
 std::string Attribute<T>::DoGetInfoValue() const noexcept
 {
     std::string value;

diff --git a/source/adios2/core/IO.cpp b/source/adios2/core/IO.cpp
@@ -187,8 +187,8 @@ void IO::RegisterEngine(const std::string &engineType, EngineFactoryEntry entry)
 
 IO::IO(ADIOS &adios, const std::string name, const bool inConfigFile,
        const std::string hostLanguage)
-: m_ADIOS(adios), m_Name(name), m_InConfigFile(inConfigFile),
-  m_HostLanguage(hostLanguage)
+: m_ADIOS(adios), m_Name(name), m_HostLanguage(hostLanguage),
+  m_InConfigFile(inConfigFile)
 {
 }
 
@@ -716,7 +716,6 @@ void IO::ResetVariablesStepSelection(const bool zeroStart,
     for (auto itVariable = m_Variables.begin(); itVariable != m_Variables.end();
          ++itVariable)
     {
-        const std::string &name = itVariable->first;
         const DataType type = InquireVariableType(itVariable);
 
         if (type == DataType::None)
@@ -745,7 +744,6 @@ void IO::SetPrefixedNames(const bool isStep) noexcept
     for (auto itVariable = m_Variables.begin(); itVariable != m_Variables.end();
          ++itVariable)
     {
-        const std::string &name = itVariable->first;
         // if for each step (BP4), check if variable type is not empty (means
         // variable exist in that step)
         const DataType type = isStep ? InquireVariableType(itVariable)

diff --git a/source/adios2/core/Stream.cpp b/source/adios2/core/Stream.cpp
@@ -20,8 +20,9 @@ namespace core
 
 Stream::Stream(const std::string &name, const Mode mode, helper::Comm comm,
                const std::string engineType, const std::string hostLanguage)
-: m_Name(name), m_ADIOS(std::make_shared<ADIOS>(std::move(comm), hostLanguage)),
-  m_IO(&m_ADIOS->DeclareIO(name)), m_Mode(mode), m_EngineType(engineType)
+: m_ADIOS(std::make_shared<ADIOS>(std::move(comm), hostLanguage)),
+  m_IO(&m_ADIOS->DeclareIO(name)), m_Name(name), m_Mode(mode),
+  m_EngineType(engineType)
 {
     if (mode == adios2::Mode::Read)
     {
@@ -38,9 +39,8 @@ Stream::Stream(const std::string &name, const Mode mode,
 Stream::Stream(const std::string &name, const Mode mode, helper::Comm comm,
                const std::string configFile, const std::string ioInConfigFile,
                const std::string hostLanguage)
-: m_Name(name),
-  m_ADIOS(std::make_shared<ADIOS>(configFile, std::move(comm), hostLanguage)),
-  m_IO(&m_ADIOS->DeclareIO(ioInConfigFile)), m_Mode(mode)
+: m_ADIOS(std::make_shared<ADIOS>(configFile, std::move(comm), hostLanguage)),
+  m_IO(&m_ADIOS->DeclareIO(ioInConfigFile)), m_Name(name), m_Mode(mode)
 {
     if (mode == adios2::Mode::Read)
     {

diff --git a/source/adios2/engine/bp4/BP4Reader.cpp b/source/adios2/engine/bp4/BP4Reader.cpp
@@ -561,7 +561,6 @@ size_t BP4Reader::UpdateBuffer(const TimePoint &timeoutInstant,
                  * Those steps are read again here, starting in the beginning of
                  * the buffer now.
                  */
-                const size_t fileSize = m_MDFileManager.GetFileSize(0);
                 const size_t newMDSize =
                     expectedMinFileSize - m_MDFileAlreadyReadSize;
                 if (m_BP4Deserializer.m_Metadata.m_Buffer.size() < newMDSize)

diff --git a/source/adios2/engine/dataman/DataManReader.cpp b/source/adios2/engine/dataman/DataManReader.cpp
@@ -21,9 +21,9 @@ namespace engine
 DataManReader::DataManReader(IO &io, const std::string &name,
                              const Mode openMode, helper::Comm comm)
 : Engine("DataManReader", io, name, openMode, std::move(comm)),
+  m_FinalStep(std::numeric_limits<signed long int>::max()),
   m_Serializer(m_Comm, helper::IsRowMajor(io.m_HostLanguage)),
-  m_RequesterThreadActive(true), m_SubscriberThreadActive(true),
-  m_FinalStep(std::numeric_limits<signed long int>::max())
+  m_RequesterThreadActive(true), m_SubscriberThreadActive(true)
 {
     m_MpiRank = m_Comm.Rank();
     m_MpiSize = m_Comm.Size();

diff --git a/source/adios2/engine/dataman/DataManWriter.cpp b/source/adios2/engine/dataman/DataManWriter.cpp
@@ -19,8 +19,8 @@ namespace engine
 
 DataManWriter::DataManWriter(IO &io, const std::string &name,
                              const Mode openMode, helper::Comm comm)
-: Engine("DataManWriter", io, name, openMode, std::move(comm)),
-  m_Serializer(m_Comm, helper::IsRowMajor(io.m_HostLanguage)), m_SentSteps(0),
+: Engine("DataManWriter", io, name, openMode, std::move(comm)), m_SentSteps(0),
+  m_Serializer(m_Comm, helper::IsRowMajor(io.m_HostLanguage)),
   m_ReplyThreadActive(true), m_PublishThreadActive(true)
 {