Switch to using core serialization headers instead of mercury specific ones.

Author: feldergast

src/sst/elements/iris/sumi/collective_message.cc

@@ -14,7 +14,7 @@
 // distribution.
 
 #include <iris/sumi/collective_message.h>
-#include <mercury/common/serializable.h>
+#include <sst/core/serialization/serializable.h>
 
 namespace SST::Iris::sumi {
 
@@ -34,7 +34,7 @@ CollectiveWorkMessage::tostr(int p)
 }
 
 void
-CollectiveWorkMessage::serialize_order(SST::Hg::serializer &ser)
+CollectiveWorkMessage::serialize_order(SST::Core::Serialization::serializer& ser)
 {
   ProtocolMessage::serialize_order(ser);
   ser & tag_;

src/sst/elements/iris/sumi/collective_message.h

@@ -18,6 +18,7 @@
 #include <iris/sumi/message.h>
 #include <iris/sumi/collective.h>
 #include <mercury/common/thread_safe_new.h>
+#include <sst/core/serialization/serializable.h>
 
 namespace SST::Iris::sumi {
 
@@ -127,7 +128,7 @@ class CollectiveWorkMessage final :
 
   static const char* tostr(int p);
 
-  void serialize_order(SST::Hg::serializer& ser) override;
+  void serialize_order(SST::Core::Serialization::serializer& ser) override;
 
   int tag() const {
     return tag_;

src/sst/elements/iris/sumi/message.cc

@@ -81,7 +81,7 @@ Message::tostr(class_t ty)
 }
 
 void
-Message::serialize_order(SST::Hg::serializer &ser)
+Message::serialize_order(SST::Core::Serialization::serializer& ser)
 {
   ser & arrived_;
   ser & recv_sync_delay_;

src/sst/elements/iris/sumi/message.h

@@ -49,11 +49,11 @@ Questions? Contact sst-macro-help@sandia.gov
 #include <utility>
 #include <mercury/common/util.h>
 #include <mercury/common/printable.h>
-#include <mercury/common/serializable.h>
 #include <mercury/common/timestamp.h>
 #include <mercury/common/thread_safe_new.h>
 #include <mercury/components/operating_system_fwd.h>
 #include <mercury/hardware/network/network_message.h>
+#include <sst/core/serialization/serializable.h>
 
 namespace SST::Iris::sumi {
 
@@ -103,9 +103,9 @@ class Message : public SST::Hg::NetworkMessage
 
   std::string toString() const override;
 
-  void serialize_order(SST::Hg::serializer &ser) override;
+  void serialize_order(SST::Core::Serialization::serializer& ser) override;
 
-  void serializeBuffers(SST::Hg::serializer& ser);
+  void serializeBuffers(SST::Core::Serialization::serializer& ser);
 
   static bool needsAck(SST::Hg::NetworkMessage::type_t ty,
                         int sendCQ, int recvCQ);
@@ -295,7 +295,7 @@ class ProtocolMessage : public Message {
   {
   }
 
-  void serialize_order(SST::Hg::serializer& ser) override {
+  void serialize_order(SST::Core::Serialization::serializer& ser) override {
     Message::serialize_order(ser);
     ser & stage_;
     ser & protocol_;

src/sst/elements/mercury/Makefile.am

@@ -108,7 +108,6 @@ nobase_library_include_HEADERS = \
   common/event_handler.h \
   common/factory.h \
   common/node_address.h \
-  common/serializable.h \
   common/stl_string.h \
   common/thread_lock.h \
   common/thread_safe_int.h \

src/sst/elements/mercury/common/request.h

@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include <mercury/common/serializable.h>
 #include <mercury/common/printable.h>
 
 namespace SST {

src/sst/elements/mercury/common/serializable.h

@@ -16,8 +16,8 @@
 #pragma once
 
 #include <sst/core/sst_types.h>
-#include <mercury/common/serializable.h>
 #include <mercury/common/errors.h>
+#include <sst/core/serialization/serializable.h>
 #include <iosfwd>
 #include <stdint.h>
 #include <iostream>
@@ -146,6 +146,11 @@ class TimeDelta
   TimeDelta& operator-=(const TimeDelta &other);
   TimeDelta& operator*=(double scale);
   TimeDelta& operator/=(double scale);
+
+  void serialize_order(SST::Core::Serialization::serializer& ser) {
+    SST_SER(ticks_);
+  }
+
 };
 
 struct Timestamp
@@ -207,6 +212,11 @@ struct Timestamp
   static constexpr uint64_t carry_bits_mask = 0;
   static constexpr uint64_t remainder_bits_mask = ~uint64_t(0);
   static constexpr uint64_t carry_bits_shift = 0;
+
+  void serialize_order(SST::Core::Serialization::serializer& ser) {
+    SST_SER(epochs);
+    SST_SER(time);
+  }
 };
 
 TimeDelta operator+(const TimeDelta &a, const TimeDelta &b);
@@ -303,21 +313,3 @@ std::string to_printf_type(TimeDelta t);
 
 } // end namespace Hg
 } // end namespace SST
-
-START_SERIALIZATION_NAMESPACE
-template <> class serialize_impl<SST::Hg::TimeDelta>
-{
- public:
-  void operator()(SST::Hg::TimeDelta& t, serializer& ser){
-    ser.primitive(t);
-  }
-};
-
-template <> class serialize_impl<SST::Hg::Timestamp>
-{
- public:
-  void operator()(SST::Hg::Timestamp& t, serializer& ser){
-    ser.primitive(t);
-  }
-};
-END_SERIALIZATION_NAMESPACE

src/sst/elements/mercury/common/timestamp.h

@@ -17,7 +17,7 @@
 
 #include <sstream>
 #include <stdint.h>
-#include <mercury/common/serializable.h>
+#include <sst/core/serialization/serializable.h>
 
 namespace SST {
 namespace Hg {
@@ -70,23 +70,16 @@ struct UniqueEventId {
     ++msg_num;
     return other;
   }
+
+  void serialize_order(SST::Core::Serialization::serializer& ser) {
+    SST_SER(src_node);
+    SST_SER(msg_num);
+  }
 };
 
 } // end namespace Hg
 } // end namespace SST
 
-START_SERIALIZATION_NAMESPACE
-template <>
-class serialize_impl<SST::Hg::UniqueEventId>
-{
- public:
-  void
-  operator()(SST::Hg::UniqueEventId& id, serializer& ser){
-    ser.primitive(id);
-  }
-};
-END_SERIALIZATION_NAMESPACE
-
 namespace std {
 template <>
 struct hash<SST::Hg::UniqueEventId>

src/sst/elements/mercury/common/unique_id.h

@@ -28,7 +28,7 @@ namespace SST {
 namespace Hg {
 
 void
-NicEvent::serialize_order(serializer &ser)
+NicEvent::serialize_order(SST::Core::Serialization::serializer& ser)
 {
   Event::serialize_order(ser);
   ser & msg_;