Merge branch 'master' into feature/no-src-dir-runonlytest

Author: Vasileios Karakasis

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017-2019, Swiss National Supercomputing Center (CSCS)
+Copyright (c) 2016-2020, Swiss National Supercomputing Center (CSCS/ETH Zurich)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

ci-scripts/genrelnotes.py

@@ -1,4 +1,9 @@
 #!/usr/bin/env python3
+#
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
 import collections
 import re

config/cscs-ci.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #
 # CSCS ReFrame CI settings
 #

config/cscs-pbs.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #
 # Minimal CSCS configuration for testing the PBS backend
 #

config/cscs.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #
 # CSCS ReFrame settings
 #

config/tiger.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #
 # CSCS ReFrame settings
 #

cscs-checks/analytics/spark/spark_check.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 import os
 import math
 
@@ -10,7 +15,6 @@
 @rfm.simple_test
 class SparkAnalyticsCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.descr = 'Simple calculation of pi with Spark'
         self.valid_systems = ['daint:gpu', 'daint:mc']
         self.valid_prog_environs = ['PrgEnv-cray']
@@ -21,17 +25,19 @@ def __init__(self):
                                     self.stdout, 'pi', float)
         self.sanity_patterns = sn.assert_lt(sn.abs(pi_value - math.pi), 0.01)
         self.maintainers = ['TM', 'TR']
-        self.tags = {'production', 'craype'}
+        self.tags = {'craype'}
 
-    def setup(self, partition, environ, **job_opts):
-        if partition.fullname == 'daint:gpu':
+    @rfm.run_after('setup')
+    def set_num_tasks(self):
+        if self.current_partition.fullname == 'daint:gpu':
             self.num_tasks = 48
             self.num_tasks_per_node = 12
         else:
             self.num_tasks = 72
             self.num_tasks_per_node = 18
 
-        super().setup(partition, environ, **job_opts)
+    @rfm.run_before('run')
+    def set_launcher(self):
         # The job launcher has to be changed since the `start_analytics`
         # script is not used with srun.
         self.job.launcher = getlauncher('local')()

cscs-checks/apps/amber/amber_check.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 import os
 
 import reframe as rfm
@@ -6,11 +11,8 @@
 
 class AmberBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, input_file, output_file):
-        super().__init__()
-
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'Amber')
-
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.modules = ['Amber']
         self.num_tasks = 1

cscs-checks/apps/cp2k/cp2k_check.py

@@ -1,11 +1,15 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 import os
 import reframe as rfm
 import reframe.utility.sanity as sn
 
 
 class Cp2kCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.executable = 'cp2k.psmp'
         self.executable_opts = ['H2O-256.inp']

cscs-checks/apps/cpmd/cpmd_check.py

@@ -1,3 +1,8 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 import reframe as rfm
 import reframe.utility.sanity as sn
 
@@ -6,7 +11,6 @@
 @rfm.parameterized_test(['small'], ['large'])
 class CPMDCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, scale):
-        super().__init__()
         self.descr = 'CPMD check (C4H6 metadynamics)'
         self.maintainers = ['AJ', 'LM']
         self.tags = {'production'}