Merge pull request #2421 from JasonRuonanWang/json-pgi

Enable PGI compiler for DataMan and Table
ornladios · Aug 12, 2020 · ec93d88 · ec93d88
2 parents c5c1699 + 3cd6cc6
commit ec93d88
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -166,8 +166,7 @@ if(ZeroMQ_FOUND)
 endif()
 
 # DataMan
-# DataMan currently breaks the PGI compiler
-if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
+if(NOT MSVC)
     if(ZeroMQ_FOUND)
         if(ADIOS2_USE_DataMan STREQUAL AUTO)
             set(ADIOS2_HAVE_DataMan TRUE)
@@ -178,7 +177,6 @@ if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
 endif()
 
 # SSC
-# SSC currently breaks the PGI compiler
 if(NOT MSVC)
     if(ADIOS2_HAVE_MPI)
         if(ADIOS2_USE_SSC STREQUAL AUTO)
@@ -190,7 +188,7 @@ if(NOT MSVC)
 endif()
 
 # Table
-if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
+if(NOT MSVC)
     if(ZeroMQ_FOUND)
         if(ADIOS2_USE_Table STREQUAL AUTO)
             set(ADIOS2_HAVE_Table TRUE)

diff --git a/source/adios2/toolkit/format/dataman/DataManSerializer.cpp b/source/adios2/toolkit/format/dataman/DataManSerializer.cpp
@@ -702,7 +702,6 @@ int DataManSerializer::PutDeferredRequest(const std::string &variable,
             {
                 throw("DataManSerializer::PutDeferredRequest() requested "
                       "start, count and shape do not match");
-                continue;
             }
             bool toContinue = false;
             for (size_t i = 0; i < start.size(); ++i)
@@ -778,7 +777,7 @@ VecPtr DataManSerializer::GenerateReply(
             "but failed to deserialize due to " +
                 std::string(e.what()),
             true, true);
-        step = -1;
+        step = std::numeric_limits<size_t>::max();
         return replyLocalBuffer;
     }
 
@@ -1122,7 +1121,6 @@ DmvVecPtr DataManSerializer::GetEarliestLatestStep(
             return nullptr;
         }
     }
-    return nullptr;
 }
 
 void DataManSerializer::Log(const int level, const std::string &message,

diff --git a/testing/adios2/engine/dataman/TestDataMan3DMemSelect.cpp b/testing/adios2/engine/dataman/TestDataMan3DMemSelect.cpp
@@ -121,7 +121,6 @@ void DataManReaderP2PMemSelect(const Dims &shape, const Dims &start,
     dataManIO.SetParameters(engineParams);
     adios2::Engine dataManReader = dataManIO.Open("stream", adios2::Mode::Read);
     std::vector<int> myInts = reader_data;
-    size_t i;
     while (true)
     {
         adios2::StepStatus status = dataManReader.BeginStep(StepMode::Read, 5);

diff --git a/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp b/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp
@@ -6627,8 +6627,6 @@ class binary_reader
             }
             *out++ = static_cast<char>(current);
         }
-
-        return true;
     }
 
     /*!
-Original file line number
+Diff line change
@@ Expand Up / @@ -6627,8 +6627,6 @@ class binary_reader @@
                 }
                 *out++ = static_cast<char>(current);
             }
-            return true;
         }
         /*!
@@ Expand Down @@