diff --git a/src/vt/collective/collective_alg.h b/src/vt/collective/collective_alg.h index 4344086535..f7d50a1d6c 100644 --- a/src/vt/collective/collective_alg.h +++ b/src/vt/collective/collective_alg.h @@ -45,8 +45,6 @@ #if !defined INCLUDED_COLLECTIVE_COLLECTIVE_ALG_H #define INCLUDED_COLLECTIVE_COLLECTIVE_ALG_H -#include - #include "vt/config.h" #include "vt/collective/tree/tree.h" #include "vt/activefn/activefn.h" @@ -146,12 +144,7 @@ struct CollectiveAlg : */ bool isDeallocated(bool is_user_tag, TagType scope_bits) const; - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | next_system_scope_ | user_scope_ diff --git a/src/vt/configs/arguments/args.h b/src/vt/configs/arguments/args.h index f5ac5faf82..64d8ba4a8a 100644 --- a/src/vt/configs/arguments/args.h +++ b/src/vt/configs/arguments/args.h @@ -45,8 +45,6 @@ #if !defined INCLUDED_VT_CONFIGS_ARGUMENTS_ARGS_H #define INCLUDED_VT_CONFIGS_ARGUMENTS_ARGS_H -#include - #include "vt/configs/arguments/app_config.h" #include "vt/runtime/component/component.h" @@ -81,12 +79,7 @@ struct ArgConfig : runtime::component::Component { std::string name() override { return "ArgConfig"; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | config_ | parsed_; diff --git a/src/vt/context/context.h b/src/vt/context/context.h index 0fab0549c7..f0232e763e 100644 --- a/src/vt/context/context.h +++ b/src/vt/context/context.h @@ -48,8 +48,6 @@ #include #include -#include - #include "vt/config.h" #include "vt/runtime/component/component_pack.h" #include "vt/context/context_attorney_fwd.h" @@ -145,12 +143,7 @@ struct Context : runtime::component::Component { std::string name() override { return "Context"; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | thisNode_ | numNodes_ diff --git a/src/vt/event/event.h b/src/vt/event/event.h index a37a824c51..9d036696f5 100644 --- a/src/vt/event/event.h +++ b/src/vt/event/event.h @@ -53,8 +53,6 @@ #include "vt/event/event_holder.h" #include "vt/event/event_msgs.h" -#include - #include #include #include @@ -189,12 +187,7 @@ struct AsyncEvent : runtime::component::PollableComponent { std::string name() override { return "AsyncEvent"; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | cur_event_ | event_container_ diff --git a/src/vt/group/group_manager.h b/src/vt/group/group_manager.h index c1ac649312..38eba6b901 100644 --- a/src/vt/group/group_manager.h +++ b/src/vt/group/group_manager.h @@ -64,8 +64,6 @@ #include "vt/collective/collective_scope.h" #include "vt/runtime/component/component_pack.h" -#include - #include #include #include @@ -373,12 +371,7 @@ struct GroupManager : runtime::component::Component { */ RemoteOperationIDType getNextOpID(); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | next_group_id_ | next_collective_group_id_ diff --git a/src/vt/messaging/active.h b/src/vt/messaging/active.h index 25d26bef62..0a5039bac9 100644 --- a/src/vt/messaging/active.h +++ b/src/vt/messaging/active.h @@ -49,8 +49,6 @@ #include #include -#include - #include "vt/config.h" #include "vt/activefn/activefn.h" #include "vt/messaging/active.fwd.h" @@ -1678,12 +1676,7 @@ struct ActiveMessenger : runtime::component::PollableComponent send_listen_.clear(); } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | current_handler_context_ | current_node_context_ diff --git a/src/vt/objgroup/manager.h b/src/vt/objgroup/manager.h index 73aab3f2f9..73c459a55b 100644 --- a/src/vt/objgroup/manager.h +++ b/src/vt/objgroup/manager.h @@ -58,8 +58,6 @@ #include "vt/messaging/message/smart_ptr.h" #include "vt/messaging/pending_send.h" -#include - #include #include #include @@ -366,11 +364,7 @@ struct ObjGroupManager : runtime::component::Component { ); template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + typename SerializerT> void serialize(SerializerT& s) { s | cur_obj_id_ | dispatch_ diff --git a/src/vt/phase/phase_manager.h b/src/vt/phase/phase_manager.h index 702253a2b3..a5d5f6f9fb 100644 --- a/src/vt/phase/phase_manager.h +++ b/src/vt/phase/phase_manager.h @@ -50,8 +50,6 @@ #include "vt/phase/phase_hook_enum.h" #include "vt/phase/phase_hook_id.h" -#include - #include #include @@ -182,12 +180,7 @@ struct PhaseManager : runtime::component::Component { */ void runHooksManual(PhaseHook type); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | cur_phase_ | proxy_ diff --git a/src/vt/pool/pool.h b/src/vt/pool/pool.h index 3e0023d407..88f7cb81fd 100644 --- a/src/vt/pool/pool.h +++ b/src/vt/pool/pool.h @@ -45,8 +45,6 @@ #if !defined INCLUDED_POOL_POOL_H #define INCLUDED_POOL_POOL_H -#include - #include "vt/config.h" #include "vt/runtime/component/component_pack.h" #include "vt/pool/static_sized/memory_pool_equal.h" @@ -164,12 +162,7 @@ struct Pool : runtime::component::Component { */ void finalize() override; - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | small_msg | medium_msg diff --git a/src/vt/rdma/rdma.h b/src/vt/rdma/rdma.h index 335fbaafed..2e03ae563a 100644 --- a/src/vt/rdma/rdma.h +++ b/src/vt/rdma/rdma.h @@ -70,8 +70,6 @@ #include "vt/collective/collective_scope.h" -#include - #include #include @@ -903,12 +901,7 @@ struct RDMAManager : runtime::component::Component { static void remoteChannel(ChannelMessage* msg); static void getInfoChannel(GetInfoChannel* msg); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | cur_rdma_handler_ | cur_ident_ diff --git a/src/vt/rdmahandle/manager.h b/src/vt/rdmahandle/manager.h index f7323e112a..a7e496be36 100644 --- a/src/vt/rdmahandle/manager.h +++ b/src/vt/rdmahandle/manager.h @@ -59,8 +59,6 @@ #include "vt/runtime/component/component_pack.h" #include "vt/collective/collective_scope.h" -#include - namespace vt { namespace rdma { /** \file */ @@ -231,12 +229,7 @@ struct Manager : runtime::component::Component { public: static std::unique_ptr construct(); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | cur_handle_obj_group_ | cur_handle_collection_ diff --git a/src/vt/registry/registry.h b/src/vt/registry/registry.h index cb95795691..2447eb26d8 100644 --- a/src/vt/registry/registry.h +++ b/src/vt/registry/registry.h @@ -49,8 +49,6 @@ #include #include -#include - #include "vt/config.h" #include "vt/activefn/activefn.h" #include "vt/handler/handler.h" @@ -146,12 +144,7 @@ struct Registry : runtime::component::Component { */ ActiveClosureFnType getHandlerNoTag(HandlerType const han); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | registered_ | tagged_registered_ diff --git a/src/vt/scheduler/scheduler.h b/src/vt/scheduler/scheduler.h index bd6b0f3c86..7ce2a194bd 100644 --- a/src/vt/scheduler/scheduler.h +++ b/src/vt/scheduler/scheduler.h @@ -54,8 +54,6 @@ #include "vt/timing/timing.h" #include "vt/runtime/component/component_pack.h" -#include - #include #include #include @@ -266,12 +264,7 @@ struct Scheduler : runtime::component::Component { */ bool isIdleMinusTerm() const { return work_queue_.size() == num_term_msgs_; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | work_queue_ | has_executed_ diff --git a/src/vt/termination/termination.h b/src/vt/termination/termination.h index 84c5a2575e..f952ba7a3b 100644 --- a/src/vt/termination/termination.h +++ b/src/vt/termination/termination.h @@ -62,8 +62,6 @@ #include "vt/termination/epoch_tags.h" #include "vt/runtime/component/component_pack.h" -#include - #include #include #include @@ -605,12 +603,7 @@ struct TerminationDetector : std::unordered_set const& getEpochReadySet() { return epoch_ready_; } std::unordered_set const& getEpochWaitSet() { return epoch_wait_status_; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | any_epoch_state_ | hang_ diff --git a/src/vt/timetrigger/time_trigger_manager.h b/src/vt/timetrigger/time_trigger_manager.h index 2c37195c6f..360afa63d6 100644 --- a/src/vt/timetrigger/time_trigger_manager.h +++ b/src/vt/timetrigger/time_trigger_manager.h @@ -48,8 +48,6 @@ #include "vt/timetrigger/trigger.h" #include "vt/runtime/component/component.h" -#include - #include #include #include @@ -108,12 +106,7 @@ struct TimeTriggerManager */ void triggerReady(TimeType cur_time); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | queue_ | next_trigger_id_ diff --git a/src/vt/topos/location/location.h b/src/vt/topos/location/location.h index eff264917b..7434c72661 100644 --- a/src/vt/topos/location/location.h +++ b/src/vt/topos/location/location.h @@ -59,8 +59,6 @@ #include "vt/activefn/activefn.h" #include "vt/vrt/vrt_common.h" -#include - #include #include #include diff --git a/src/vt/topos/location/manager.h b/src/vt/topos/location/manager.h index f6c356324e..eaa0ef0bd9 100644 --- a/src/vt/topos/location/manager.h +++ b/src/vt/topos/location/manager.h @@ -54,8 +54,6 @@ #include "vt/vrt/collection/proxy.h" #include "vt/runtime/component/component_pack.h" -#include - #include #include @@ -171,12 +169,7 @@ struct LocationManager : runtime::component::Component { LocInstType const inst, ActionLocInstType action ); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | collectionLoc | cur_loc_inst diff --git a/src/vt/trace/trace.h b/src/vt/trace/trace.h index ce70a8096d..1c29e2fef4 100644 --- a/src/vt/trace/trace.h +++ b/src/vt/trace/trace.h @@ -54,8 +54,6 @@ #include "vt/timing/timing.h" -#include - #include #include #include @@ -507,12 +505,7 @@ struct Trace : runtime::component::Component { friend void insertNewUserEvent(UserEventIDType event, std::string const& name); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | incremental_flush_mode | traces_ diff --git a/src/vt/utils/memory/memory_reporter.h b/src/vt/utils/memory/memory_reporter.h index c130f6678b..f6e2740ab9 100644 --- a/src/vt/utils/memory/memory_reporter.h +++ b/src/vt/utils/memory/memory_reporter.h @@ -45,8 +45,6 @@ #if !defined INCLUDED_VT_UTILS_MEMORY_MEMORY_REPORTER_H #define INCLUDED_VT_UTILS_MEMORY_MEMORY_REPORTER_H -#include - #include "vt/config.h" namespace vt { namespace util { namespace memory { diff --git a/src/vt/utils/memory/memory_usage.h b/src/vt/utils/memory/memory_usage.h index a4321886d9..4cd432a9bf 100644 --- a/src/vt/utils/memory/memory_usage.h +++ b/src/vt/utils/memory/memory_usage.h @@ -50,8 +50,6 @@ #include "vt/utils/memory/memory_units.h" #include "vt/utils/memory/memory_reporter.h" -#include - #include #include @@ -187,12 +185,7 @@ struct MemoryUsage : runtime::component::Component { */ std::size_t convertBytesFromString(std::string const& in); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | reporters_ | first_valid_reporter_; diff --git a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.h b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.h index a8736ca322..915ea3deb5 100644 --- a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.h +++ b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.h @@ -53,8 +53,6 @@ #include "vt/objgroup/proxy/proxy_objgroup.h" #include "vt/vrt/collection/balance/baselb/baselb.h" -#include - #include namespace vt { namespace vrt { namespace collection { namespace balance { @@ -166,12 +164,7 @@ struct LBManager : runtime::component::Component { */ std::shared_ptr getLoadModel() { return model_; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | cached_phase_ | cached_lb_ diff --git a/src/vt/vrt/collection/balance/model/comm_overhead.h b/src/vt/vrt/collection/balance/model/comm_overhead.h index c61d5aed48..d41e78859e 100644 --- a/src/vt/vrt/collection/balance/model/comm_overhead.h +++ b/src/vt/vrt/collection/balance/model/comm_overhead.h @@ -47,8 +47,6 @@ #include "vt/vrt/collection/balance/model/composed_model.h" -#include - #include namespace vt { namespace vrt { namespace collection { namespace balance { diff --git a/src/vt/vrt/collection/balance/model/composed_model.h b/src/vt/vrt/collection/balance/model/composed_model.h index 8c00f39950..fd99e27f78 100644 --- a/src/vt/vrt/collection/balance/model/composed_model.h +++ b/src/vt/vrt/collection/balance/model/composed_model.h @@ -48,8 +48,6 @@ #include "vt/config.h" #include "vt/vrt/collection/balance/model/load_model.h" -#include - namespace vt { namespace vrt { namespace collection { namespace balance { /** diff --git a/src/vt/vrt/collection/balance/model/per_collection.h b/src/vt/vrt/collection/balance/model/per_collection.h index c2510cc8e5..fbf8aa3e94 100644 --- a/src/vt/vrt/collection/balance/model/per_collection.h +++ b/src/vt/vrt/collection/balance/model/per_collection.h @@ -48,8 +48,6 @@ #include "vt/config.h" #include "vt/vrt/collection/balance/model/composed_model.h" -#include - #include namespace vt { namespace vrt { namespace collection { namespace balance { diff --git a/src/vt/vrt/collection/balance/model/raw_data.h b/src/vt/vrt/collection/balance/model/raw_data.h index 3ebe8e61eb..a69d5ebae1 100644 --- a/src/vt/vrt/collection/balance/model/raw_data.h +++ b/src/vt/vrt/collection/balance/model/raw_data.h @@ -48,8 +48,6 @@ #include "vt/vrt/collection/balance/model/load_model.h" #include "vt/vrt/collection/balance/lb_comm.h" -#include - #include namespace vt { namespace vrt { namespace collection { namespace balance { diff --git a/src/vt/vrt/collection/balance/node_stats.h b/src/vt/vrt/collection/balance/node_stats.h index d8dbd7e90d..344ca78702 100644 --- a/src/vt/vrt/collection/balance/node_stats.h +++ b/src/vt/vrt/collection/balance/node_stats.h @@ -55,8 +55,6 @@ #include "vt/timing/timing.h" #include "vt/objgroup/proxy/proxy_objgroup.h" -#include - #include #include #include @@ -245,12 +243,7 @@ struct NodeStats : runtime::component::Component { void initialize() override; void finalize() override; - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | proxy_ | node_data_ diff --git a/src/vt/vrt/collection/manager.h b/src/vt/vrt/collection/manager.h index 0c12b97dbe..61241cb6df 100644 --- a/src/vt/vrt/collection/manager.h +++ b/src/vt/vrt/collection/manager.h @@ -77,8 +77,6 @@ #include "vt/runtime/component/component_pack.h" #include "vt/vrt/collection/op_buffer.h" -#include - #include #include #include @@ -1756,12 +1754,7 @@ struct CollectionManager typename ColT::IndexType range, std::string const& file_base ); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | buffers_ | proxy_state_ diff --git a/src/vt/vrt/context/context_vrtmanager.h b/src/vt/vrt/context/context_vrtmanager.h index 54d25c29eb..127854bb98 100644 --- a/src/vt/vrt/context/context_vrtmanager.h +++ b/src/vt/vrt/context/context_vrtmanager.h @@ -63,8 +63,6 @@ #include "vt/activefn/activefn.h" #include "vt/topos/mapping/mapping_function.h" -#include - namespace vt { namespace vrt { using namespace ::vt::serialization; @@ -124,12 +122,7 @@ struct VirtualContextManager VirtualProxyType const& toProxy, MsgT *const msg ); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | holder_ | remote_holder_ diff --git a/src/vt/worker/worker_group.h b/src/vt/worker/worker_group.h index 68876acde0..6ce3ceee88 100644 --- a/src/vt/worker/worker_group.h +++ b/src/vt/worker/worker_group.h @@ -59,8 +59,6 @@ #include "vt/worker/worker_seq.h" #endif -#include - #include #include @@ -98,12 +96,7 @@ struct WorkerGroupAny std::string name() override { return "WorkerGroup"; } - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | finished_fn_ | initialized_ diff --git a/src/vt/worker/worker_group_omp.h b/src/vt/worker/worker_group_omp.h index 98f8ebb876..d0445c830c 100644 --- a/src/vt/worker/worker_group_omp.h +++ b/src/vt/worker/worker_group_omp.h @@ -57,8 +57,6 @@ #include "vt/utils/mutex/mutex.h" #include "vt/runtime/component/component_pack.h" -#include - #include #include #include @@ -99,12 +97,7 @@ struct WorkerGroupOMP ); void enqueueAllWorkers(WorkUnitType const& work_unit); - template < - typename SerializerT, - typename = std::enable_if_t< - std::is_same::value - > - > + template void serialize(SerializerT& s) { s | finished_fn_ | ready_