@@ -33,33 +33,24 @@ def assert_finished(self):
3333 def extract_perf (self ):
3434 """Extract energy from counters to compare with slurm and check diff is zero"""
3535 jobid = self .job .jobid
36- # print("jobid: ", jobid)
36+ slurm = rfm . utility . osext . run_command (
3737 slurm = rfm .utility .osext .run_command (
3838 "sacct -j " + str (jobid ) + " --format=JobID,ConsumedEnergy --noconvert | tr '\n ' ' ' " ,
3939 check = True ,
4040 shell = True ,
4141 )
42- # print("slurm: ", slurm.stdout)
43-
4442 energy_counters = sn .extractall (r"(?P<energy>[0-9]+)\sJ\s(?P<time>[0-9]+)\sus" , self .stdout , "energy" )
4543
46- # print("energy counters: ", energy_counters)
47-
4844 energy_slurm = sn .extractall_s (
4945 r"JobID\s+ConsumedEnergy\s+------------ --------------\s+[0-9]+\s+[0-9]+\s+[0-9]+.bat\+\s+[0-9]+\s+[0-9]+.ext\+\s+[0-9]+\s+[0-9]+.0\s+(?P<energy>[0-9]+)" ,
5046 str (slurm .stdout ),
5147 "energy" ,
5248 )
53- # print("energy slurm: ", energy_slurm)
5449
5550 energy_counters_diff = int (str (energy_counters [1 ])) - int (str (energy_counters [0 ]))
5651
57- # print("energy counters diff: ", energy_counters_diff)
58-
5952 diff = energy_counters_diff - int (str (energy_slurm [0 ]))
6053
61- # print("diff: ", diff)
62-
6354 return diff
6455
6556
@@ -89,25 +80,20 @@ def assert_finished(self):
8980 def extract_perf (self ):
9081 """Extract energy from counters to compare with slurm and check diff is zero"""
9182 jobid = self .job .jobid
92- # print("jobid: ", jobid)
9383 slurm = rfm .utility .osext .run_command (
9484 "sacct -j " + str (jobid ) + " --format=JobID,ConsumedEnergy --noconvert | tr '\n ' ' ' " ,
9585 check = True ,
9686 shell = True ,
9787 )
98- # print("slurm: ", slurm.stdout)
9988
10089 nodelist_raw = rfm .utility .osext .run_command (
10190 "ls nid* | tr '\n ' ',' | sed 's/,$//g'" ,
10291 check = True ,
10392 shell = True ,
10493 )
10594
106- # print("nodelist output: ", nodelist_raw.stdout)
107-
10895 nodelist = list (nodelist_raw .stdout .split ("," ))
10996
110- # print("nodelist: ", nodelist)
11197
11298 energy_data = []
11399
@@ -120,23 +106,17 @@ def extract_perf(self):
120106 energy_counters .append (int (str (energy [0 ])))
121107 energy_counters .append (int (str (energy [1 ])))
122108
123- # print("energy counters: ", energy_counters)
124-
125109 energy_slurm = sn .extractall_s (
126110 r"JobID\s+ConsumedEnergy\s+------------ --------------\s+[0-9]+\s+[0-9]+\s+[0-9]+.bat\+\s+[0-9]+\s+[0-9]+.ext\+\s+[0-9]+\s+[0-9]+.0\s+(?P<energy>[0-9]+)" ,
127111 str (slurm .stdout ),
128112 "energy" ,
129113 )
130- # print("energy slurm: ", energy_slurm)
131114
132115 energy_counters_diff = 0
133116
134117 for i in np .arange (0 , len (energy_counters ), 2 ):
135- # print(energy_counters[i + 1] - energy_counters[i])
136118 energy_counters_diff += energy_counters [i + 1 ] - energy_counters [i ]
137119
138120 diff = energy_counters_diff - int (str (energy_slurm [0 ]))
139121
140- # print("diff: ", diff)
141-
142122 return diff
0 commit comments