Skip to content

Commit 884c9fa

Browse files
authored
Merge branch 'master' into feat/change-default-autodetection
2 parents b2de333 + 98315ef commit 884c9fa

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

hpctestlib/microbenchmarks/gpu/memory_bandwidth/src/memory_bandwidth.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ int main(int argc, char ** argv)
127127
}
128128
else if (str == "--size")
129129
{
130-
copy_size = std::stoi((std::string)argv[++i]);
130+
copy_size = std::stol((std::string)argv[++i]);
131131
}
132132
else if (str == "--copies")
133133
{
134-
num_copies = std::stoi((std::string)argv[++i]);
134+
num_copies = std::stol((std::string)argv[++i]);
135135
}
136136
else if (str == "--multi-gpu")
137137
{

reframe/core/pipeline.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -702,16 +702,21 @@ def pipeline_hooks(cls):
702702

703703
#: Patterns for verifying the performance of this test.
704704
#:
705-
#: Refer to the :doc:`ReFrame Tutorials </tutorials>` for concrete usage
706-
#: examples.
707-
#:
708705
#: If set to :class:`None`, no performance checking will be performed.
709706
#:
710707
#: :type: A dictionary with keys of type :class:`str` and deferrable
711708
#: expressions (i.e., the result of a :doc:`sanity function
712709
#: </deferrable_functions_reference>`) as values.
713710
#: :class:`None` is also allowed.
714711
#: :default: :class:`None`
712+
#:
713+
#: .. warning::
714+
#:
715+
#: You are advised to follow the new syntax for defining performance
716+
#: variables in your tests using either the :func:`@performance_function
717+
#: <reframe.core.builtins.performance_function>` builtin or the
718+
#: :attr:`perf_variables`, as :attr:`perf_patterns` will likely be
719+
#: deprecated in the future.
715720
perf_patterns = variable(typ.Dict[str, _DeferredExpression], type(None))
716721

717722
#: The performance variables associated with the test.
@@ -725,7 +730,7 @@ def pipeline_hooks(cls):
725730
#: By default, ReFrame will populate this field during the test's
726731
#: instantiation with all the member functions decorated with the
727732
#: :func:`@performance_function
728-
#: <reframe.core.pipeline.RegressionMixin.performance_function>` decorator.
733+
#: <reframe.core.builtins.performance_function>` decorator.
729734
#: If no performance functions are present in the class, no performance
730735
#: checking or reporting will be carried out.
731736
#:
@@ -743,7 +748,7 @@ def pipeline_hooks(cls):
743748
#: :ref:`deferrable-performance-functions`).
744749
#: :default: Collection of performance variables associated to each of
745750
#: the member functions decorated with the :func:`@performance_function
746-
#: <reframe.core.pipeline.RegressionMixin.performance_function>`
751+
#: <reframe.core.builtins.performance_function>`
747752
#: decorator.
748753
#:
749754
#: .. versionadded:: 3.8.0

reframe/utility/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,6 +1473,9 @@ def __repr__(self):
14731473
def __str__(self):
14741474
return str(self.__container)
14751475

1476+
def __rfm_json_encode__(self):
1477+
return self.__container
1478+
14761479

14771480
class MappingView(collections.abc.Mapping):
14781481
'''A read-only view of a mapping.
@@ -1535,3 +1538,6 @@ def __repr__(self):
15351538

15361539
def __str__(self):
15371540
return str(self.__mapping)
1541+
1542+
def __rfm_json_encode__(self):
1543+
return self.__mapping

0 commit comments

Comments
 (0)