From f57b844035e0b8374e66a39687ccc66ef5e1f781 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 26 Feb 2021 16:40:23 +0100 Subject: [PATCH 1/7] Use conformant semantic version in all tests --- cscs-checks/apps/amber/amber_check.py | 2 +- cscs-checks/apps/cp2k/cp2k_check.py | 3 ++- cscs-checks/apps/cpmd/cpmd_check.py | 2 +- cscs-checks/apps/greasy/greasy_check.py | 4 +-- cscs-checks/apps/gromacs/gromacs_check.py | 4 +-- cscs-checks/apps/lammps/lammps_check.py | 4 +-- cscs-checks/apps/namd/namd_check.py | 6 ++--- cscs-checks/apps/python/numpy_check.py | 4 +-- .../quantumespresso/quantumespresso_check.py | 1 + .../apps/tensorflow/tf2_horovod_check.py | 2 +- cscs-checks/compile/haswell_fma_check.py | 2 +- cscs-checks/compile/libsci_resolve.py | 4 +-- cscs-checks/libraries/io/hdf5_compile_run.py | 2 +- .../libraries/io/netcdf_compile_run.py | 2 +- cscs-checks/libraries/magma/magma_checks.py | 2 +- .../libraries/math/scalapack_compile_run.py | 2 +- .../libraries/math/trilinos_compile_run.py | 4 +-- .../libraries/petsc/petsc_helloworld.py | 6 ++--- cscs-checks/mch/gpu_direct_acc.py | 2 +- cscs-checks/mch/gpu_direct_cuda.py | 2 +- .../microbenchmarks/cpu/dgemm/dgemm.py | 2 +- .../microbenchmarks/cpu/fft/fftw_benchmark.py | 2 +- .../microbenchmarks/cpu/latency/latency.py | 2 +- .../microbenchmarks/cpu/likwid/likwid.py | 18 ++++++------- .../microbenchmarks/cpu/stream/stream.py | 2 +- .../cpu/strided_bandwidth/strides.py | 8 +++--- .../microbenchmarks/gpu/shmem/shmem.py | 2 +- .../microbenchmarks/gpu/spec-accel/spec.py | 26 +++++++++---------- .../mpi/halo_exchange/halo_cell_exchange.py | 2 +- .../microbenchmarks/mpi/osu/osu_tests.py | 12 ++++----- cscs-checks/prgenv/affinity_check.py | 9 ++++--- cscs-checks/prgenv/helloworld.py | 12 ++++----- cscs-checks/prgenv/mpi.py | 2 +- cscs-checks/prgenv/openacc_checks.py | 2 +- .../tools/profiling_and_debugging/cuda_gdb.py | 2 +- .../tools/profiling_and_debugging/nvprof.py | 6 ++--- 36 files changed, 86 insertions(+), 83 deletions(-) diff --git a/cscs-checks/apps/amber/amber_check.py b/cscs-checks/apps/amber/amber_check.py index d7d9b7948f..6e138cb078 100644 --- a/cscs-checks/apps/amber/amber_check.py +++ b/cscs-checks/apps/amber/amber_check.py @@ -43,7 +43,7 @@ def __init__(self, input_file, output_file): self.tags = {'scs', 'external-resources'} -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index 79262d62a8..c77601a588 100644 --- a/cscs-checks/apps/cp2k/cp2k_check.py +++ b/cscs-checks/apps/cp2k/cp2k_check.py @@ -118,11 +118,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 index 4110a85793..59e7abfd9a 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index a5315656d7..5f3d76df09 100644 --- a/cscs-checks/apps/greasy/greasy_check.py +++ b/cscs-checks/apps/greasy/greasy_check.py @@ -16,7 +16,7 @@ def to_seconds(str): datetime.strptime('00:00:00', '%H:%M:%S')).total_seconds() -@rfm.required_version('>=2.19') +@rfm.required_version('>=2.19.0') @rfm.parameterized_test( ['serial', 'gpu', 24, 12, 1, 1], ['serial', 'mc', 72, 36, 1, 1], @@ -39,7 +39,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 index 879ea4624e..7521456327 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -49,7 +49,7 @@ def __init__(self, output_file): self.tags = {'scs', 'external-resources'} -@rfm.required_version('>=2.19') +@rfm.required_version('>=2.19.0') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['prod', 'maint'])) @@ -92,7 +92,7 @@ def __init__(self, scale, variant): self.tags |= {'maintenance' if variant == 'maint' else 'production'} -@rfm.required_version('>=2.19') +@rfm.required_version('>=2.19.0') @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 index 5b7c7af26d..9b7cc628e3 100644 --- a/cscs-checks/apps/lammps/lammps_check.py +++ b/cscs-checks/apps/lammps/lammps_check.py @@ -41,7 +41,7 @@ def __init__(self): self.maintainers = ['TR', 'VH'] -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['prod', 'maint'])) @@ -85,7 +85,7 @@ def __init__(self, scale, variant): self.tags |= {'maintenance' if variant == 'maint' else 'production'} -@rfm.required_version('>=2.16') +@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 index 33c8a7f0b7..e5ce750401 100644 --- a/cscs-checks/apps/namd/namd_check.py +++ b/cscs-checks/apps/namd/namd_check.py @@ -11,7 +11,7 @@ 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})' self.valid_prog_environs = ['builtin'] self.modules = ['NAMD'] @@ -67,7 +67,7 @@ def __init__(self, arch, scale, variant): } -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['maint', 'prod'])) @@ -91,7 +91,7 @@ def __init__(self, scale, variant): } -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index 381cbcd1b2..79864d5f19 100644 --- a/cscs-checks/apps/python/numpy_check.py +++ b/cscs-checks/apps/python/numpy_check.py @@ -74,7 +74,7 @@ def __init__(self): self.maintainers = ['RS', 'TR'] -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.simple_test class NumpyHaswellTest(NumpyBaseTest): def __init__(self): @@ -83,7 +83,7 @@ def __init__(self): self.num_cpus_per_task = 12 -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index 83f77289c5..db71964e9e 100644 --- a/cscs-checks/apps/quantumespresso/quantumespresso_check.py +++ b/cscs-checks/apps/quantumespresso/quantumespresso_check.py @@ -123,6 +123,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 index bae909af39..5468ff3461 100644 --- a/cscs-checks/apps/tensorflow/tf2_horovod_check.py +++ b/cscs-checks/apps/tensorflow/tf2_horovod_check.py @@ -8,7 +8,7 @@ import reframe.utility.osext as osext -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index ecf53a99fa..0203e759e6 100644 --- a/cscs-checks/compile/haswell_fma_check.py +++ b/cscs-checks/compile/haswell_fma_check.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 4abf5a2295..4e7ad5d89b 100644 --- a/cscs-checks/compile/libsci_resolve.py +++ b/cscs-checks/compile/libsci_resolve.py @@ -18,7 +18,7 @@ def __init__(self): self.tags = {'production', 'craype'} -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['craype-accel-nvidia35'], ['craype-accel-nvidia60']) class NvidiaResolveTest(LibSciResolveBaseTest): def __init__(self, module_name): @@ -65,7 +65,7 @@ def set_sanity(self): ]) -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 366b8c09e5..9a145d8e9a 100644 --- a/cscs-checks/libraries/io/hdf5_compile_run.py +++ b/cscs-checks/libraries/io/hdf5_compile_run.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 3f18b78bc5..88a5915dec 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -9,7 +9,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index ddddd0cbd2..f1664f47f1 100644 --- a/cscs-checks/libraries/magma/magma_checks.py +++ b/cscs-checks/libraries/magma/magma_checks.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @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 index cf9f9c4588..cadd6e2594 100644 --- a/cscs-checks/libraries/math/scalapack_compile_run.py +++ b/cscs-checks/libraries/math/scalapack_compile_run.py @@ -29,7 +29,7 @@ def __init__(self, linkage): self.tags = {'production', 'external-resources'} -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index adef7d2770..e477764700 100644 --- a/cscs-checks/libraries/math/trilinos_compile_run.py +++ b/cscs-checks/libraries/math/trilinos_compile_run.py @@ -8,7 +8,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['static'], ['dynamic']) class TrilinosTest(rfm.RegressionTest): def __init__(self, linkage): @@ -21,7 +21,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 index 566a041e58..8e425b0220 100644 --- a/cscs-checks/libraries/petsc/petsc_helloworld.py +++ b/cscs-checks/libraries/petsc/petsc_helloworld.py @@ -7,12 +7,12 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 46310b57ae..ba025e0be8 100644 --- a/cscs-checks/mch/gpu_direct_acc.py +++ b/cscs-checks/mch/gpu_direct_acc.py @@ -8,7 +8,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index dbd1673542..d9962a18b9 100644 --- a/cscs-checks/mch/gpu_direct_cuda.py +++ b/cscs-checks/mch/gpu_direct_cuda.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 518b217277..43246691d3 100644 --- a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @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 index 7c0272ff45..4ef294b2ec 100644 --- a/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py +++ b/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @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 index 010a508482..a0c4a21d8c 100644 --- a/cscs-checks/microbenchmarks/cpu/latency/latency.py +++ b/cscs-checks/microbenchmarks/cpu/latency/latency.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @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 index 9aade2ede0..3dda9c8cba 100644 --- a/cscs-checks/microbenchmarks/cpu/likwid/likwid.py +++ b/cscs-checks/microbenchmarks/cpu/likwid/likwid.py @@ -54,7 +54,7 @@ def __init__(self): } -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.parameterized_test(*[[l, k] for l in ['L1', 'L2', 'L3'] for k in ['load_avx', 'store_avx']], ['memory', 'load_avx'], @@ -63,7 +63,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 @@ -113,21 +113,20 @@ def set_exec_opts(self): # 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 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.required_version('>=2.16-dev0.0') @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' @@ -153,8 +152,7 @@ def set_exec_opts(self): # format: # -w domain:data_size:nthreads:chunk_size:stride-stream_nr:mem_domain # chunk_size and stride affect which cpus from 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 index a5adac837f..f5ad6301d7 100644 --- a/cscs-checks/microbenchmarks/cpu/stream/stream.py +++ b/cscs-checks/microbenchmarks/cpu/stream/stream.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @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 index 0bd826a8e8..4836d5b4f9 100644 --- a/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py +++ b/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py @@ -44,7 +44,7 @@ def num_tasks_assigned(self): return self.job.num_tasks -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.simple_test class StridedBandwidthTest(StridedBase): def __init__(self): @@ -73,10 +73,10 @@ 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.required_version('>=2.16-dev0.0') @rfm.simple_test class StridedBandwidthTest64(StridedBase): def __init__(self): @@ -108,7 +108,7 @@ def set_exec_opts(self): self.executable_opts = ['100000000', '8', '%s' % self.num_cpus] -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.simple_test class StridedBandwidthTest128(StridedBase): def __init__(self): diff --git a/cscs-checks/microbenchmarks/gpu/shmem/shmem.py b/cscs-checks/microbenchmarks/gpu/shmem/shmem.py index 354ee92a17..5faff013b9 100644 --- a/cscs-checks/microbenchmarks/gpu/shmem/shmem.py +++ b/cscs-checks/microbenchmarks/gpu/shmem/shmem.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @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 index 17cd9626dd..ce78575994 100644 --- a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py +++ b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py @@ -24,8 +24,8 @@ def __init__(self, prg_envs): app_source = os.path.join(self.current_system.resourcesdir, 'SPEC_ACCELv1.2') - self.prebuild_cmds = ['cp -r %s/* .' % app_source, - './install.sh -d . -f'] + self.prebuild_cmds = [f'cp -r {app_source}/* .', + f'./install.sh -d . -f'] # I just want prebuild_cmds, but no action for the build_system # is not supported, so I find it something useless to do @@ -49,13 +49,13 @@ def __init__(self, prg_envs): outfile = sn.getitem(sn.glob('result/ACCEL.*.log'), 0) self.sanity_patterns_ = { env: sn.all([sn.assert_found( - r'Success.*%s' % bn, outfile) for bn in self.benchmarks[env]]) + rf'Success.*{bn}', outfile) for bn in self.benchmarks[env]]) for env in self.valid_prog_environs } self.perf_patterns_ = { env: {bench_name: sn.avg(sn.extractall( - r'Success.*%s.*runtime=(?P[0-9.]+)' % bench_name, + rf'Success.*{bench_name}.*runtime=(?P[0-9.]+)', outfile, 'rt', float)) for bench_name in self.benchmarks[env]} for env in self.valid_prog_environs @@ -67,14 +67,14 @@ def __init__(self, prg_envs): @rfm.run_after('setup') def setup_per_env(self): envname = self.current_environ.name - self.prerun_cmds = ['source ./shrc', 'mv %s config' % - self.configs[envname]] + self.prerun_cmds = [ + f'source ./shrc', + f'mv {self.configs[envname] config' + ] self.executable_opts = [ - '--config=%s' % - self.configs[envname], - '--platform NVIDIA', - '--tune=base', - '--device GPU'] + self.benchmarks[envname] + f'--config={self.configs[envname]}', '--platform NVIDIA', + '--tune=base', '--device GPU' + ] + self.benchmarks[envname] self.reference = { 'dom:gpu': self.refs[envname], 'daint:gpu': self.refs[envname] @@ -88,7 +88,7 @@ def setup_per_env(self): self.job.launcher = getlauncher('local')() -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.simple_test class SpecAccelCheckOpenCL(SpecAccelCheckBase): def __init__(self): @@ -125,7 +125,7 @@ def __init__(self): super().__init__(valid_prog_environs) -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.simple_test class SpecAccelCheckOpenACC(SpecAccelCheckBase): def __init__(self): diff --git a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py index af71d7aaa7..11db82bd5a 100644 --- a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py +++ b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0') +@rfm.required_version('>=2.16-dev0.0') @rfm.simple_test class HaloCellExchangeTest(rfm.RegressionTest): def __init__(self): diff --git a/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py b/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py index e29c5b589d..7aeec37284 100644 --- a/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.parameterized_test(['production']) class AlltoallTest(rfm.RegressionTest): def __init__(self, variant): @@ -73,7 +73,7 @@ def __init__(self): self.tags = {'diagnostic', 'ops', 'benchmark', 'craype'} -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.parameterized_test(['small'], ['large']) class AllreduceTest(rfm.RegressionTest): def __init__(self, variant): @@ -156,7 +156,7 @@ def __init__(self): } -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.simple_test class P2PCPUBandwidthTest(P2PBaseTest): def __init__(self): @@ -192,7 +192,7 @@ def __init__(self): } -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.simple_test class P2PCPULatencyTest(P2PBaseTest): def __init__(self): @@ -229,7 +229,7 @@ def __init__(self): } -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.simple_test class G2GBandwidthTest(P2PBaseTest): def __init__(self): @@ -267,7 +267,7 @@ def __init__(self): self.build_system.cppflags = ['-D_ENABLE_CUDA_'] -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.16.0') @rfm.simple_test class G2GLatencyTest(P2PBaseTest): def __init__(self): diff --git a/cscs-checks/prgenv/affinity_check.py b/cscs-checks/prgenv/affinity_check.py index ccd66a4db9..529ebe6913 100644 --- a/cscs-checks/prgenv/affinity_check.py +++ b/cscs-checks/prgenv/affinity_check.py @@ -171,6 +171,7 @@ def parse_output(self): '''Extract the data from the affinity tool.''' re_aff_cpus = r'CPU affinity: \[\s+(?P[\d+\s+]+)\]' + def parse_cpus(x): return sorted([int(xi) for xi in x.split()]) @@ -482,7 +483,7 @@ def consume_cpu_set(self): next(iter(cpus_present)), by='node' ) if (not all(cpu in cpuset_by_numa for cpu in cpus_present) and - len(cpuset_by_numa)==len(cpus_present)): + len(cpuset_by_numa) == len(cpus_present)): raise SanityError( f'numa node {numa_number} not filled in order' ) @@ -512,7 +513,8 @@ def set_tasks(self): @rfm.run_before('sanity') def consume_cpu_set(self): - '''Check that consecutive tasks are round-robin pinned to numa nodes.''' + '''Check that consecutive tasks are round-robin pinned to numa nodes. + ''' # Get a set per numa node to keep track of the CPUs numa_nodes = [set() for s in range(self.num_numa_nodes)] @@ -525,7 +527,8 @@ def consume_cpu_set(self): # Only 1 CPU per affinity set is allowed if ((len(affinity_set) > 1) or (any(cpu in numa_nodes[s] for cpu in affinity_set)) or - (any(cpu not in self.numa_nodes[s] for cpu in affinity_set))): + (any(cpu not in self.numa_nodes[s] + for cpu in affinity_set))): raise SanityError( f'incorrect affinity set for task {task_count}' ) diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index e65b3f98d5..f86823bfd8 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -105,7 +105,7 @@ def compile_timer_end(self): self.compilation_time_seconds = elapsed.total_seconds() -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -130,14 +130,14 @@ def __init__(self, lang, linkage): self.num_tasks_per_node = 1 self.num_cpus_per_task = 1 if (self.current_system.name in ['arolla', 'tsa'] and - linkage == 'dynamic'): + linkage == 'dynamic'): self.valid_prog_environs += ['PrgEnv-pgi-nompi', 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu-nompi', 'PrgEnv-gnu-nompi-nocuda'] -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -159,7 +159,7 @@ def __init__(self, lang, linkage): self.num_tasks_per_node = 1 self.num_cpus_per_task = 4 if (self.current_system.name in ['arolla', 'tsa'] and - linkage == 'dynamic'): + linkage == 'dynamic'): self.valid_prog_environs += ['PrgEnv-pgi-nompi', 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu-nompi', @@ -172,7 +172,7 @@ def __init__(self, lang, linkage): } -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -198,7 +198,7 @@ def __init__(self, lang, linkage): self.num_cpus_per_task = 1 -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py index 9015a401d6..21cd4db47b 100644 --- a/cscs-checks/prgenv/mpi.py +++ b/cscs-checks/prgenv/mpi.py @@ -9,7 +9,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['single'], ['funneled'], ['serialized'], ['multiple']) class MpiInitTest(rfm.RegressionTest): '''This test checks the value returned by calling MPI_Init_thread. diff --git a/cscs-checks/prgenv/openacc_checks.py b/cscs-checks/prgenv/openacc_checks.py index a45d5a0196..8a4b3f16cc 100644 --- a/cscs-checks/prgenv/openacc_checks.py +++ b/cscs-checks/prgenv/openacc_checks.py @@ -8,7 +8,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['mpi'], ['nompi']) class OpenACCFortranCheck(rfm.RegressionTest): def __init__(self, variant): diff --git a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py index 08d0e14c8c..940dbf6684 100644 --- a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py +++ b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.simple_test class CudaGdbCheck(rfm.RegressionTest): def __init__(self): diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py index 80011033a4..1c5ba59574 100644 --- a/cscs-checks/tools/profiling_and_debugging/nvprof.py +++ b/cscs-checks/tools/profiling_and_debugging/nvprof.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14') +@rfm.required_version('>=2.14.0') @rfm.simple_test class NvprofCheck(rfm.RegressionTest): def __init__(self): @@ -39,8 +39,8 @@ def __init__(self): # cuda/10.1 self.postrun_cmds = ['cat /etc/modprobe.d/nvidia.conf'] self.sanity_patterns = sn.all([ - sn.assert_found('Profiling application: %s' % - self.target_executable, self.stderr), + sn.assert_found(f'Profiling application: {self.target_executable}' + self.stderr), sn.assert_found('[CUDA memcpy HtoD]', self.stderr), sn.assert_found('[CUDA memcpy DtoH]', self.stderr), sn.assert_found(r'\s+100(\s+\S+){3}\s+jacobi_kernel', self.stderr), From 6b811bc4b82ed60de7f07e259ebc8073f7aad5c6 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 26 Feb 2021 16:56:04 +0100 Subject: [PATCH 2/7] Fix dev versions for semantic versioning --- cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py | 2 +- cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py | 2 +- cscs-checks/microbenchmarks/cpu/latency/latency.py | 2 +- cscs-checks/microbenchmarks/cpu/likwid/likwid.py | 4 ++-- .../microbenchmarks/cpu/strided_bandwidth/strides.py | 6 +++--- cscs-checks/microbenchmarks/gpu/shmem/shmem.py | 2 +- cscs-checks/microbenchmarks/gpu/spec-accel/spec.py | 4 ++-- .../microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py index 43246691d3..81e48d06dd 100644 --- a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @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 index 4ef294b2ec..86c20300c0 100644 --- a/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py +++ b/cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @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 index a0c4a21d8c..efc356438b 100644 --- a/cscs-checks/microbenchmarks/cpu/latency/latency.py +++ b/cscs-checks/microbenchmarks/cpu/latency/latency.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @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 index 3dda9c8cba..9e7a425320 100644 --- a/cscs-checks/microbenchmarks/cpu/likwid/likwid.py +++ b/cscs-checks/microbenchmarks/cpu/likwid/likwid.py @@ -54,7 +54,7 @@ def __init__(self): } -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.parameterized_test(*[[l, k] for l in ['L1', 'L2', 'L3'] for k in ['load_avx', 'store_avx']], ['memory', 'load_avx'], @@ -119,7 +119,7 @@ def set_exec_opts(self): self.executable_opts = [f'-t {self.kernel_name}'] + workgroups -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class CPUBandwidthCrossSocket(MemBandwidthTest): def __init__(self): diff --git a/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py b/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py index 4836d5b4f9..e226b0c6bd 100644 --- a/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py +++ b/cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py @@ -44,7 +44,7 @@ def num_tasks_assigned(self): return self.job.num_tasks -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class StridedBandwidthTest(StridedBase): def __init__(self): @@ -76,7 +76,7 @@ def set_exec_opts(self): self.executable_opts = ['100000000', '1', f'{self.num_cpus}'] -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class StridedBandwidthTest64(StridedBase): def __init__(self): @@ -108,7 +108,7 @@ def set_exec_opts(self): self.executable_opts = ['100000000', '8', '%s' % self.num_cpus] -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class StridedBandwidthTest128(StridedBase): def __init__(self): diff --git a/cscs-checks/microbenchmarks/gpu/shmem/shmem.py b/cscs-checks/microbenchmarks/gpu/shmem/shmem.py index 5faff013b9..7146745091 100644 --- a/cscs-checks/microbenchmarks/gpu/shmem/shmem.py +++ b/cscs-checks/microbenchmarks/gpu/shmem/shmem.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @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 index ce78575994..291017b950 100644 --- a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py +++ b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py @@ -88,7 +88,7 @@ def setup_per_env(self): self.job.launcher = getlauncher('local')() -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class SpecAccelCheckOpenCL(SpecAccelCheckBase): def __init__(self): @@ -125,7 +125,7 @@ def __init__(self): super().__init__(valid_prog_environs) -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class SpecAccelCheckOpenACC(SpecAccelCheckBase): def __init__(self): diff --git a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py index 11db82bd5a..a642631858 100644 --- a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py +++ b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py @@ -7,7 +7,7 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16-dev0.0') +@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class HaloCellExchangeTest(rfm.RegressionTest): def __init__(self): From 125ebb3a627471950f260826826d558efc4c34c3 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 26 Feb 2021 17:03:30 +0100 Subject: [PATCH 3/7] Fix f-string --- cscs-checks/microbenchmarks/gpu/spec-accel/spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py index 291017b950..1aa7193848 100644 --- a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py +++ b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py @@ -69,7 +69,7 @@ def setup_per_env(self): envname = self.current_environ.name self.prerun_cmds = [ f'source ./shrc', - f'mv {self.configs[envname] config' + f'mv {self.configs[envname]} config' ] self.executable_opts = [ f'--config={self.configs[envname]}', '--platform NVIDIA', From 8bf7f78c3ecc4c7a16f8ee4931d141a813a8ee0a Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 26 Feb 2021 17:08:46 +0100 Subject: [PATCH 4/7] Fix typo --- cscs-checks/tools/profiling_and_debugging/nvprof.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py index 1c5ba59574..ac32fff004 100644 --- a/cscs-checks/tools/profiling_and_debugging/nvprof.py +++ b/cscs-checks/tools/profiling_and_debugging/nvprof.py @@ -39,7 +39,7 @@ def __init__(self): # cuda/10.1 self.postrun_cmds = ['cat /etc/modprobe.d/nvidia.conf'] self.sanity_patterns = sn.all([ - sn.assert_found(f'Profiling application: {self.target_executable}' + sn.assert_found(f'Profiling application: {self.target_executable}', self.stderr), sn.assert_found('[CUDA memcpy HtoD]', self.stderr), sn.assert_found('[CUDA memcpy DtoH]', self.stderr), From 5e485af55c06702bd591e514e1f1eac9336fb4b3 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 3 Mar 2021 14:42:41 +0100 Subject: [PATCH 5/7] Use floor division in likwid test --- cscs-checks/microbenchmarks/cpu/likwid/likwid.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cscs-checks/microbenchmarks/cpu/likwid/likwid.py b/cscs-checks/microbenchmarks/cpu/likwid/likwid.py index 9e7a425320..6d0878cc75 100644 --- a/cscs-checks/microbenchmarks/cpu/likwid/likwid.py +++ b/cscs-checks/microbenchmarks/cpu/likwid/likwid.py @@ -108,8 +108,8 @@ 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 are selected @@ -145,7 +145,7 @@ 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' From d1fab6aef5fe135988d9bfda06301cfc71583445 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 8 Mar 2021 10:00:52 +0100 Subject: [PATCH 6/7] Remove 'required_version' decorator from tests --- cscs-checks/apps/amber/amber_check.py | 1 - cscs-checks/apps/cpmd/cpmd_check.py | 1 - cscs-checks/apps/greasy/greasy_check.py | 1 - cscs-checks/apps/gromacs/gromacs_check.py | 2 -- cscs-checks/apps/lammps/lammps_check.py | 2 -- cscs-checks/apps/namd/namd_check.py | 2 -- cscs-checks/apps/python/numpy_check.py | 2 -- cscs-checks/apps/tensorflow/tf2_horovod_check.py | 1 - cscs-checks/compile/haswell_fma_check.py | 1 - cscs-checks/compile/libsci_resolve.py | 2 -- cscs-checks/libraries/io/hdf5_compile_run.py | 1 - cscs-checks/libraries/io/netcdf_compile_run.py | 1 - cscs-checks/libraries/magma/magma_checks.py | 1 - cscs-checks/libraries/math/scalapack_compile_run.py | 1 - cscs-checks/libraries/math/trilinos_compile_run.py | 1 - cscs-checks/libraries/petsc/petsc_helloworld.py | 1 - cscs-checks/mch/gpu_direct_acc.py | 1 - cscs-checks/mch/gpu_direct_cuda.py | 1 - cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py | 1 - cscs-checks/microbenchmarks/cpu/fft/fftw_benchmark.py | 1 - cscs-checks/microbenchmarks/cpu/latency/latency.py | 1 - cscs-checks/microbenchmarks/cpu/likwid/likwid.py | 2 -- cscs-checks/microbenchmarks/cpu/stream/stream.py | 1 - .../microbenchmarks/cpu/strided_bandwidth/strides.py | 3 --- .../microbenchmarks/gpu/kernel_latency/kernel_latency.py | 1 - cscs-checks/microbenchmarks/gpu/shmem/shmem.py | 1 - cscs-checks/microbenchmarks/gpu/spec-accel/spec.py | 2 -- .../microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py | 1 - cscs-checks/microbenchmarks/mpi/osu/osu_tests.py | 6 ------ cscs-checks/prgenv/helloworld.py | 4 ---- cscs-checks/prgenv/mpi.py | 1 - cscs-checks/prgenv/openacc_checks.py | 1 - cscs-checks/tools/profiling_and_debugging/cuda_gdb.py | 1 - cscs-checks/tools/profiling_and_debugging/nvprof.py | 1 - 34 files changed, 51 deletions(-) diff --git a/cscs-checks/apps/amber/amber_check.py b/cscs-checks/apps/amber/amber_check.py index 6e138cb078..7cc0b65bd1 100644 --- 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.0') @rfm.parameterized_test(*( [variant, arch, scale] for variant in ['prod', 'maint'] diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index 59e7abfd9a..32434202fd 100644 --- 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.0') @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 index 5f3d76df09..defe61b689 100644 --- 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.0') @rfm.parameterized_test( ['serial', 'gpu', 24, 12, 1, 1], ['serial', 'mc', 72, 36, 1, 1], diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index 7521456327..631fc5f662 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -49,7 +49,6 @@ def __init__(self, output_file): self.tags = {'scs', 'external-resources'} -@rfm.required_version('>=2.19.0') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['prod', 'maint'])) @@ -92,7 +91,6 @@ def __init__(self, scale, variant): self.tags |= {'maintenance' if variant == 'maint' else 'production'} -@rfm.required_version('>=2.19.0') @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 index 9b7cc628e3..af952ee8b2 100644 --- a/cscs-checks/apps/lammps/lammps_check.py +++ b/cscs-checks/apps/lammps/lammps_check.py @@ -41,7 +41,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'])) @@ -85,7 +84,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 index e5ce750401..96591785ab 100644 --- a/cscs-checks/apps/namd/namd_check.py +++ b/cscs-checks/apps/namd/namd_check.py @@ -67,7 +67,6 @@ def __init__(self, arch, scale, variant): } -@rfm.required_version('>=2.16.0') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['maint', 'prod'])) @@ -91,7 +90,6 @@ def __init__(self, scale, variant): } -@rfm.required_version('>=2.16.0') @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 index 79864d5f19..260d5f4f51 100644 --- 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.0') @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.0') @rfm.simple_test class NumpyBroadwellTest(NumpyBaseTest): def __init__(self): diff --git a/cscs-checks/apps/tensorflow/tf2_horovod_check.py b/cscs-checks/apps/tensorflow/tf2_horovod_check.py index 5468ff3461..bfd591288d 100644 --- 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.0') @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 index 0203e759e6..6dd2ff9d32 100644 --- 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.0') @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 index 4e7ad5d89b..f7d472f3f6 100644 --- 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.0') @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.0') @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 index 9a145d8e9a..e70d01c45b 100644 --- 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.0') @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 index 88a5915dec..985f89f9e1 100644 --- 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.0') @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 index f1664f47f1..d445311fef 100644 --- 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.0') @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 index cadd6e2594..63f14ab2f7 100644 --- 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.0') @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 index e477764700..2285085bd4 100644 --- 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.0') @rfm.parameterized_test(['static'], ['dynamic']) class TrilinosTest(rfm.RegressionTest): def __init__(self, linkage): diff --git a/cscs-checks/libraries/petsc/petsc_helloworld.py b/cscs-checks/libraries/petsc/petsc_helloworld.py index 8e425b0220..308d731065 100644 --- a/cscs-checks/libraries/petsc/petsc_helloworld.py +++ b/cscs-checks/libraries/petsc/petsc_helloworld.py @@ -7,7 +7,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['dynamic'], ['static']) class PetscPoisson2DCheck(rfm.RegressionTest): def __init__(self, linkage): diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py index ba025e0be8..eda9953edd 100644 --- 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.0') @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 index d9962a18b9..dea86e3f85 100644 --- 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.0') @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 index 81e48d06dd..34f06f8d7a 100644 --- 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.0-dev.0') @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 index 86c20300c0..f1bcbfaa68 100644 --- 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.0-dev.0') @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 index efc356438b..fa02138a9b 100644 --- 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.0-dev.0') @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 index 6d0878cc75..621bdf33b0 100644 --- 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.0-dev.0') @rfm.parameterized_test(*[[l, k] for l in ['L1', 'L2', 'L3'] for k in ['load_avx', 'store_avx']], ['memory', 'load_avx'], @@ -119,7 +118,6 @@ def set_exec_opts(self): self.executable_opts = [f'-t {self.kernel_name}'] + workgroups -@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class CPUBandwidthCrossSocket(MemBandwidthTest): def __init__(self): diff --git a/cscs-checks/microbenchmarks/cpu/stream/stream.py b/cscs-checks/microbenchmarks/cpu/stream/stream.py index f5ad6301d7..eb2b609582 100644 --- 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.0') @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 index e226b0c6bd..09f47d33be 100644 --- 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.0-dev.0') @rfm.simple_test class StridedBandwidthTest(StridedBase): def __init__(self): @@ -76,7 +75,6 @@ def set_exec_opts(self): self.executable_opts = ['100000000', '1', f'{self.num_cpus}'] -@rfm.required_version('>=2.16.0-dev.0') @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.0-dev.0') @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 index d11fb667de..9b1ab23646 100644 --- 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 index 7146745091..f64a0402b1 100644 --- 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.0-dev.0') @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 index 1aa7193848..497c67a5c9 100644 --- a/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py +++ b/cscs-checks/microbenchmarks/gpu/spec-accel/spec.py @@ -88,7 +88,6 @@ def setup_per_env(self): self.job.launcher = getlauncher('local')() -@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class SpecAccelCheckOpenCL(SpecAccelCheckBase): def __init__(self): @@ -125,7 +124,6 @@ def __init__(self): super().__init__(valid_prog_environs) -@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class SpecAccelCheckOpenACC(SpecAccelCheckBase): def __init__(self): diff --git a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py index a642631858..59fdf9ff14 100644 --- a/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py +++ b/cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py @@ -7,7 +7,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16.0-dev.0') @rfm.simple_test class HaloCellExchangeTest(rfm.RegressionTest): def __init__(self): diff --git a/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py b/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py index 7aeec37284..e21e1629a9 100644 --- a/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/mpi/osu/osu_tests.py @@ -7,7 +7,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.16.0') @rfm.parameterized_test(['production']) class AlltoallTest(rfm.RegressionTest): def __init__(self, variant): @@ -73,7 +72,6 @@ def __init__(self): self.tags = {'diagnostic', 'ops', 'benchmark', 'craype'} -@rfm.required_version('>=2.16.0') @rfm.parameterized_test(['small'], ['large']) class AllreduceTest(rfm.RegressionTest): def __init__(self, variant): @@ -156,7 +154,6 @@ def __init__(self): } -@rfm.required_version('>=2.16.0') @rfm.simple_test class P2PCPUBandwidthTest(P2PBaseTest): def __init__(self): @@ -192,7 +189,6 @@ def __init__(self): } -@rfm.required_version('>=2.16.0') @rfm.simple_test class P2PCPULatencyTest(P2PBaseTest): def __init__(self): @@ -229,7 +225,6 @@ def __init__(self): } -@rfm.required_version('>=2.16.0') @rfm.simple_test class G2GBandwidthTest(P2PBaseTest): def __init__(self): @@ -267,7 +262,6 @@ def __init__(self): self.build_system.cppflags = ['-D_ENABLE_CUDA_'] -@rfm.required_version('>=2.16.0') @rfm.simple_test class G2GLatencyTest(P2PBaseTest): def __init__(self): diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index f86823bfd8..ce22af0d4d 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -105,7 +105,6 @@ def compile_timer_end(self): self.compilation_time_seconds = elapsed.total_seconds() -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -137,7 +136,6 @@ def __init__(self, lang, linkage): 'PrgEnv-gnu-nompi-nocuda'] -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -172,7 +170,6 @@ def __init__(self, lang, linkage): } -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) @@ -198,7 +195,6 @@ def __init__(self, lang, linkage): self.num_cpus_per_task = 1 -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(*([lang, linkage] for lang in ['cpp', 'c', 'f90'] for linkage in ['dynamic', 'static'])) diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py index 21cd4db47b..b264f78491 100644 --- a/cscs-checks/prgenv/mpi.py +++ b/cscs-checks/prgenv/mpi.py @@ -9,7 +9,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['single'], ['funneled'], ['serialized'], ['multiple']) class MpiInitTest(rfm.RegressionTest): '''This test checks the value returned by calling MPI_Init_thread. diff --git a/cscs-checks/prgenv/openacc_checks.py b/cscs-checks/prgenv/openacc_checks.py index 8a4b3f16cc..c4598822d2 100644 --- a/cscs-checks/prgenv/openacc_checks.py +++ b/cscs-checks/prgenv/openacc_checks.py @@ -8,7 +8,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14.0') @rfm.parameterized_test(['mpi'], ['nompi']) class OpenACCFortranCheck(rfm.RegressionTest): def __init__(self, variant): diff --git a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py index 940dbf6684..251cd25a8c 100644 --- a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py +++ b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py @@ -7,7 +7,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14.0') @rfm.simple_test class CudaGdbCheck(rfm.RegressionTest): def __init__(self): diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py index ac32fff004..e192cbe4df 100644 --- a/cscs-checks/tools/profiling_and_debugging/nvprof.py +++ b/cscs-checks/tools/profiling_and_debugging/nvprof.py @@ -7,7 +7,6 @@ import reframe.utility.sanity as sn -@rfm.required_version('>=2.14.0') @rfm.simple_test class NvprofCheck(rfm.RegressionTest): def __init__(self): From 355353098bb40492c4ef21b9e638ddc4429d63b7 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 8 Mar 2021 17:45:07 +0100 Subject: [PATCH 7/7] Remove PrgEnv-aocc from the MpiInitTest --- cscs-checks/prgenv/mpi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py index b264f78491..0210b43228 100644 --- a/cscs-checks/prgenv/mpi.py +++ b/cscs-checks/prgenv/mpi.py @@ -38,7 +38,7 @@ def __init__(self, required_thread): self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'eiger:mc'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-pgi', - 'PrgEnv-intel', 'PrgEnv-aocc'] + 'PrgEnv-intel'] self.build_system = 'SingleSource' self.sourcesdir = 'src/mpi_thread' self.sourcepath = 'mpi_init_thread.cpp'