Merge pull request #4783 from vicentebolea/migrate-c++14-ways

refactor code to utilize c++14 features

Author: vicentebolea

scripts/developer/run-clang-format.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
-sudo docker run -itt --mount type=bind,source="$(pwd)",target=/root/adios2 \
+CONTAINER_DRIVER=${CONTAINER_DRIVER:-docker}
+
+"${CONTAINER_DRIVER[@]}" run -itt --mount type=bind,source="$(pwd)",target=/root/adios2 \
   ghcr.io/ornladios/adios2:ci-formatting sh -c \
   "git config --global --add safe.directory /root/adios2 &&
    cd /root/adios2 &&
    ./scripts/ci/scripts/run-clang-format.sh"
 
-git status --porcelain | awk '{print $2}' | xargs sudo chown "$USER:$(id -g)"
+if [ "${CONTAINER_DRIVER[0]}" != "podman" ]
+then
+  git status --porcelain | awk '{print $2}' | xargs sudo chown "$USER:$(id -g)"
+fi

source/adios2/common/ADIOSTypes.h

@@ -265,7 +265,7 @@ constexpr size_t DefaultMinDeferredSize = 4 * 1024 * 1024;
 
 /** default size for writing/reading files using POSIX/fstream/stdio write
  *  2Gb - 100Kb (tolerance)*/
-constexpr size_t DefaultMaxFileBatchSize = 2147381248;
+constexpr size_t DefaultMaxFileBatchSize = 2147483648 - 102400;
 
 /** default maximum shared memory segment size
  *  2 blocks of MaxFileBatchSize */

source/adios2/core/Group.cpp

@@ -39,7 +39,7 @@ Group::Group(std::string path, char delimiter, IO &io)
 {
     if (mapPtr == nullptr)
     {
-        mapPtr = std::shared_ptr<TreeMap>(new TreeMap());
+        mapPtr = std::make_shared<TreeMap>();
     }
 }
 // copy constructor

source/adios2/core/IO.cpp

@@ -980,8 +980,8 @@ VariableDerived &IO::DefineDerivedVariable(const std::string &name, const std::s
 
     // create derived variable with the expression
     auto itVariablePair = m_VariablesDerived.emplace(
-        name, std::unique_ptr<VariableBase>(new VariableDerived(
-                  name, derived_exp, expressionType, isConstant, varType, name_to_type)));
+        name, std::make_unique<VariableDerived>(name, derived_exp, expressionType, isConstant,
+                                                varType, name_to_type));
     VariableDerived &variable = static_cast<VariableDerived &>(*itVariablePair.first->second);
 
     // check IO placeholder for variable operations
@@ -1026,9 +1026,8 @@ VariableStruct &IO::DefineStructVariable(const std::string &name, StructDefiniti
         }
     }
 
-    auto itVariablePair =
-        m_Variables.emplace(name, std::unique_ptr<VariableBase>(new VariableStruct(
-                                      name, def, shape, start, count, constantDims)));
+    auto itVariablePair = m_Variables.emplace(
+        name, std::make_unique<VariableStruct>(name, def, shape, start, count, constantDims));
 
     VariableStruct &variable = static_cast<VariableStruct &>(*itVariablePair.first->second);
 

source/adios2/engine/bp5/BP5Reader.cpp

@@ -524,7 +524,7 @@ void BP5Reader::PerformGets()
                     }
                 }
             }
-            m_Remote = std::unique_ptr<XrootdRemote>(new XrootdRemote(m_HostOptions));
+            m_Remote = std::make_unique<XrootdRemote>(m_HostOptions);
             m_Remote->Open(XRootDHost, XRootDPort, RemoteName, m_OpenMode, RowMajorOrdering);
         }
         else

source/adios2/engine/campaign/CampaignReader.cpp

@@ -313,8 +313,7 @@ std::string CampaignReader::SaveRemoteMD(size_t dsIdx, size_t repIdx, adios2::co
             // Retrieve key
             if (!m_ConnectionManager)
             {
-                m_ConnectionManager =
-                    std::unique_ptr<Remote>(new Remote(core::ADIOS::StaticGetHostOptions()));
+                m_ConnectionManager = std::make_unique<Remote>(core::ADIOS::StaticGetHostOptions());
             }
             m_CampaignData.keys[rep.keyIdx].keyHex =
                 m_ConnectionManager->GetKeyFromConnectionManager(
@@ -1326,14 +1325,14 @@ void CampaignReader::ReadRemoteFile(const std::string &remoteHost, const std::st
 #ifdef ADIOS2_HAVE_XROOTD
     if (getenv("DoXRootD"))
     {
-        remote = std::unique_ptr<XrootdRemote>(new XrootdRemote(m_HostOptions));
+        remote = std::make_unique<XrootdRemote>(m_HostOptions);
         remote->Open("localhost", 1094, m_Name, m_OpenMode, true);
     }
     else
 #endif
 #ifdef ADIOS2_HAVE_SST
     {
-        remote = std::unique_ptr<EVPathRemote>(new EVPathRemote(m_HostOptions));
+        remote = std::make_unique<EVPathRemote>(m_HostOptions);
         int localPort = remote->LaunchRemoteServerViaConnectionManager(remoteHost);
         remote->OpenSimpleFile("localhost", localPort, remotePath);
     }

source/adios2/engine/daos/DaosWriter.h

@@ -34,8 +34,8 @@
 #include <daos.h>
 #include <daos_obj.h>
 
-#define MAX_AGGREGATE_METADATA_SIZE (5ULL * 1024 * 1024 * 1024)
-#define chunk_size_1mb 1048576
+#define MAX_AGGREGATE_METADATA_SIZE (5'368'709'120ULL)
+#define chunk_size_1mb 1'048'576
 
 namespace adios2
 {

source/adios2/engine/hdf5/HDF5ReaderP.cpp

@@ -434,14 +434,14 @@ bool HDF5ReaderP::CheckRemote()
 #ifdef ADIOS2_HAVE_XROOTD
         if (getenv("DoXRootD"))
         {
-            m_Remote = std::unique_ptr<XrootdRemote>(new XrootdRemote(m_HostOptions));
+            m_Remote = std::make_unique<XrootdRemote>(m_HostOptions);
             m_Remote->Open("localhost", 1094, m_Name, m_OpenMode, RowMajorOrdering);
         }
         else
 #endif
 #ifdef ADIOS2_HAVE_SST
         {
-            m_Remote = std::unique_ptr<EVPathRemote>(new EVPathRemote(m_HostOptions));
+            m_Remote = std::make_unique<EVPathRemote>(m_HostOptions);
             int localPort = m_Remote->LaunchRemoteServerViaConnectionManager(m_H5File.m_RemoteHost);
             m_Remote->Open("localhost", localPort, RemoteName, m_OpenMode, RowMajorOrdering);
         }

source/adios2/engine/sst/SstWriter.cpp

@@ -145,7 +145,7 @@ StepStatus SstWriter::BeginStep(StepMode mode, const float timeout_sec)
     {
         // initialize BP serializer, deleted in
         // SstWriter::EndStep()::lf_FreeBlocks()
-        m_BP3Serializer = std::unique_ptr<format::BP3Serializer>(new format::BP3Serializer(m_Comm));
+        m_BP3Serializer = std::make_unique<format::BP3Serializer>(m_Comm);
         m_BP3Serializer->Init(m_IO.m_Parameters, "in call to BP3::Open for writing", "sst");
         m_BP3Serializer->ResizeBuffer(m_BP3Serializer->m_Parameters.InitialBufferSize,
                                       "in call to BP3::Open for writing by SST engine");
@@ -156,7 +156,7 @@ StepStatus SstWriter::BeginStep(StepMode mode, const float timeout_sec)
     {
         if (!m_BP5Serializer)
         {
-            m_BP5Serializer = std::unique_ptr<format::BP5Serializer>(new format::BP5Serializer());
+            m_BP5Serializer = std::make_unique<format::BP5Serializer>();
             m_BP5Serializer->m_StatsLevel = Params.StatsLevel;
         }
         m_BP5Serializer->InitStep(new format::MallocV("SstWriter", true));

source/adios2/helper/adiosComm.inl

@@ -61,7 +61,7 @@ void Comm::GathervArrays(const T *source, size_t sourceCount,
         displs = GetGathervDisplacements(counts, countsSize);
         const size_t totalElements =
             displs[countsSize - 1] + counts[countsSize - 1];
-        if (totalElements > 2147483648)
+        if (totalElements > 2'147'483'648)
         {
             helper::ThrowNested<std::runtime_error>(
                 "Helper", "adiosComm", "GathervVectors",