#1934: Reaply interface changes after rebase

DARMA-tasking · Dec 11, 2023 · e91de3d · e91de3d
1 parent bdbfbdf
commit e91de3d
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 68 deletions.
diff --git a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc
@@ -169,8 +169,8 @@ void LBManager::setLoadModel(std::shared_ptr<LoadModel> model) {
 
   model_ = model;
   model_->setLoads(nlb_data->getNodeLoad(),
+                   nlb_data->getNodeComm(),
                    nlb_data->getUserData());
-                   nlb_data->getNodeComm());
 
   // Adjust buffers size on the objs in collection
   runInEpochCollective("LBManager: setLoadModel", [=] {

diff --git a/src/vt/vrt/collection/balance/model/comm_overhead.cc b/src/vt/vrt/collection/balance/model/comm_overhead.cc
@@ -54,9 +54,9 @@ CommOverhead::CommOverhead(
     per_byte_weight_(in_per_byte_weight)
 { }
 
-void CommOverhead::setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                            std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                            std::unordered_map<PhaseType, DataMapType> const* user_data) {
+void CommOverhead::setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                            vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                            vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) {
   proc_comm_ = proc_comm;
   ComposedModel::setLoads(proc_load, proc_comm, user_data);
 }

diff --git a/src/vt/vrt/collection/balance/model/comm_overhead.h b/src/vt/vrt/collection/balance/model/comm_overhead.h
@@ -65,9 +65,9 @@ struct CommOverhead : public ComposedModel {
     LoadType in_per_byte_weight
   );
 
-  void setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                std::unordered_map<PhaseType, DataMapType> const* user_data) override;
+  void setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) override;
 
   LoadType getModeledLoad(ElementIDStruct object, PhaseOffset when) const override;
 

diff --git a/src/vt/vrt/collection/balance/model/composed_model.cc b/src/vt/vrt/collection/balance/model/composed_model.cc
@@ -45,9 +45,9 @@
 
 namespace vt { namespace vrt { namespace collection { namespace balance {
 
-void ComposedModel::setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                             std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                             std::unordered_map<PhaseType, DataMapType> const* user_data) {
+void ComposedModel::setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                             vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                             vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) {
   base_->setLoads(proc_load, proc_comm, user_data);
 }
 

diff --git a/src/vt/vrt/collection/balance/model/composed_model.h b/src/vt/vrt/collection/balance/model/composed_model.h
@@ -64,9 +64,9 @@ class ComposedModel : public LoadModel
   // \param[in] base must not be null
   explicit ComposedModel(std::shared_ptr<LoadModel> base) : base_(base) {}
 
-  void setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                std::unordered_map<PhaseType, DataMapType> const* user_data) override;
+  void setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) override;
 
   void updateLoads(PhaseType last_completed_phase) override;
 

diff --git a/src/vt/vrt/collection/balance/model/load_model.h b/src/vt/vrt/collection/balance/model/load_model.h
@@ -196,9 +196,9 @@ struct LoadModel
    * passed a new model instance for a collection
    */
   virtual void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-    std::unordered_map<PhaseType, DataMapType> const* user_data
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data
   ) = 0;
 
   /**

diff --git a/src/vt/vrt/collection/balance/model/per_collection.cc b/src/vt/vrt/collection/balance/model/per_collection.cc
@@ -55,9 +55,9 @@ void PerCollection::addModel(CollectionID proxy, std::shared_ptr<LoadModel> mode
   models_[proxy] = model;
 }
 
-void PerCollection::setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                             std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                             std::unordered_map<PhaseType, DataMapType> const* user_data) {
+void PerCollection::setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                             vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                             vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) {
   for (auto& m : models_)
     m.second->setLoads(proc_load, proc_comm, user_data);
   ComposedModel::setLoads(proc_load, proc_comm, user_data);

diff --git a/src/vt/vrt/collection/balance/model/per_collection.h b/src/vt/vrt/collection/balance/model/per_collection.h
@@ -73,9 +73,9 @@ struct PerCollection : public ComposedModel
    */
   void addModel(CollectionID proxy, std::shared_ptr<LoadModel> model);
 
-  void setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                std::unordered_map<PhaseType, DataMapType> const* user_data) override;
+  void setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) override;
 
   void updateLoads(PhaseType last_completed_phase) override;
 

diff --git a/src/vt/vrt/collection/balance/model/raw_data.cc b/src/vt/vrt/collection/balance/model/raw_data.cc
@@ -50,9 +50,9 @@ void RawData::updateLoads(PhaseType last_completed_phase) {
   last_completed_phase_ = last_completed_phase;
 }
 
-void RawData::setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                       std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                       std::unordered_map<PhaseType, DataMapType> const* user_data)
+void RawData::setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                       vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                       vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data)
 {
   proc_load_ = proc_load;
   proc_comm_ = proc_comm;
@@ -118,7 +118,7 @@ ElmUserDataType RawData::getUserData(ElementIDStruct object, PhaseOffset offset)
            "RawData makes no predictions. Compose with NaivePersistence or some longer-range forecasting model as needed");
 
   auto phase = getNumCompletedPhases() + offset.phases;
-  if (user_data_->find(phase) != user_data_->end()) {
+  if (user_data_->contains(phase)) {
     auto& phase_data = user_data_->at(phase);
     if (phase_data.find(object) != phase_data.end()) {
       return phase_data.at(object);

diff --git a/src/vt/vrt/collection/balance/model/raw_data.h b/src/vt/vrt/collection/balance/model/raw_data.h
@@ -65,9 +65,9 @@ struct RawData : public LoadModel {
   bool hasUserData() const override { return user_data_ != nullptr; }
   ElmUserDataType getUserData(ElementIDStruct object, PhaseOffset when) const override;
 
-  void setLoads(std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-                std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-                std::unordered_map<PhaseType, DataMapType> const* user_data) override;
+  void setLoads(vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+                vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+                vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data) override;
 
   ObjectIterator begin() const override;
 
@@ -77,9 +77,9 @@ struct RawData : public LoadModel {
   unsigned int getNumPastPhasesNeeded(unsigned int look_back) const override;
 
   // Observer pointers to the underlying data. In operation, these would be owned by NodeLBData
-  std::unordered_map<PhaseType, LoadMapType>         const* proc_load_;
-  std::unordered_map<PhaseType, CommMapType>         const* proc_comm_;
-  std::unordered_map<PhaseType, DataMapType>         const* user_data_;
+  vt::util::container::CircularPhasesBuffer<LoadMapType>         const* proc_load_;
+  vt::util::container::CircularPhasesBuffer<CommMapType>         const* proc_comm_;
+  vt::util::container::CircularPhasesBuffer<DataMapType>         const* user_data_;
   PhaseType last_completed_phase_ = ~0;
 }; // class RawData
 

diff --git a/src/vt/vrt/collection/balance/model/weighted_messages.h b/src/vt/vrt/collection/balance/model/weighted_messages.h
@@ -65,9 +65,9 @@ struct WeightedMessages : public ComposedModel {
       per_byte_weight_(in_per_byte_weight) { }
 
   void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const* proc_comm,
-    std::unordered_map<PhaseType, DataMapType> const* user_data
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const* proc_comm,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const* user_data
   ) override {
     proc_comm_ = proc_comm;
     ComposedModel::setLoads(proc_load, proc_comm, user_data);

diff --git a/tests/unit/collection/test_model_comm_overhead.nompi.cc b/tests/unit/collection/test_model_comm_overhead.nompi.cc
@@ -69,10 +69,10 @@ using vt::vrt::collection::balance::SubphaseLoadMapType;
 using vt::vrt::collection::balance::LoadMapObjectIterator;
 using vt::vrt::collection::balance::DataMapType;
 
-using ProcLoadMap = std::unordered_map<PhaseType, LoadMapType>;
-using ProcSubphaseLoadMap = std::unordered_map<PhaseType, SubphaseLoadMapType>;
-using ProcCommMap = std::unordered_map<PhaseType, CommMapType>;
-using UserDataMap = std::unordered_map<PhaseType, DataMapType>;
+using ProcLoadMap = vt::util::container::CircularPhasesBuffer<LoadMapType>;
+using ProcSubphaseLoadMap = vt::util::container::CircularPhasesBuffer<SubphaseLoadMapType>;
+using ProcCommMap = vt::util::container::CircularPhasesBuffer<CommMapType>;
+using UserDataMap = vt::util::container::CircularPhasesBuffer<DataMapType>;
 
 static auto num_phases = 0;
 

diff --git a/tests/unit/collection/test_model_linear_model.nompi.cc b/tests/unit/collection/test_model_linear_model.nompi.cc
@@ -73,9 +73,9 @@ struct StubModel : LoadModel {
   virtual ~StubModel() = default;
 
   void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const*,
-    std::unordered_map<PhaseType, DataMapType> const*) override {
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const*,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const*) override {
     proc_load_ = proc_load;
   }
 

diff --git a/tests/unit/collection/test_model_multiple_phases.nompi.cc b/tests/unit/collection/test_model_multiple_phases.nompi.cc
@@ -71,9 +71,9 @@ struct StubModel : LoadModel {
   virtual ~StubModel() = default;
 
   void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const*,
-    std::unordered_map<PhaseType, DataMapType> const*) override {
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const*,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const*) override {
     proc_load_ = proc_load;
   }
 

diff --git a/tests/unit/collection/test_model_naive_persistence.nompi.cc b/tests/unit/collection/test_model_naive_persistence.nompi.cc
@@ -75,9 +75,9 @@ struct StubModel : LoadModel {
   virtual ~StubModel() = default;
 
   void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const*,
-    std::unordered_map<PhaseType, DataMapType> const*) override {
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const*,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const*) override {
     proc_load_ = proc_load;
   }
 

diff --git a/tests/unit/collection/test_model_norm.nompi.cc b/tests/unit/collection/test_model_norm.nompi.cc
@@ -66,10 +66,10 @@ using vt::vrt::collection::balance::SubphaseLoadMapType;
 using vt::vrt::collection::balance::LoadMapObjectIterator;
 using vt::vrt::collection::balance::DataMapType;
 
-using ProcLoadMap = std::unordered_map<PhaseType, LoadMapType>;
-using ProcSubphaseLoadMap = std::unordered_map<PhaseType, SubphaseLoadMapType>;
-using ProcCommMap = std::unordered_map<PhaseType, CommMapType>;
-using UserDataMap = std::unordered_map<PhaseType, DataMapType>;
+using ProcLoadMap = vt::util::container::CircularPhasesBuffer<LoadMapType>;
+using ProcSubphaseLoadMap = vt::util::container::CircularPhasesBuffer<SubphaseLoadMapType>;
+using ProcCommMap = vt::util::container::CircularPhasesBuffer<CommMapType>;
+using UserDataMap = vt::util::container::CircularPhasesBuffer<DataMapType>;
 
 constexpr auto num_subphases = 3;
 

diff --git a/tests/unit/collection/test_model_persistence_median_last_n.nompi.cc b/tests/unit/collection/test_model_persistence_median_last_n.nompi.cc
@@ -73,9 +73,9 @@ struct StubModel : LoadModel {
   virtual ~StubModel() = default;
 
   void setLoads(
-    std::unordered_map<PhaseType, LoadMapType> const* proc_load,
-    std::unordered_map<PhaseType, CommMapType> const*,
-    std::unordered_map<PhaseType, DataMapType> const*) override {
+    vt::util::container::CircularPhasesBuffer<LoadMapType> const* proc_load,
+    vt::util::container::CircularPhasesBuffer<CommMapType> const*,
+    vt::util::container::CircularPhasesBuffer<DataMapType> const*) override {
     proc_load_ = proc_load;
   }
 

diff --git a/tests/unit/collection/test_model_raw_data.nompi.cc b/tests/unit/collection/test_model_raw_data.nompi.cc
@@ -70,7 +70,7 @@ TEST_F(TestRawData, test_model_raw_data_scalar) {
   auto test_model =
     std::make_shared<RawData>();
 
-  std::unordered_map<PhaseType, LoadMapType> proc_loads;
+  vt::util::container::CircularPhasesBuffer<LoadMapType> proc_loads;
   test_model->setLoads(&proc_loads, nullptr, nullptr);
   EXPECT_TRUE(test_model->hasRawLoad());
   EXPECT_FALSE(test_model->hasUserData());  // because passed a nullptr
@@ -129,8 +129,8 @@ TEST_F(TestRawData, test_model_raw_user_data) {
   auto test_model =
     std::make_shared<RawData>();
 
-  std::unordered_map<PhaseType, LoadMapType> proc_loads;
-  std::unordered_map<PhaseType, DataMapType> user_data;
+  vt::util::container::CircularPhasesBuffer<LoadMapType> proc_loads;
+  vt::util::container::CircularPhasesBuffer<DataMapType> user_data;
   test_model->setLoads(&proc_loads, nullptr, &user_data);
   EXPECT_TRUE(test_model->hasRawLoad());
   EXPECT_TRUE(test_model->hasUserData());

diff --git a/tests/unit/collection/test_model_select_subphases.nompi.cc b/tests/unit/collection/test_model_select_subphases.nompi.cc
@@ -65,10 +65,10 @@ using vt::vrt::collection::balance::SubphaseLoadMapType;
 using vt::vrt::collection::balance::LoadMapObjectIterator;
 using vt::vrt::collection::balance::DataMapType;
 
-using ProcLoadMap = std::unordered_map<PhaseType, LoadMapType>;
-using ProcSubphaseLoadMap = std::unordered_map<PhaseType, SubphaseLoadMapType>;
-using ProcCommMap = std::unordered_map<PhaseType, CommMapType>;
-using UserDataMap = std::unordered_map<PhaseType, DataMapType>;
+using ProcLoadMap = vt::util::container::CircularPhasesBuffer<LoadMapType>;
+using ProcSubphaseLoadMap = vt::util::container::CircularPhasesBuffer<SubphaseLoadMapType>;
+using ProcCommMap = vt::util::container::CircularPhasesBuffer<CommMapType>;
+using UserDataMap = vt::util::container::CircularPhasesBuffer<DataMapType>;
 
 constexpr auto num_subphases = 3;
 

diff --git a/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc b/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc
@@ -69,9 +69,9 @@ using vt::vrt::collection::balance::PhaseOffset;
 using vt::vrt::collection::balance::LoadMapObjectIterator;
 using vt::vrt::collection::balance::DataMapType;
 
-using ProcLoadMap = std::unordered_map<PhaseType, LoadMapType>;
-using ProcCommMap = std::unordered_map<PhaseType, CommMapType>;
-using UserDataMap = std::unordered_map<PhaseType, DataMapType>;
+using ProcLoadMap = vt::util::container::CircularPhasesBuffer<LoadMapType>;
+using ProcCommMap = vt::util::container::CircularPhasesBuffer<CommMapType>;
+using UserDataMap = vt::util::container::CircularPhasesBuffer<DataMapType>;
 
 static auto num_phases = 0;
 

diff --git a/tests/unit/collection/test_model_weighted_messages.nompi.cc b/tests/unit/collection/test_model_weighted_messages.nompi.cc
@@ -67,9 +67,9 @@ using vt::vrt::collection::balance::PhaseOffset;
 using vt::vrt::collection::balance::LoadMapObjectIterator;
 using vt::vrt::collection::balance::DataMapType;
 
-using ProcLoadMap = std::unordered_map<PhaseType, LoadMapType>;
-using ProcCommMap = std::unordered_map<PhaseType, CommMapType>;
-using UserDataMap = std::unordered_map<PhaseType, DataMapType>;
+using ProcLoadMap = vt::util::container::CircularPhasesBuffer<LoadMapType>;
+using ProcCommMap = vt::util::container::CircularPhasesBuffer<CommMapType>;
+using UserDataMap = vt::util::container::CircularPhasesBuffer<DataMapType>;
 
 static auto num_phases = 0;