Skip to content

Commit 31b5280

Browse files
author
Theofilos Manitaras
authored
Merge branch 'master' into dependabot/pip/setuptools-65.3.0
2 parents f09bb1c + a3343d6 commit 31b5280

File tree

7 files changed

+42
-15
lines changed

7 files changed

+42
-15
lines changed

ci-scripts/ci-runner.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ checked_exec()
4141

4242
run_tutorial_checks()
4343
{
44+
export RFM_AUTODETECT_XTHOSTNAME=1
4445
cmd="./bin/reframe -C tutorials/config/settings.py -J account=jenscscs \
4546
--save-log-files --flex-alloc-nodes=2 -r -x HelloThreadedExtendedTest|BZip2.*Check $@"
4647
echo "[INFO] Running tutorial checks with \`$cmd'"
@@ -157,6 +158,7 @@ else
157158
# Run unit tests with the scheduler backends
158159
tempdir=$(mktemp -d -p $SCRATCH)
159160
echo "[INFO] Using temporary directory: $tempdir"
161+
export RFM_AUTODETECT_XTHOSTNAME=1
160162
if [[ $(hostname) =~ dom ]]; then
161163
PATH_save=$PATH
162164
export PATH=/apps/dom/UES/karakasv/slurm-wrappers/bin:$PATH

docs/config_reference.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,8 +862,10 @@ All logging handlers share the following set of common attributes:
862862
``%(check_executable)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.executable` attribute.
863863
``%(check_executable_opts)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.executable_opts` attribute.
864864
``%(check_extra_resources)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.extra_resources` attribute.
865-
``%(check_job_completion_time_unix)s``, The completion time of the associated run job (see :attr:`reframe.core.schedulers.Job.completion_time`).
865+
``%(check_hashcode)s``, The unique hash associated with this test.
866+
``%(check_info)s``, Various information about this test; essentially the return value of the test's :func:`~reframe.core.pipeline.RegressionTest.info` function.
866867
``%(check_job_completion_time)s``, Same as the ``(check_job_completion_time_unix)s`` but formatted according to ``datefmt``.
868+
``%(check_job_completion_time_unix)s``, The completion time of the associated run job (see :attr:`reframe.core.schedulers.Job.completion_time`).
867869
``%(check_job_exitcode)s``, The exit code of the associated run job.
868870
``%(check_job_nodelist)s``, The list of nodes that the associated run job has run on.
869871
``%(check_jobid)s``, The ID of the associated run job.
@@ -881,13 +883,20 @@ All logging handlers share the following set of common attributes:
881883
``%(check_num_tasks_per_socket)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.num_tasks_per_socket` attribute.
882884
``%(check_outputdir)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.outputdir` attribute.
883885
``%(check_partition)s``, The name of the test's :attr:`~reframe.core.pipeline.RegressionTest.current_partition`.
884-
``%(check_perfvalues)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.perfvalues` attribute.
886+
``%(check_perf_lower_thres)s``, The lower threshold of the logged performance variable.
887+
``%(check_perf_ref)s``, The reference value of the logged performance variable.
888+
``%(check_perf_unit)s``, The measurement unit of the logged performance variable.
889+
``%(check_perf_upper)s``, The upper thresholds of the logged performance variable.
890+
``%(check_perf_value)s``, The actual value of the logged performance variable.
891+
``%(check_perf_var)s``, The name of the logged performance variable.
892+
``%(check_perfvalues)s``, All the performance variables of the test combined along with their values, references and thresholds.
885893
``%(check_postbuild_cmds)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.postbuild_cmds` attribute.
886894
``%(check_postrun_cmds)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.postrun_cmds` attribute.
887895
``%(check_prebuild_cmds)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.prebuild_cmds` attribute.
888896
``%(check_prefix)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.prefix` attribute.
889897
``%(check_prerun_cmds)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.prerun_cmds` attribute.
890898
``%(check_readonly_files)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.readonly_files` attribute.
899+
``%(check_short_name)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.short_name` attribute.
891900
``%(check_sourcepath)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.sourcepath` attribute.
892901
``%(check_sourcesdir)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.sourcesdir` attribute.
893902
``%(check_stagedir)s``, The value of the :attr:`~reframe.core.pipeline.RegressionTest.stagedir` attribute.

docs/manpage.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10321032
.. envvar:: RFM_AUTODETECT_FQDN
10331033

10341034
Use the fully qualified domain name as the hostname.
1035-
This is a boolean variable and defaults to ``1``.
1035+
This is a boolean variable and defaults to ``0``.
10361036

10371037

10381038
.. table::
@@ -1046,6 +1046,9 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10461046

10471047
.. versionadded:: 3.11.0
10481048

1049+
.. versionchanged:: 4.0.0
1050+
This variable now defaults to ``0``.
1051+
10491052

10501053
.. envvar:: RFM_AUTODETECT_METHOD
10511054

@@ -1071,7 +1074,7 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10711074

10721075
Use ``/etc/xthostname`` file, if present, to retrieve the current system's name.
10731076
If the file cannot be found, the hostname will be retrieved using the ``hostname`` command.
1074-
This is a boolean variable and defaults to ``1``.
1077+
This is a boolean variable and defaults to ``0``.
10751078

10761079
This option meaningful for Cray systems.
10771080

@@ -1086,6 +1089,8 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10861089

10871090
.. versionadded:: 3.11.0
10881091

1092+
.. versionchanged:: 4.0.0
1093+
This variable now defaults to ``0``.
10891094

10901095
.. envvar:: RFM_CHECK_SEARCH_PATH
10911096

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/frontend/cli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,9 @@ def main():
555555
dest='autodetect_fqdn',
556556
envvar='RFM_AUTODETECT_FQDN',
557557
action='store',
558-
default=True,
558+
default=False,
559559
type=typ.Bool,
560-
help='Use FQDN as host name'
560+
help='Use the full qualified domain name as host name'
561561
)
562562
argparser.add_argument(
563563
dest='autodetect_method',
@@ -570,9 +570,9 @@ def main():
570570
dest='autodetect_xthostname',
571571
envvar='RFM_AUTODETECT_XTHOSTNAME',
572572
action='store',
573-
default=True,
573+
default=False,
574574
type=typ.Bool,
575-
help="Use Cray's xthostname file to find the host name"
575+
help="Use Cray's xthostname file to retrieve the host name"
576576
)
577577
argparser.add_argument(
578578
dest='git_timeout',

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)