Skip to content

Commit 5c7b6bf

Browse files
committed
Don't print script invocation for every repetition
1 parent 0399e7d commit 5c7b6bf

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

benchmark/benchmark.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,20 @@
3232
results[test][instrumenter] = {}
3333

3434
if instrumenter == "None":
35-
enable_scorep = False
3635
scorep_settings = []
3736
else:
38-
enable_scorep = True
39-
scorep_settings = ["--instrumenter-type={}".format(instrumenter)]
37+
scorep_settings = ["-m", "scorep", "--instrumenter-type={}".format(instrumenter)]
4038

4139
print("#########")
4240
print("{}: {}".format(test, scorep_settings))
4341
print("#########")
42+
max_reps_width = len(str(max(reps_x[test])))
4443
for reps in reps_x[test]:
4544
times = bench.call(test, [reps],
46-
enable_scorep,
4745
scorep_settings=scorep_settings)
4846
times = np.array(times)
49-
print("{:>8}: Range={:{prec}}-{:{prec}} Mean={:{prec}} Median={:{prec}}".format(
50-
reps, times.min(), times.max(), times.mean(), np.median(times), prec='5.4f'))
47+
print("{:>{width}}: Range={:{prec}}-{:{prec}} Mean={:{prec}} Median={:{prec}}".format(
48+
reps, times.min(), times.max(), times.mean(), np.median(times), width=max_reps_width, prec='5.4f'))
5149
results[test][instrumenter][reps] = times
5250

5351
with open("results.pkl", "wb") as f:

benchmark/benchmark_helper.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ def __del__(self):
2121
self.exp_dir,
2222
ignore_errors=True)
2323

24-
def call(self, script="", ops=[], enable_scorep=True, scorep_settings=[]):
24+
def call(self, script, ops=[], scorep_settings=[]):
2525
self.env["SCOREP_EXPERIMENT_DIRECTORY"] = self.exp_dir + \
2626
"/{}-{}-{}".format(script, ops, scorep_settings)
2727

2828
arguments = [sys.executable]
29-
if enable_scorep:
30-
arguments.extend(["-m", "scorep"])
31-
arguments.extend(scorep_settings)
29+
arguments.extend(scorep_settings)
3230
arguments.append(script)
3331
arguments.extend(ops)
34-
print(arguments)
3532

3633
runtimes = []
3734
for _ in range(self.repetitions):

0 commit comments

Comments
 (0)