Removed any lingering use of 1 as feature to model

cyclops-community · Sep 19, 2023 · 6d60db9 · 6d60db9
1 parent f61f555
commit 6d60db9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/contraction/spctr_tsr.cxx b/src/contraction/spctr_tsr.cxx
@@ -378,7 +378,7 @@ namespace CTF_int {
 
     }
 
-    double tps_[] = {0.0, 1.0, (double)est_membw(nnz_frac_A, nnz_frac_B, nnz_frac_C), est_fp(nnz_frac_B, nnz_frac_B, nnz_frac_C)};
+    double tps_[] = {0.0, (double)est_membw(nnz_frac_A, nnz_frac_B, nnz_frac_C), est_fp(nnz_frac_B, nnz_frac_B, nnz_frac_C)};
    // Check if we need to execute this function for the sake of training
    bool bsr = true;
    switch (krnl_type){
@@ -550,7 +550,7 @@ namespace CTF_int {
     }
 
     double exe_time = MPI_Wtime() - st_time;
-    double tps[] = {exe_time, 1.0, (double)est_membw(nnz_frac_A, nnz_frac_B, nnz_frac_C), est_fp(nnz_frac_B, nnz_frac_B, nnz_frac_C)};
+    double tps[] = {exe_time, (double)est_membw(nnz_frac_A, nnz_frac_B, nnz_frac_C), est_fp(nnz_frac_B, nnz_frac_B, nnz_frac_C)};
     switch (krnl_type){
       case 0:
         if (is_custom){
@@ -1084,7 +1084,7 @@ namespace CTF_int {
     pi.pin(nnz, order, lens, divisor, pi_new);
 
     double exe_time = MPI_Wtime()-st_time;
-    double tps[] = {exe_time, 1.0, (double)nnz};
+    double tps[] = {exe_time, (double)nnz};
     pin_keys_mdl.observe(tps);
 
     TAU_FSTOP(spctr_pin_keys);
@@ -1109,7 +1109,7 @@ namespace CTF_int {
         }
         depin(sr_C, order, lens, divisor, nblk_C, virt_dim, phys_rank, new_C, new_nnz_C, size_blk_C, new_C, true);
         double exe_time = MPI_Wtime()-st_time;
-        double tps[] = {exe_time, 1.0, (double)nnz};
+        double tps[] = {exe_time, (double)nnz};
         pin_keys_mdl.observe(tps);
         break;
     }

diff --git a/src/interface/common.cxx b/src/interface/common.cxx
@@ -339,20 +339,20 @@ namespace CTF_int {
   }
 
   double CommData::estimate_bcast_time(int64_t msg_sz){
-    double ps[] = {1.0, log2((double)np), (double)msg_sz};
+    double ps[] = {log2((double)np), (double)msg_sz};
     return bcast_mdl.est_time(ps);
   }
 
   double CommData::estimate_allred_time(int64_t msg_sz, MPI_Op op){
-    double ps[] = {1.0, log2((double)np), (double)msg_sz*log2((double)(np))};
+    double ps[] = {log2((double)np), (double)msg_sz*log2((double)(np))};
     if (op >= MPI_MAX && op <= MPI_REPLACE)
       return allred_mdl.est_time(ps);
     else
       return allred_mdl_cst.est_time(ps);
   }
 
   double CommData::estimate_red_time(int64_t msg_sz, MPI_Op op){
-    double ps[] = {1.0, log2((double)np), (double)msg_sz*log2((double)(np))};
+    double ps[] = {log2((double)np), (double)msg_sz*log2((double)(np))};
     if (op >= MPI_MAX && op <= MPI_REPLACE)
       return red_mdl.est_time(ps);
     else

diff --git a/src/redistribution/dgtog_redist_ror.h b/src/redistribution/dgtog_redist_ror.h
@@ -712,7 +712,7 @@ void dgtog_reshuffle(int const *          sym,
   MPI_Barrier(ord_glb_comm.cm);
 #endif
   double exe_time = MPI_Wtime()-st_time;
-  double tps[] = {exe_time, 1.0, (double)log2(ord_glb_comm.np), (double)std::max(old_dist.size, new_dist.size)*log2(ord_glb_comm.np)*sr->el_size};
+  double tps[] = {exe_time, (double)log2(ord_glb_comm.np), (double)std::max(old_dist.size, new_dist.size)*log2(ord_glb_comm.np)*sr->el_size};
 
   // double-check
    dgtog_res_mdl.observe(tps);