#1009: memory footprinting: remove unnnecessary includes

Remove unnecessary checkpoint headers and enabe_ifs (virtual serialization leftovers).
DARMA-tasking · Nov 21, 2020 · 171083d · 171083d
1 parent 505a057
commit 171083d
Show file tree

Hide file tree

Showing 30 changed files with 24 additions and 203 deletions.
diff --git 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 <checkpoint/checkpoint.h>
-
 #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<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -45,8 +45,6 @@
 #if !defined INCLUDED_VT_CONFIGS_ARGUMENTS_ARGS_H
 #define INCLUDED_VT_CONFIGS_ARGUMENTS_ARGS_H
 
-#include <checkpoint/checkpoint.h>
-
 #include "vt/configs/arguments/app_config.h"
 #include "vt/runtime/component/component.h"
 
@@ -81,12 +79,7 @@ struct ArgConfig : runtime::component::Component<ArgConfig> {
 
   std::string name() override { return "ArgConfig"; }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | config_
       | parsed_;

diff --git a/src/vt/context/context.h b/src/vt/context/context.h
@@ -48,8 +48,6 @@
 #include <memory>
 #include <mpi.h>
 
-#include <checkpoint/checkpoint.h>
-
 #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<Context> {
 
   std::string name() override { return "Context"; }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | thisNode_
       | numNodes_

diff --git 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 <checkpoint/checkpoint.h>
-
 #include <memory>
 #include <vector>
 #include <list>
@@ -189,12 +187,7 @@ struct AsyncEvent : runtime::component::PollableComponent<AsyncEvent> {
 
   std::string name() override { return "AsyncEvent"; }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -64,8 +64,6 @@
 #include "vt/collective/collective_scope.h"
 #include "vt/runtime/component/component_pack.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <memory>
 #include <unordered_map>
 #include <cstdlib>
@@ -373,12 +371,7 @@ struct GroupManager : runtime::component::Component<GroupManager> {
    */
   RemoteOperationIDType getNextOpID();
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -49,8 +49,6 @@
 #include <memory>
 #include <mpi.h>
 
-#include <checkpoint/checkpoint.h>
-
 #include "vt/config.h"
 #include "vt/activefn/activefn.h"
 #include "vt/messaging/active.fwd.h"
@@ -1678,12 +1676,7 @@ struct ActiveMessenger : runtime::component::PollableComponent<ActiveMessenger>
     send_listen_.clear();
   }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -58,8 +58,6 @@
 #include "vt/messaging/message/smart_ptr.h"
 #include "vt/messaging/pending_send.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <memory>
 #include <functional>
 #include <unordered_map>
@@ -366,11 +364,7 @@ struct ObjGroupManager : runtime::component::Component<ObjGroupManager> {
   );
 
   template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::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
@@ -50,8 +50,6 @@
 #include "vt/phase/phase_hook_enum.h"
 #include "vt/phase/phase_hook_id.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <unordered_map>
 #include <map>
 
@@ -182,12 +180,7 @@ struct PhaseManager : runtime::component::Component<PhaseManager> {
    */
   void runHooksManual(PhaseHook type);
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | cur_phase_
       | proxy_

diff --git 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 <checkpoint/checkpoint.h>
-
 #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<Pool> {
    */
   void finalize() override;
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | small_msg
       | medium_msg

diff --git a/src/vt/rdma/rdma.h b/src/vt/rdma/rdma.h
@@ -70,8 +70,6 @@
 
 #include "vt/collective/collective_scope.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <unordered_map>
 #include <cassert>
 
@@ -903,12 +901,7 @@ struct RDMAManager : runtime::component::Component<RDMAManager> {
   static void remoteChannel(ChannelMessage* msg);
   static void getInfoChannel(GetInfoChannel* msg);
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | cur_rdma_handler_
       | cur_ident_

diff --git 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 <checkpoint/checkpoint.h>
-
 namespace vt { namespace rdma {
 
 /** \file */
@@ -231,12 +229,7 @@ struct Manager : runtime::component::Component<Manager> {
 public:
   static std::unique_ptr<Manager> construct();
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -49,8 +49,6 @@
 #include <unordered_map>
 #include <cassert>
 
-#include <checkpoint/checkpoint.h>
-
 #include "vt/config.h"
 #include "vt/activefn/activefn.h"
 #include "vt/handler/handler.h"
@@ -146,12 +144,7 @@ struct Registry : runtime::component::Component<Registry> {
    */
   ActiveClosureFnType getHandlerNoTag(HandlerType const han);
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | registered_
       | tagged_registered_

diff --git 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 <checkpoint/checkpoint.h>
-
 #include <cassert>
 #include <vector>
 #include <list>
@@ -266,12 +264,7 @@ struct Scheduler : runtime::component::Component<Scheduler> {
    */
   bool isIdleMinusTerm() const { return work_queue_.size() == num_term_msgs_; }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | work_queue_
       | has_executed_

diff --git 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 <checkpoint/checkpoint.h>
-
 #include <cstdint>
 #include <unordered_map>
 #include <unordered_set>
@@ -605,12 +603,7 @@ struct TerminationDetector :
   std::unordered_set<EpochType> const& getEpochReadySet() { return epoch_ready_; }
   std::unordered_set<EpochType> const& getEpochWaitSet() { return epoch_wait_status_; }
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -48,8 +48,6 @@
 #include "vt/timetrigger/trigger.h"
 #include "vt/runtime/component/component.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <chrono>
 #include <queue>
 #include <unordered_set>
@@ -108,12 +106,7 @@ struct TimeTriggerManager
    */
   void triggerReady(TimeType cur_time);
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   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
@@ -59,8 +59,6 @@
 #include "vt/activefn/activefn.h"
 #include "vt/vrt/vrt_common.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <cstdint>
 #include <memory>
 #include <vector>

diff --git 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 <checkpoint/checkpoint.h>
-
 #include <unordered_map>
 #include <functional>
 
@@ -171,12 +169,7 @@ struct LocationManager : runtime::component::Component<LocationManager> {
     LocInstType const inst, ActionLocInstType<LocType> action
   );
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | collectionLoc
       | cur_loc_inst

diff --git a/src/vt/trace/trace.h b/src/vt/trace/trace.h
@@ -54,8 +54,6 @@
 
 #include "vt/timing/timing.h"
 
-#include <checkpoint/checkpoint.h>
-
 #include <cassert>
 #include <cstdint>
 #include <functional>
@@ -507,12 +505,7 @@ struct Trace : runtime::component::Component<Trace> {
 
   friend void insertNewUserEvent(UserEventIDType event, std::string const& name);
 
-  template <
-    typename SerializerT,
-    typename = std::enable_if_t<
-      std::is_same<SerializerT, checkpoint::Footprinter>::value
-    >
-  >
+  template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | incremental_flush_mode
       | traces_