Merge pull request #1824 from teojgo/test/required_version_semver

Vasileios Karakasis · web-flow · commit b780dd63709a · 2021-03-08T23:14:00.000+01:00
[test] Remove `@required_version` decorator from tests
diff --git a/cscs-checks/apps/amber/amber_check.py b/cscs-checks/apps/amber/amber_check.py
@@ -43,7 +43,6 @@ def __init__(self, input_file, output_file):
         self.tags = {'scs', 'external-resources'}
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(*(
     [variant, arch, scale]
     for variant in ['prod', 'maint']
diff --git a/cscs-checks/apps/cp2k/cp2k_check.py b/cscs-checks/apps/cp2k/cp2k_check.py
@@ -126,11 +126,12 @@ def __init__(self, scale, variant):
     @rfm.run_before('run')
     def set_task_distribution(self):
         self.job.options = ['--distribution=block:block']
- 
+
     @rfm.run_before('run')
     def set_cpu_binding(self):
         self.job.launcher.options = ['--cpu-bind=cores']
 
+
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['maint', 'prod']))
diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(['small'], ['large'])
 class CPMDCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, scale):
diff --git a/cscs-checks/apps/greasy/greasy_check.py b/cscs-checks/apps/greasy/greasy_check.py
@@ -16,7 +16,6 @@ def to_seconds(str):
             datetime.strptime('00:00:00', '%H:%M:%S')).total_seconds()
 
 
-@rfm.required_version('>=2.19')
 @rfm.parameterized_test(
     ['serial',     'gpu', 24, 12, 1, 1],
     ['serial',     'mc',  72, 36, 1, 1],
@@ -39,7 +38,7 @@ def __init__(self, variant, partition, num_greasy_tasks, nworkes_per_node,
         # sleep enough time to distinguish if the files are running in parallel
         # or not
         self.sleep_time = 60
-        self.build_system.cflags = ['-DSLEEP_TIME=%d' % self.sleep_time]
+        self.build_system.cflags = [f'-DSLEEP_TIME={self.sleep_time:d}']
         self.variant = variant
         if variant == 'openmp':
             self.build_system.cflags += ['-fopenmp']
diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py
@@ -53,7 +53,6 @@ def __init__(self, output_file):
         self.tags = {'scs', 'external-resources'}
 
 
-@rfm.required_version('>=2.19')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['prod', 'maint']))
@@ -96,7 +95,6 @@ def __init__(self, scale, variant):
         self.tags |= {'maintenance' if variant == 'maint' else 'production'}
 
 
-@rfm.required_version('>=2.19')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['prod']))
diff --git a/cscs-checks/apps/lammps/lammps_check.py b/cscs-checks/apps/lammps/lammps_check.py
@@ -44,7 +44,6 @@ def __init__(self):
         self.maintainers = ['TR', 'VH']
 
 
-@rfm.required_version('>=2.16.0')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['prod', 'maint']))
@@ -88,7 +87,6 @@ def __init__(self, scale, variant):
         self.tags |= {'maintenance' if variant == 'maint' else 'production'}
 
 
-@rfm.required_version('>=2.16.0')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['prod']))
diff --git a/cscs-checks/apps/namd/namd_check.py b/cscs-checks/apps/namd/namd_check.py
@@ -11,11 +11,12 @@
 
 class NamdBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, arch, scale, variant):
-        self.descr = 'NAMD check (%s, %s)' % (arch, variant)
+        self.descr = f'NAMD check ({arch}, {variant})'
         if self.current_system.name == 'pilatus':
             self.valid_prog_environs = ['cpeIntel']
         else:
             self.valid_prog_environs = ['builtin']
+
         self.modules = ['NAMD']
 
         # Reset sources dir relative to the SCS apps prefix
@@ -70,7 +71,6 @@ def __init__(self, arch, scale, variant):
         }
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['maint', 'prod']))
@@ -94,7 +94,6 @@ def __init__(self, scale, variant):
             }
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['maint', 'prod']))
diff --git a/cscs-checks/apps/python/numpy_check.py b/cscs-checks/apps/python/numpy_check.py
@@ -74,7 +74,6 @@ def __init__(self):
         self.maintainers = ['RS', 'TR']
 
 
-@rfm.required_version('>=2.16')
 @rfm.simple_test
 class NumpyHaswellTest(NumpyBaseTest):
     def __init__(self):
@@ -83,7 +82,6 @@ def __init__(self):
         self.num_cpus_per_task = 12
 
 
-@rfm.required_version('>=2.16')
 @rfm.simple_test
 class NumpyBroadwellTest(NumpyBaseTest):
     def __init__(self):
diff --git a/cscs-checks/apps/quantumespresso/quantumespresso_check.py b/cscs-checks/apps/quantumespresso/quantumespresso_check.py
@@ -131,6 +131,7 @@ def set_task_distribution(self):
     def set_cpu_binding(self):
         self.job.launcher.options = ['--cpu-bind=cores']
 
+
 @rfm.parameterized_test(*([s, v]
                           for s in ['small', 'large']
                           for v in ['maint', 'prod']))
diff --git a/cscs-checks/apps/tensorflow/tf2_horovod_check.py b/cscs-checks/apps/tensorflow/tf2_horovod_check.py
@@ -8,7 +8,6 @@
 import reframe.utility.osext as osext
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(['small'], ['large'])
 class TensorFlow2HorovodTest(rfm.RunOnlyRegressionTest):
     def __init__(self, variant):
diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.simple_test
 class HaswellFmaCheck(rfm.CompileOnlyRegressionTest):
     def __init__(self):
diff --git a/cscs-checks/compile/libsci_resolve.py b/cscs-checks/compile/libsci_resolve.py
@@ -18,7 +18,6 @@ def __init__(self):
         self.tags = {'production', 'craype'}
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(['craype-accel-nvidia35'], ['craype-accel-nvidia60'])
 class NvidiaResolveTest(LibSciResolveBaseTest):
     def __init__(self, module_name):
@@ -65,7 +64,6 @@ def set_sanity(self):
         ])
 
 
-@rfm.required_version('>=2.14')
 @rfm.simple_test
 class MKLResolveTest(LibSciResolveBaseTest):
     def __init__(self):
diff --git a/cscs-checks/libraries/io/hdf5_compile_run.py b/cscs-checks/libraries/io/hdf5_compile_run.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(*([lang, linkage] for lang in ['c', 'f90']
                           for linkage in ['static', 'dynamic']))
 class HDF5Test(rfm.RegressionTest):
diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py
@@ -9,7 +9,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90']
                           for linkage in ['dynamic', 'static']))
 class NetCDFTest(rfm.RegressionTest):
diff --git a/cscs-checks/libraries/magma/magma_checks.py b/cscs-checks/libraries/magma/magma_checks.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16')
 @rfm.parameterized_test(['cblas_z'], ['zgemm'],
                         ['zsymmetrize'], ['ztranspose'])
 class MagmaCheck(rfm.RegressionTest):
diff --git a/cscs-checks/libraries/math/scalapack_compile_run.py b/cscs-checks/libraries/math/scalapack_compile_run.py
@@ -29,7 +29,6 @@ def __init__(self, linkage):
         self.tags = {'production', 'external-resources'}
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(['static'], ['dynamic'])
 class ScaLAPACKSanity(ScaLAPACKTest):
     def __init__(self, linkage):
diff --git a/cscs-checks/libraries/math/trilinos_compile_run.py b/cscs-checks/libraries/math/trilinos_compile_run.py
@@ -8,7 +8,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(['static'], ['dynamic'])
 class TrilinosTest(rfm.RegressionTest):
     def __init__(self, linkage):
@@ -21,7 +20,7 @@ def __init__(self, linkage):
         self.linkage = linkage
 
         self.build_system = 'SingleSource'
-        self.build_system.ldflags = ['-%s' % linkage, '-lparmetis']
+        self.build_system.ldflags = [f'-{linkage}', f'-lparmetis']
         self.build_system.cppflags = ['-DHAVE_MPI', '-DEPETRA_MPI']
         self.prgenv_flags = {
             'PrgEnv-cray': ['-fopenmp', '-O2', '-ffast-math', '-std=c++11',
diff --git a/cscs-checks/libraries/petsc/petsc_helloworld.py b/cscs-checks/libraries/petsc/petsc_helloworld.py
@@ -7,12 +7,11 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.parameterized_test(['dynamic'], ['static'])
 class PetscPoisson2DCheck(rfm.RegressionTest):
     def __init__(self, linkage):
-        self.descr = ('Compile/run PETSc 2D Poisson example with cray-petsc '
-                      '(%s linking)') % linkage
+        self.descr = (f'Compile/run PETSc 2D Poisson example with cray-petsc '
+                      f'({linkage} linking)')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
                                     'PrgEnv-intel']
diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py
@@ -8,7 +8,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.simple_test
 class GpuDirectAccCheck(rfm.RegressionTest):
     def __init__(self):
diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.simple_test
 class GpuDirectCudaCheck(rfm.RegressionTest):
     def __init__(self):
diff --git a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class DGEMMTest(rfm.RegressionTest):
     def __init__(self):
diff --git a/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py b/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.parameterized_test(['nompi'], ['mpi'])
 class FFTWTest(rfm.RegressionTest):
     def __init__(self, exec_mode):
diff --git a/cscs-checks/microbenchmarks/cpu/latency/latency.py b/cscs-checks/microbenchmarks/cpu/latency/latency.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class CPULatencyTest(rfm.RegressionTest):
     def __init__(self):
diff --git a/cscs-checks/microbenchmarks/cpu/likwid/likwid.py b/cscs-checks/microbenchmarks/cpu/likwid/likwid.py
@@ -54,7 +54,6 @@ def __init__(self):
         }
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.parameterized_test(*[[l, k] for l in ['L1', 'L2', 'L3']
                           for k in ['load_avx', 'store_avx']],
                         ['memory', 'load_avx'],
@@ -63,7 +62,7 @@ class CPUBandwidth(MemBandwidthTest):
     def __init__(self, mem_level, kernel_name):
         super().__init__()
 
-        self.descr = 'CPU <- %s %s benchmark' % (mem_level, kernel_name)
+        self.descr = f'CPU <- {mem_level} {kernel_name} benchmark'
         self.valid_systems = ['daint:mc', 'daint:gpu', 'dom:gpu', 'dom:mc']
 
         # the kernel to run in likwid
@@ -108,26 +107,24 @@ def set_exec_opts(self):
         self.data_size = self.system_cache_sizes[partname][self.mem_level]
         self.num_cpus_per_task = self.system_num_cpus[partname]
         numa_domains = self.system_numa_domains[partname]
-        num_cpu_domain = self.num_cpus_per_task / (len(numa_domains) *
-                                                   self.num_tasks_per_core)
+        num_cpu_domain = self.num_cpus_per_task // (len(numa_domains) *
+                                                    self.num_tasks_per_core)
         # result for daint:mc: '-w S0:100MB:18:1:2 -w S1:100MB:18:1:2'
         # format: -w domain:data_size:nthreads:chunk_size:stride
         # chunk_size and stride affect which cpus from <domain> are selected
-        workgroups = ['-w %s:%s:%d:1:2' %
-                      (dom, self.data_size, num_cpu_domain)
+        workgroups = [f'-w {dom}:{self.data_size}:{num_cpu_domain:d}:1:2'
                       for dom in numa_domains]
 
-        self.executable_opts = ['-t %s' % self.kernel_name] + workgroups
+        self.executable_opts = [f'-t {self.kernel_name}'] + workgroups
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class CPUBandwidthCrossSocket(MemBandwidthTest):
     def __init__(self):
         super().__init__()
 
-        self.descr = ("CPU S0 <- main memory S1 read " +
-                      "CPU S1 <- main memory S0 read")
+        self.descr = ('CPU S0 <- main memory S1 read '
+                      'CPU S1 <- main memory S0 read')
 
         self.valid_systems = ['daint:mc', 'dom:mc']
         self.kernel_name = 'load_avx'
@@ -146,15 +143,14 @@ def set_exec_opts(self):
         self.num_cpus_per_task = self.system_num_cpus[partname]
         numa_domains = self.system_numa_domains[partname]
 
-        num_cpu_domain = (self.num_cpus_per_task /
+        num_cpu_domain = (self.num_cpus_per_task //
                           (len(numa_domains) * self.num_tasks_per_core))
 
         # daint:mc: '-w S0:100MB:18:1:2-0:S1 -w S1:100MB:18:1:2-0:S0'
         # format:
         # -w domain:data_size:nthreads:chunk_size:stride-stream_nr:mem_domain
         # chunk_size and stride affect which cpus from <domain> are selected
-        workgroups = ['-w %s:100MB:%d:1:2-0:%s' %
-                      (dom_cpu, num_cpu_domain, dom_mem)
+        workgroups = [f'-w {dom_cpu}:100MB:{num_cpu_domain:d}:1:2-0:{dom_mem}'
                       for dom_cpu, dom_mem in
                       zip(numa_domains[:2], reversed(numa_domains[:2]))]
 
diff --git a/cscs-checks/microbenchmarks/cpu/stream/stream.py b/cscs-checks/microbenchmarks/cpu/stream/stream.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.14')
 @rfm.simple_test
 class StreamTest(rfm.RegressionTest):
     '''This test checks the stream test:
diff --git a/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py b/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py
@@ -44,7 +44,6 @@ def num_tasks_assigned(self):
         return self.job.num_tasks
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class StridedBandwidthTest(StridedBase):
     def __init__(self):
@@ -73,10 +72,9 @@ def set_exec_opts(self):
         self.num_cpus = self.system_num_cpus[self.current_partition.fullname]
 
         # 8-byte stride, using the full cacheline
-        self.executable_opts = ['100000000', '1', '%s' % self.num_cpus]
+        self.executable_opts = ['100000000', '1', f'{self.num_cpus}']
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class StridedBandwidthTest64(StridedBase):
     def __init__(self):
@@ -108,7 +106,6 @@ def set_exec_opts(self):
         self.executable_opts = ['100000000', '8', '%s' % self.num_cpus]
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class StridedBandwidthTest128(StridedBase):
     def __init__(self):
diff --git a/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py b/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.parameterized_test(['sync'], ['async'])
 class KernelLatencyTest(rfm.RegressionTest):
     def __init__(self, kernel_version):
diff --git a/cscs-checks/microbenchmarks/gpu/shmem/shmem.py b/cscs-checks/microbenchmarks/gpu/shmem/shmem.py
@@ -7,7 +7,6 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.16-dev0')
 @rfm.simple_test
 class GPUShmemTest(rfm.RegressionTest):
     def __init__(self):
diff --git a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py
diff --git a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py
diff --git a/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py b/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py
diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py
diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py
diff --git a/cscs-checks/prgenv/openacc_checks.py b/cscs-checks/prgenv/openacc_checks.py
diff --git a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py
diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py
