From ca8414c793e29e935e6caaeb00a9a72ad861797f Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sat, 3 Sep 2022 10:47:21 +0200 Subject: [PATCH 1/2] WIP: perfvalues are not logged --- reframe/core/pipeline.py | 3 ++- tutorials/cscs-webinar-2022/config/mysettings.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reframe/core/pipeline.py b/reframe/core/pipeline.py index 4911cff8df..41fc9cbe36 100644 --- a/reframe/core/pipeline.py +++ b/reframe/core/pipeline.py @@ -1268,7 +1268,8 @@ def set_var_default(self, name, value): @loggable @property def perfvalues(self): - return util.MappingView(self._perfvalues) + return self._perfvalues + # return util.MappingView(self._perfvalues) @property def job(self): diff --git a/tutorials/cscs-webinar-2022/config/mysettings.py b/tutorials/cscs-webinar-2022/config/mysettings.py index 6713b2d28c..39ab15ae80 100644 --- a/tutorials/cscs-webinar-2022/config/mysettings.py +++ b/tutorials/cscs-webinar-2022/config/mysettings.py @@ -154,7 +154,7 @@ 'ref=%(check_perf_ref)s ' '(l=%(check_perf_lower_thres)s, ' 'u=%(check_perf_upper_thres)s)|' - '%(check_perf_unit)s' + '%(check_perf_unit)s|%(check_perfvalues)s' ), 'append': True } From 59513c4776a513a13a66a30a65bd58b5d466bddf Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sat, 3 Sep 2022 19:53:22 +0200 Subject: [PATCH 2/2] Fix logging of the `%(check_perfvalues)s` attribute --- reframe/core/pipeline.py | 3 +-- reframe/utility/__init__.py | 6 ++++++ tutorials/cscs-webinar-2022/config/mysettings.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reframe/core/pipeline.py b/reframe/core/pipeline.py index 41fc9cbe36..4911cff8df 100644 --- a/reframe/core/pipeline.py +++ b/reframe/core/pipeline.py @@ -1268,8 +1268,7 @@ def set_var_default(self, name, value): @loggable @property def perfvalues(self): - return self._perfvalues - # return util.MappingView(self._perfvalues) + return util.MappingView(self._perfvalues) @property def job(self): diff --git a/reframe/utility/__init__.py b/reframe/utility/__init__.py index 006a363234..5515ceb56b 100644 --- a/reframe/utility/__init__.py +++ b/reframe/utility/__init__.py @@ -1473,6 +1473,9 @@ def __repr__(self): def __str__(self): return str(self.__container) + def __rfm_json_encode__(self): + return self.__container + class MappingView(collections.abc.Mapping): '''A read-only view of a mapping. @@ -1535,3 +1538,6 @@ def __repr__(self): def __str__(self): return str(self.__mapping) + + def __rfm_json_encode__(self): + return self.__mapping diff --git a/tutorials/cscs-webinar-2022/config/mysettings.py b/tutorials/cscs-webinar-2022/config/mysettings.py index 39ab15ae80..6713b2d28c 100644 --- a/tutorials/cscs-webinar-2022/config/mysettings.py +++ b/tutorials/cscs-webinar-2022/config/mysettings.py @@ -154,7 +154,7 @@ 'ref=%(check_perf_ref)s ' '(l=%(check_perf_lower_thres)s, ' 'u=%(check_perf_upper_thres)s)|' - '%(check_perf_unit)s|%(check_perfvalues)s' + '%(check_perf_unit)s' ), 'append': True }