Added unit test for new model update strategy

Author: giltirn

include/chimbuko/param/hbos_param.hpp

@@ -195,6 +195,9 @@ namespace chimbuko {
      * @brief Set the algorithm parameters from the input JSON structure
      */
     void set_json(const nlohmann::json &from) override;
+
+    bool operator==(const HbosParam &r) const;
+    inline bool operator!=(const HbosParam &r) const{ return !(*this == r); }
 
   private:
     /**

src/ad/ADOutlier.cpp

@@ -112,6 +112,7 @@ void ADOutlier::updateGlobalModel()
   timer.start();
 
   if ( m_sync_call_count %  m_global_model_sync_freq == 0 ){    
+    verboseStream << "ADOutlier performing synchronization of local and global model" << std::endl;
     PerfTimer utimer;
     utimer.start();
 
@@ -123,6 +124,8 @@ void ADOutlier::updateGlobalModel()
       m_perf->add("param_sent_MB", (double)msgsz.first / 1000000.0); // MB
       m_perf->add("param_recv_MB", (double)msgsz.second / 1000000.0); // MB
     }
+  }else{
+    verboseStream << "ADOutlier NOT synchronizing global model on this step" << std::endl;
   }
 
   ++m_sync_call_count;

src/param/hbos_param.cpp

@@ -224,3 +224,13 @@ void HbosParam::generate_histogram(const unsigned long func_id, const std::vecto
     verboseStream << hist << std::endl;
   }
 }
+
+
+bool HbosParam::operator==(const HbosParam &r) const{
+  for(auto it = r.m_hbosstats.begin(); it != r.m_hbosstats.end(); ++it){
+    auto lit = this->m_hbosstats.find(it->first);
+    if(lit == this->m_hbosstats.end()) return false;
+    if(lit->second != it->second) return false;
+  }
+  return true;
+}

test/unit_tests/ad/ADOutlier.cpp

@@ -48,6 +48,9 @@ class ADOutlierHBOSTest: public ADOutlierHBOS{
     ( (HbosParam*)m_param )->copy(p);
   }
 
+  HbosParam & get_local_parameters() const{ return *((HbosParam*)m_local_param); }
+
+  void test_updateGlobalModel(){ this->updateGlobalModel(); }
 };
 
 class ADOutlierCOPODTest: public ADOutlierCOPOD{
@@ -107,6 +110,67 @@ TEST(ADOutlierHBOSTestSyncParamWithoutPS, Works){
   EXPECT_EQ(local_params_ps.get_hbosstats(), g->get_hbosstats());
 }
 
+
+
+
+TEST(ADOutlierHBOSTestSyncParamFrequencyWithoutPS, Works){
+  HbosParam local_params_ps;
+
+  std::default_random_engine gen;
+  std::normal_distribution<double> dist(500.,100.), dist2(1000.,200.);
+
+  int N = 50;
+
+  ADOutlierHBOSTest outlier;
+  outlier.setGlobalModelSyncFrequency(3);
+
+  HbosParam &local_params = outlier.get_local_parameters();
+  HbosParam l, l2, g;
+  {
+    Histogram &h = l[0].getHistogram();
+    std::vector<double> runtime(N);
+    for(int i=0;i<N;i++) runtime[i] = dist(gen);
+    h.create_histogram(runtime);
+  }
+
+  const HbosParam & global_params = *( (HbosParam const*)outlier.get_global_parameters() );
+
+  //On first update we expect the global model to be set to be the same as the local model, then the local model flushed
+  local_params.assign(l);
+  g.assign(l);
+  outlier.test_updateGlobalModel();
+
+  EXPECT_EQ(g, global_params);
+  EXPECT_EQ(local_params.size(), 0);
+
+  //Second update should maintain the state of the local model
+  local_params.assign(l);
+  outlier.test_updateGlobalModel();
+
+  EXPECT_EQ(g, global_params);
+  EXPECT_EQ(local_params.size(), 1);
+  EXPECT_EQ(l, local_params);
+
+  //Third update we update the state of the local model as if we were adding new data, but the global model will again remain fixed
+  local_params.update(l);
+  l2.assign(l);
+  l2.update(l);
+  outlier.test_updateGlobalModel();
+  
+  EXPECT_EQ(g, global_params);
+  EXPECT_EQ(local_params.size(), 1);
+  EXPECT_EQ(l2, local_params);
+  
+  //Fourth update should update the global model and flush the local
+  local_params.update(l);
+  l2.update(l);
+  g.update(l2);
+  outlier.test_updateGlobalModel();
+  
+  EXPECT_EQ(g, global_params);
+  EXPECT_EQ(local_params.size(), 0);
+}
+
 TEST(ADOutlierSSTDTestSyncParamWithoutPS, Works){
   SstdParam local_params_ps;