Skip to content

Commit 4442e48

Browse files
author
JPRichings
committed
formatting
1 parent 827e262 commit 4442e48

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

tests/env/slurm_energy_check.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import reframe.utility.sanity as sn
1111
import numpy as np
1212

13+
1314
@rfm.simple_test
1415
class SlurmEnergy1nodeTest(rfm.RunOnlyRegressionTest):
1516
"""Checks the energy reporting with a delay"""
@@ -32,7 +33,7 @@ def assert_finished(self):
3233
def extract_perf(self):
3334
"""Extract energy from counters to compare with slurm and check diff is zero"""
3435
jobid = self.job.jobid
35-
#print("jobid: ", jobid)
36+
# print("jobid: ", jobid)
3637
slurm = rfm.utility.osext.run_command(
3738
"sacct -j " + str(jobid) + " --format=JobID,ConsumedEnergy --noconvert | tr '\n' ' ' ",
3839
check=True,
@@ -62,7 +63,6 @@ def extract_perf(self):
6263
return diff
6364

6465

65-
6666
@rfm.simple_test
6767
class SlurmEnergy4nodesTest(rfm.RunOnlyRegressionTest):
6868
"""Checks the energy reporting with a delay"""
@@ -75,7 +75,6 @@ class SlurmEnergy4nodesTest(rfm.RunOnlyRegressionTest):
7575
num_nodes = 4
7676
num_tasks_per_node = 1
7777
num_tasks = num_nodes * num_tasks_per_node
78-
7978

8079
tags = {"production", "maintenance", "craype"}
8180

@@ -90,56 +89,56 @@ def assert_finished(self):
9089
def extract_perf(self):
9190
"""Extract energy from counters to compare with slurm and check diff is zero"""
9291
jobid = self.job.jobid
93-
#print("jobid: ", jobid)
92+
# print("jobid: ", jobid)
9493
slurm = rfm.utility.osext.run_command(
9594
"sacct -j " + str(jobid) + " --format=JobID,ConsumedEnergy --noconvert | tr '\n' ' ' ",
9695
check=True,
9796
shell=True,
9897
)
99-
print("slurm: ", slurm.stdout)
98+
# print("slurm: ", slurm.stdout)
10099

101100
nodelist_raw = rfm.utility.osext.run_command(
102101
"ls nid* | tr '\n' ',' | sed 's/,$//g'",
103102
check=True,
104103
shell=True,
105104
)
106105

107-
#print("nodelist output: ", nodelist_raw.stdout)
106+
# print("nodelist output: ", nodelist_raw.stdout)
108107

109108
nodelist = list(nodelist_raw.stdout.split(","))
110109

111-
#print("nodelist: ", nodelist)
110+
# print("nodelist: ", nodelist)
112111

113112
energy_data = []
114113

115114
energy_counters = []
116115

117116
for i, nodeid in enumerate(nodelist):
118-
energy_data.append(sn.extractall(r"(?P<energy>[0-9]+)\sJ\s(?P<time>[0-9]+)\sus", nodeid , "energy"))
117+
energy_data.append(sn.extractall(r"(?P<energy>[0-9]+)\sJ\s(?P<time>[0-9]+)\sus", nodeid, "energy"))
119118

120119
for i, energy in enumerate(energy_data):
121120
energy_counters.append(int(str(energy[0])))
122121
energy_counters.append(int(str(energy[1])))
123122

124-
#print("energy counters: ", energy_counters)
123+
# print("energy counters: ", energy_counters)
125124

126125
energy_slurm = sn.extractall_s(
127126
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]+)",
128127
str(slurm.stdout),
129128
"energy",
130129
)
131-
#print("energy slurm: ", energy_slurm)
130+
# print("energy slurm: ", energy_slurm)
132131

133132
energy_counters_diff = 0
134133

135134
for i in np.arange(0, len(energy_counters), 2):
136-
print(energy_counters[i+1] - energy_counters[i])
137-
energy_counters_diff+=energy_counters[i+1] - energy_counters[i]
135+
# print(energy_counters[i + 1] - energy_counters[i])
136+
energy_counters_diff += energy_counters[i + 1] - energy_counters[i]
138137

139-
#print("energy counters diff: ", energy_counters_diff)
138+
# print("energy counters diff: ", energy_counters_diff)
140139

141140
diff = energy_counters_diff - int(str(energy_slurm[0]))
142141

143-
#print("diff: ", diff)
142+
# print("diff: ", diff)
144143

145144
return diff

0 commit comments

Comments
 (0)