@@ -55,15 +55,16 @@ def create_run_table_model(self) -> RunTableModel:
5555 """Create and return the run_table model here. A run_table is a List (rows) of tuples (columns),
5656 representing each run performed"""
5757 factor1 = FactorModel ("fib_type" , ['iter' , 'mem' , 'rec' ])
58- factor2 = FactorModel ("problem_size" , [10 , 20 , 30 ])
58+ factor2 = FactorModel ("problem_size" , [10 , 35 , 40 , 5000 , 10000 ])
5959 self .run_table_model = RunTableModel (
6060 factors = [factor1 , factor2 ],
6161 exclude_combinations = [
62- {factor2 : [10 ]}, # all runs having treatment "10" will be excluded
63- {factor1 : ['iter' ], factor2 : [30 ]}, # all runs having the combination ("iter", 30) will be excluded
62+ {factor2 : [10 ]}, # all runs having treatment "10" will be excluded
63+ {factor1 : ['rec' ], factor2 : [5000 , 10000 ]},
64+ {factor1 : ['mem' , 'iter' ], factor2 : [35 , 40 ]}, # all runs having the combination ("iter", 30) will be excluded
6465 ],
65- repetitions = 3 ,
66- data_columns = ["total_power (J) " , "runtime (sec) " , "avg_mem (bytes) " ]
66+ repetitions = 10 ,
67+ data_columns = ["energy " , "runtime" , "memory " ]
6768 )
6869 return self .run_table_model
6970
@@ -114,9 +115,9 @@ def populate_run_data(self, context: RunnerContext) -> Optional[Dict[str, Any]]:
114115 eb_log , eb_summary = self .profiler .parse_log (self .profiler .logfile ,
115116 self .profiler .summary_logfile )
116117
117- return {"total_power ( J)" : eb_summary [ "total_joules" ],
118- "runtime (sec) " : eb_summary ["runtime_seconds" ],
119- "total_mem (bytes) " : list (eb_log ["TOTAL_MEMORY " ].values ())[ - 1 ] }
118+ return {"energy" : list ( eb_log [ "PACKAGE_ENERGY ( J)"]. values ())[ - 1 ] - list ( eb_log [ "PACKAGE_ENERGY (J)" ]. values ())[ 0 ],
119+ "runtime" : eb_summary ["runtime_seconds" ],
120+ "memory " : max (eb_log ["USED_MEMORY " ].values ())}
120121
121122 def after_experiment (self ) -> None :
122123 """Perform any activity required after stopping the experiment here
0 commit comments