Removed HBOSOutlierTestBPFile and SSTDOutlierTestBPFile "unit tests" because they don't test anything!

Removed hacked-in output of some internal details of SSTD and HBOS/COPOD outlier detection in Anomalies output
ADLocalNetClient now records the rank index provided such that get_client_rank returns the right value
The above fixes GlobalAnomalyMetrics the unit test failing

Author: giltirn

include/chimbuko/ad/ADNetClient.hpp

@@ -218,7 +218,7 @@ namespace chimbuko{
     /**
      * @brief connect to the parameter server
      * 
-     * @param rank Ignored
+     * @param rank Stored as internal rank index
      * @param srank Ignored
      * @param sname Ignored
      */

include/chimbuko/util/Anomalies.hpp

@@ -17,21 +17,6 @@ namespace chimbuko{
      */
     void insert(CallListIterator_t event, EventType type);
 
-    /**
-     * @brief Insert used in HBOS for test purposes
-     */
-    void insert(CallListIterator_t event, EventType type, double runtime, double hbos_score, double threshold);
-
-    /**
-     * @brief Insert used in SSTD for test purposes
-     */
-    void insert(CallListIterator_t event, EventType type, std::vector<double> thres_hilo_mean_std);
-
-
-    const std::unordered_map<unsigned long, std::vector<std::vector<double> > > & allHbosScores() const{return m_func_outliers_hbos_scores_and_threshold;}
-
-    const std::unordered_map<unsigned long, std::vector<double> > & allSstdScores() const{return m_func_outliers_sstd_threshold_mean_std;}
-
     /**
      * @brief Get the outlier/normal events associated with a given function
      */
@@ -58,14 +43,6 @@ namespace chimbuko{
 
     std::vector<CallListIterator_t> m_all_normal_execs; /**< Array of normal executions (the algorithm will capture a limited number of these for comparison with outliers)*/
     std::unordered_map<unsigned long, std::vector<CallListIterator_t> > m_func_normal_execs; /**< Map of function index to associated normal executions */
-
-    std::unordered_map<unsigned long, std::vector<std::vector<double> > > m_func_outliers_hbos_scores_and_threshold; /**< Map of function index to a 2D vector where index 0: HBOS scores, index 1: threshold */
-
-    std::unordered_map<unsigned long, std::vector<double> > m_func_outliers_sstd_threshold_mean_std; /**< Map of function index to a 2D vector where index 0: HBOS scores, index 1: threshold */
   };
 
-
-
-
-
 };

src/ad/ADLocalAnomalyMetrics.cpp

@@ -62,7 +62,7 @@ std::pair<size_t, size_t> ADLocalAnomalyMetrics::send(ADNetClient &net_client) c
   if (!net_client.use_ps())
     return std::make_pair(0, 0);
 
-  if(net_client.get_client_rank() != m_rank) fatal_error("Rank mismatch");
+  if(net_client.get_client_rank() != m_rank) fatal_error("Rank mismatch: net client reported rank " + std::to_string(net_client.get_client_rank()) + " but recorded rank is " + std::to_string(m_rank) );
 
   Message msg;
   msg.set_info(m_rank, net_client.get_server_rank(), MessageType::REQ_ADD, MessageKind::ANOMALY_METRICS, m_step);

src/ad/ADNetClient.cpp

@@ -241,6 +241,8 @@ std::string ADMPINetClient::send_and_receive(const Message &msg){
 void ADLocalNetClient::connect_ps(int rank, int srank, std::string sname){
   if(LocalNet::globalInstance() == nullptr) fatal_error("No LocalNet instance exists");
   m_use_ps = true;
+  m_srank = 0;
+  m_rank = rank;
 }
 
 

src/ad/ADOutlier.cpp

@@ -242,8 +242,7 @@ unsigned long ADOutlierSSTD::compute_outliers(Anomalies &outliers,
 	verboseStream << "!!!!!!!Detected outlier on func id " << func_id << " (" << itt->get_funcname() << ") on thread " << itt->get_tid()
 		      << " runtime " << runtime << " mean " << mean << " std " << std << std::endl;
 	n_outliers += 1;
-  	std::vector<double> sstd_stats{thr_hi, thr_lo, mean, std};
-	outliers.insert(itt, Anomalies::EventType::Outlier, sstd_stats); //insert into data structure containing captured anomalies
+	outliers.insert(itt, Anomalies::EventType::Outlier); //insert into data structure containing captured anomalies
       }else{
 	//Capture maximum of one normal execution per io step
 	if(outliers.nFuncEvents(func_id, Anomalies::EventType::Normal) == 0){
@@ -509,7 +508,7 @@ unsigned long ADOutlierHBOS::compute_outliers(Anomalies &outliers,
       if (ad_score >= l_threshold) {
 	itt->set_label(-1);
 	verboseStream << "!!!!!!!Detected outlier on func id " << func_id << " (" << itt->get_funcname() << ") on thread " << itt->get_tid() << " runtime " << runtime_i << " score " << ad_score << " (threshold " << l_threshold << ")" << std::endl;
-	outliers.insert(itt, Anomalies::EventType::Outlier, runtime_i, ad_score, l_threshold); //insert into data structure containing captured anomalies
+	outliers.insert(itt, Anomalies::EventType::Outlier); //insert into data structure containing captured anomalies
 	n_outliers += 1;
       }else {
         //Capture maximum of one normal execution per io step
@@ -750,7 +749,7 @@ unsigned long ADOutlierCOPOD::compute_outliers(Anomalies &outliers,
       if (ad_score >= l_threshold) {
 	itt->set_label(-1);
 	verboseStream << "!!!!!!!Detected outlier on func id " << func_id << " (" << itt->get_funcname() << ") on thread " << itt->get_tid() << " runtime " << runtime_i << std::endl;
-	outliers.insert(itt, Anomalies::EventType::Outlier, runtime_i, ad_score, l_threshold); //insert into data structure containing captured anomalies
+	outliers.insert(itt, Anomalies::EventType::Outlier); //insert into data structure containing captured anomalies
 	++n_outliers;
       }
       else {

src/util/Anomalies.cpp

@@ -17,47 +17,6 @@ void Anomalies::insert(CallListIterator_t event, EventType type){
   }
 }
 
-void Anomalies::insert(CallListIterator_t event, EventType type, double runtime, double hbos_score, double threshold) {
-  switch(type){
-  case EventType::Outlier:
-    m_all_outliers.push_back(event);
-    m_func_outliers[event->get_fid()].push_back(event);
-    if(m_func_outliers_hbos_scores_and_threshold[event->get_fid()].size() == 0) {
-      m_func_outliers_hbos_scores_and_threshold[event->get_fid()] = std::vector<std::vector<double> >(3);
-    }
-    m_func_outliers_hbos_scores_and_threshold[event->get_fid()].at(0).push_back(runtime);
-    m_func_outliers_hbos_scores_and_threshold[event->get_fid()].at(1).push_back(hbos_score);
-    m_func_outliers_hbos_scores_and_threshold[event->get_fid()].at(2).push_back(threshold);
-    break;
-  case EventType::Normal:
-    m_all_normal_execs.push_back(event);
-    m_func_normal_execs[event->get_fid()].push_back(event);
-    break;
-  default:
-    throw std::runtime_error("Invalid type");
-  }
-}
-
-void Anomalies::insert(CallListIterator_t event, EventType type, std::vector<double> thres_hilo_mean_std) {
-  switch(type){
-  case EventType::Outlier:
-    m_all_outliers.push_back(event);
-    m_func_outliers[event->get_fid()].push_back(event);
-
-    m_func_outliers_sstd_threshold_mean_std[event->get_fid()].push_back(thres_hilo_mean_std[0]);
-    m_func_outliers_sstd_threshold_mean_std[event->get_fid()].push_back(thres_hilo_mean_std[1]);
-    m_func_outliers_sstd_threshold_mean_std[event->get_fid()].push_back(thres_hilo_mean_std[2]);
-    m_func_outliers_sstd_threshold_mean_std[event->get_fid()].push_back(thres_hilo_mean_std[3]);
-    break;
-  case EventType::Normal:
-    m_all_normal_execs.push_back(event);
-    m_func_normal_execs[event->get_fid()].push_back(event);
-    break;
-  default:
-    throw std::runtime_error("Invalid type");
-  }
-}
-
 const std::vector<CallListIterator_t> & Anomalies::funcEvents(const unsigned long func_id, EventType type) const{
   static std::vector<CallListIterator_t> empty;
   auto const &mp = type == EventType::Outlier ? m_func_outliers : m_func_normal_execs;