Skip to content

Commit e68ef06

Browse files
author
Vasileios Karakasis
authored
Merge pull request #791 from teojgo/feature/message_perf_vars
[feat] Print performance variable name in case of performance errors
2 parents 14fb2b0 + 14fbeb0 commit e68ef06

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

reframe/core/pipeline.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,14 +1134,20 @@ def check_performance(self):
11341134
"tag `%s' not resolved in references for `%s'" %
11351135
(tag, self._current_partition.fullname))
11361136

1137-
self._perfvalues[key] = (value, *self.reference[key])
1137+
self._perfvalues[key] = (tag, value, *self.reference[key])
11381138
self._perf_logger.log_performance(logging.INFO, tag, value,
11391139
*self.reference[key])
11401140

1141-
for val, *reference in self._perfvalues.values():
1142-
ref, low_thres, high_thres, *_ = reference
1141+
for values in self._perfvalues.values():
1142+
tag, val, ref, low_thres, high_thres, *_ = values
11431143
try:
1144-
evaluate(assert_reference(val, ref, low_thres, high_thres))
1144+
evaluate(
1145+
assert_reference(
1146+
val, ref, low_thres, high_thres,
1147+
msg=('failed to meet reference: %s={0}, '
1148+
'expected {1} (l={2}, u={3})' % tag),
1149+
)
1150+
)
11451151
except SanityError as e:
11461152
raise PerformanceError(e)
11471153

reframe/utility/sanity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ def calc_bound(thres):
514514
try:
515515
evaluate(assert_bounded(val, lower, upper))
516516
except SanityError:
517-
error_msg = '{0} is beyond reference value {1} (l={2}, u={3})'
517+
error_msg = msg or '{0} is beyond reference value {1} (l={2}, u={3})'
518518
raise SanityError(_format(error_msg, val, ref, lower, upper))
519519
else:
520520
return True

0 commit comments

Comments
 (0)