Remove compiler warnings; move all MPI stuff into sst_mpi.h (sstsimulator#1224)

leekillough · Kenneth Griesser · commit 3f92d5becfa8 · 2025-03-14T10:50:10.000-07:00
* Remove compiler warnings; move all MPI stuff into sst_mpi.h

* Use rule-of-5 with = default declarations to remove -Wdeprecated-copy warning

* Add sst_mpi.h to sst_core_sources
diff --git a/src/sst/core/Makefile.am b/src/sst/core/Makefile.am
@@ -247,7 +247,8 @@ sst_core_sources = \
 	iouse.cc \
 	objectComms.h \
 	objectSerialization.h \
-	simulation_impl.h
+	simulation_impl.h \
+	sst_mpi.h
 
 bin_PROGRAMS = sst sst-info sst-config sst-register
 libexec_PROGRAMS = sstsim.x sstinfo.x
diff --git a/src/sst/core/checkpointAction.cc b/src/sst/core/checkpointAction.cc
@@ -17,21 +17,14 @@
 #include "sst/core/mempoolAccessor.h"
 #include "sst/core/objectComms.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/stringize.h"
 #include "sst/core/timeConverter.h"
-#include "sst/core/warnmacros.h"
 
 // #include <filesystem>
 #include <sys/stat.h>
 #include <unistd.h>
 
-
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
-
 namespace SST {
 
 CheckpointAction::CheckpointAction(
diff --git a/src/sst/core/config.cc b/src/sst/core/config.cc
@@ -804,7 +804,7 @@ Config::Config(uint32_t num_ranks, bool first_rank) : ConfigShared(!first_rank,
     heartbeat_wall_period_ = 0;
 
     char* wd_buf = (char*)malloc(sizeof(char) * PATH_MAX);
-    getcwd(wd_buf, PATH_MAX);
+    (void)!getcwd(wd_buf, PATH_MAX);
 
     output_directory_ = "";
     if ( nullptr != wd_buf ) {
diff --git a/src/sst/core/configGraph.h b/src/sst/core/configGraph.h
@@ -138,7 +138,11 @@ class ConfigStatistic : public SST::Core::Serialization::serializable
 
     ConfigStatistic() : id(stat_null_id) {}
 
-    ConfigStatistic(const ConfigStatistic& o) : id(o.id), params(o.params), shared(o.shared), name(o.name) {}
+    ConfigStatistic(const ConfigStatistic&) = default;
+    ConfigStatistic(ConfigStatistic&&)      = default;
+    ConfigStatistic& operator=(const ConfigStatistic&) = default;
+    ConfigStatistic& operator=(ConfigStatistic&&) = default;
+    ~ConfigStatistic() override                   = default;
 
     inline const StatisticId_t& getId() const { return id; }
 
diff --git a/src/sst/core/exit.cc b/src/sst/core/exit.cc
@@ -13,15 +13,9 @@
 
 #include "sst/core/exit.h"
 
-#include "sst/core/warnmacros.h"
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
-
 #include "sst/core/component.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/stopAction.h"
 
 using SST::Core::ThreadSafe::Spinlock;
diff --git a/src/sst/core/heartbeat.cc b/src/sst/core/heartbeat.cc
@@ -16,15 +16,9 @@
 #include "sst/core/component.h"
 #include "sst/core/mempoolAccessor.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/stringize.h"
 #include "sst/core/timeConverter.h"
-#include "sst/core/warnmacros.h"
-
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
 
 namespace SST {
 
diff --git a/src/sst/core/iouse.cc b/src/sst/core/iouse.cc
@@ -13,14 +13,9 @@
 
 #include "sst/core/iouse.h"
 
-#include "sst/core/warnmacros.h"
+#include "sst/core/sst_mpi.h"
 
 #include <sys/resource.h>
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
 
 using namespace SST::Core;
 
diff --git a/src/sst/core/main.cc b/src/sst/core/main.cc
@@ -22,12 +22,6 @@ DISABLE_WARN_DEPRECATED_REGISTER
 #include <Python.h>
 REENABLE_WARNING
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
-
 #include "sst/core/activity.h"
 #include "sst/core/checkpointAction.h"
 #include "sst/core/config.h"
@@ -45,6 +39,7 @@ REENABLE_WARNING
 #include "sst/core/rankInfo.h"
 #include "sst/core/realtime.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/statapi/statengine.h"
 #include "sst/core/stringize.h"
 #include "sst/core/threadsafe.h"
diff --git a/src/sst/core/memuse.cc b/src/sst/core/memuse.cc
@@ -13,16 +13,10 @@
 
 #include "sst/core/memuse.h"
 
-#include "sst/core/warnmacros.h"
+#include "sst/core/sst_mpi.h"
 
 #include <sys/resource.h>
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
-
 using namespace SST::Core;
 
 uint64_t
diff --git a/src/sst/core/model/python/pymodel.cc b/src/sst/core/model/python/pymodel.cc
@@ -36,11 +36,7 @@ DISABLE_WARN_DEPRECATED_REGISTER
 #include <Python.h>
 REENABLE_WARNING
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
+#include "sst/core/sst_mpi.h"
 
 #include <string>
 
diff --git a/src/sst/core/objectComms.h b/src/sst/core/objectComms.h
@@ -13,13 +13,7 @@
 #define SST_CORE_OBJECTCOMMS_H
 
 #include "sst/core/objectSerialization.h"
-#include "sst/core/warnmacros.h"
-
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
+#include "sst/core/sst_mpi.h"
 
 #include <memory>
 #include <typeinfo>
diff --git a/src/sst/core/output.cc b/src/sst/core/output.cc
@@ -18,7 +18,6 @@
 
 // Core Headers
 #include "sst/core/simulation_impl.h"
-#include "sst/core/warnmacros.h"
 
 // C++ System Headers
 #include <atomic>
@@ -33,11 +32,7 @@
 #include <execinfo.h>
 #endif // HAVE_EXECINFO_H
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
+#include "sst/core/sst_mpi.h"
 
 namespace SST {
 
diff --git a/src/sst/core/realtime.cc b/src/sst/core/realtime.cc
@@ -18,22 +18,13 @@
 #include "sst/core/output.h"
 #include "sst/core/realtimeAction.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/stringize.h"
 #include "sst/core/timeLord.h"
 #include "sst/core/unitAlgebra.h"
 
 #include <unistd.h>
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#define UNUSED_WO_MPI(x) x
-#else
-#define UNUSED_WO_MPI(x) UNUSED(x)
-#endif
-
-
 namespace SST {
 
 /************ Static RealTimeManager Functions ***********/
diff --git a/src/sst/core/serialization/impl/serialize_set.h b/src/sst/core/serialization/impl/serialize_set.h
@@ -61,7 +61,7 @@ class serialize<std::set<T>>
             size_t size;
             ser.unpack(size);
             for ( size_t i = 0; i < size; ++i ) {
-                T    t;
+                T    t {};
                 ser& t;
                 v.insert(t);
             }
diff --git a/src/sst/core/simulation.cc b/src/sst/core/simulation.cc
@@ -32,6 +32,7 @@
 #include "sst/core/realtime.h"
 #include "sst/core/serialization/objectMapDeferred.h"
 #include "sst/core/shared/sharedObject.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/statapi/statengine.h"
 #include "sst/core/stopAction.h"
 #include "sst/core/stringize.h"
@@ -41,13 +42,6 @@
 #include "sst/core/timeLord.h"
 #include "sst/core/timeVortex.h"
 #include "sst/core/unitAlgebra.h"
-#include "sst/core/warnmacros.h"
-
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
 
 #include <cinttypes>
 #include <exception>
diff --git a/src/sst/core/sst_mpi.h b/src/sst/core/sst_mpi.h
@@ -0,0 +1,35 @@
+// Copyright 2009-2025 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Copyright (c) 2009-2025, NTESS
+// All rights reserved.
+//
+// This file is part of the SST software package. For license
+// information, see the LICENSE file in the top level directory of the
+// distribution.
+
+#ifndef SST_CORE_SST_MPI_H
+#define SST_CORE_SST_MPI_H
+
+#include "warnmacros.h"
+
+#ifdef SST_CONFIG_HAVE_MPI
+
+DISABLE_WARN_MISSING_OVERRIDE
+DISABLE_WARN_CAST_FUNCTION_TYPE
+
+#include <mpi.h>
+
+REENABLE_WARNING
+REENABLE_WARNING
+
+#define UNUSED_WO_MPI(x) x
+
+#else
+
+#define UNUSED_WO_MPI(x) UNUSED(x)
+
+#endif
+
+#endif
diff --git a/src/sst/core/sync/rankSyncParallelSkip.cc b/src/sst/core/sync/rankSyncParallelSkip.cc
@@ -19,15 +19,9 @@
 #include "sst/core/profile.h"
 #include "sst/core/serialization/serializer.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/sync/syncQueue.h"
 #include "sst/core/timeConverter.h"
-#include "sst/core/warnmacros.h"
-
-#ifdef SST_CONFIG_HAVE_MPI
-#define UNUSED_WO_MPI(x) x
-#else
-#define UNUSED_WO_MPI(x) UNUSED(x)
-#endif
 
 #if SST_EVENT_PROFILING
 #define SST_EVENT_PROFILE_START auto event_profile_start = std::chrono::high_resolution_clock::now();
diff --git a/src/sst/core/sync/rankSyncParallelSkip.h b/src/sst/core/sync/rankSyncParallelSkip.h
@@ -12,19 +12,13 @@
 #ifndef SST_CORE_SYNC_RANKSYNCPARALLELSKIP_H
 #define SST_CORE_SYNC_RANKSYNCPARALLELSKIP_H
 
+#include "sst/core/sst_mpi.h"
 #include "sst/core/sst_types.h"
 #include "sst/core/sync/syncManager.h"
 #include "sst/core/threadsafe.h"
-#include "sst/core/warnmacros.h"
 
 #include <map>
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#endif
-
 namespace SST {
 
 class RankSyncQueue;
diff --git a/src/sst/core/sync/rankSyncSerialSkip.cc b/src/sst/core/sync/rankSyncSerialSkip.cc
@@ -19,18 +19,9 @@
 #include "sst/core/profile.h"
 #include "sst/core/serialization/serializer.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/sync/syncQueue.h"
 #include "sst/core/timeConverter.h"
-#include "sst/core/warnmacros.h"
-
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#define UNUSED_WO_MPI(x) x
-#else
-#define UNUSED_WO_MPI(x) UNUSED(x)
-#endif
 
 #if SST_EVENT_PROFILING
 #define SST_EVENT_PROFILE_START auto event_profile_start = std::chrono::high_resolution_clock::now();
diff --git a/src/sst/core/sync/syncManager.cc b/src/sst/core/sync/syncManager.cc
@@ -19,25 +19,16 @@
 #include "sst/core/profile/syncProfileTool.h"
 #include "sst/core/realtime.h"
 #include "sst/core/simulation_impl.h"
+#include "sst/core/sst_mpi.h"
 #include "sst/core/sync/rankSyncParallelSkip.h"
 #include "sst/core/sync/rankSyncSerialSkip.h"
 #include "sst/core/sync/syncQueue.h"
 #include "sst/core/sync/threadSyncDirectSkip.h"
 #include "sst/core/sync/threadSyncSimpleSkip.h"
 #include "sst/core/timeConverter.h"
-#include "sst/core/warnmacros.h"
 
 #include <sys/time.h>
 
-#ifdef SST_CONFIG_HAVE_MPI
-DISABLE_WARN_MISSING_OVERRIDE
-#include <mpi.h>
-REENABLE_WARNING
-#define UNUSED_WO_MPI(x) x
-#else
-#define UNUSED_WO_MPI(x) UNUSED(x)
-#endif
-
 namespace SST {
 
 // Static data members
diff --git a/src/sst/core/warnmacros.h b/src/sst/core/warnmacros.h
@@ -42,7 +42,10 @@
 
 #define DISABLE_WARN_DEPRECATED_DECLARATION DIAG_DISABLE(deprecated-declarations)
 
+#define DISABLE_WARN_CAST_FUNCTION_TYPE DIAG_DISABLE(cast-function-type)
+
 #elif defined(__GNUC__)
+
 #define DIAG_COMPILER GCC
 
 #define DISABLE_WARN_DEPRECATED_REGISTER
@@ -61,6 +64,8 @@
 
 #define DISABLE_WARN_DEPRECATED_DECLARATION DIAG_DISABLE(deprecated-declarations)
 
+#define DISABLE_WARN_CAST_FUNCTION_TYPE DIAG_DISABLE(cast-function-type)
+
 #else
 
 #undef REENABLE_WARNING
@@ -70,6 +75,8 @@
 #define DISABLE_WARN_MAYBE_UNINITIALIZED
 #define DISABLE_WARN_STRICT_ALIASING
 #define DISABLE_WARN_MISSING_OVERRIDE
+#define DISABLE_WARN_CAST_FUNCTION_TYPE
+
 #endif
 
 #endif
