Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cscs-checks/apps/cp2k/cp2k_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ def __init__(self, scale, variant):
self.reference = references[variant][scale]
self.tags |= {'maintenance' if variant == 'maint' else 'production'}

@rfm.run_before('run')
@run_before('run')
def set_task_distribution(self):
self.job.options = ['--distribution=block:block']

@rfm.run_before('run')
@run_before('run')
def set_cpu_binding(self):
self.job.launcher.options = ['--cpu-bind=cores']

Expand Down
8 changes: 4 additions & 4 deletions cscs-checks/apps/greasy/greasy_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ def __init__(self, variant, partition, num_greasy_tasks, nworkes_per_node,
self.maintainers = ['VH', 'SK']
self.tags = {'production'}

@rfm.run_before('run')
@run_before('run')
def generate_tasks_file(self):
with open(os.path.join(self.stagedir, self.tasks_file), 'w') as fp:
for i in range(self.num_greasy_tasks):
fp.write(f'./{self.executable} output-{i}\n')

@rfm.run_before('run')
@run_before('run')
def daint_dom_gpu_specific_workaround(self):
if self.current_partition.fullname in ['daint:gpu', 'dom:gpu']:
self.variables['CRAY_CUDA_MPS'] = '1'
Expand All @@ -121,13 +121,13 @@ def daint_dom_gpu_specific_workaround(self):
}
}

@rfm.run_before('run')
@run_before('run')
def change_executable_name(self):
# After compiling the code we can change the executable to be
# the greasy one
self.executable = 'greasy'

@rfm.run_before('run')
@run_before('run')
def set_launcher(self):
# The job launcher has to be changed to local since greasy
# make calls to srun
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/jupyter/check_ipcmagic.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self):
self.maintainers = ['RS', 'TR']
self.tags = {'production'}

@rfm.run_before('run')
@run_before('run')
def prepare_run(self):
# Change the job launcher since `ipython`
# needs to be launched without `srun`.
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/paraview/paraview_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self):
self.maintainers = ['JF', 'TM']
self.tags = {'scs', 'production'}

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity(self):
if self.current_partition.name == 'mc':
self.sanity_patterns = sn.all([
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/apps/quantumespresso/quantumespresso_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ def __init__(self):
'maintenance' if self.variant == 'maint' else 'production'
}

@rfm.run_before('run')
@run_before('run')
def set_task_distribution(self):
self.job.options = ['--distribution=block:block']

@rfm.run_before('run')
@run_before('run')
def set_cpu_binding(self):
self.job.launcher.options = ['--cpu-bind=cores']

Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/spark/spark_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(self):
self.maintainers = ['TM', 'RS']
self.tags = {'production'}

@rfm.run_before('run')
@run_before('run')
def prepare_run(self):
if self.current_partition.fullname in ['daint:gpu', 'dom:gpu']:
num_workers = 12
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/apps/vasp/vasp_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ def __init__(self, variant):
self.reference = references[variant]
self.tags |= {'maintenance' if variant == 'maint' else 'production'}

@rfm.run_before('run')
@run_before('run')
def set_task_distribution(self):
self.job.options = ['--distribution=block:block']

@rfm.run_before('run')
@run_before('run')
def set_cpu_binding(self):
self.job.launcher.options = ['--cpu-bind=cores']

Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/compile/haswell_fma_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self):
self.maintainers = ['AJ', 'CB']
self.tags = {'production', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name == 'PrgEnv-cray':
self.build_system.cflags = ['-Ofast', '-S']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/compile/libsci_resolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def __init__(self, module_name):
}
self.postbuild_cmds = [f'readelf -d {self.executable}']

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity(self):
# here lib_name is in the format: libsci_acc_gnu_48_nv35.so or
# libsci_acc_cray_nv35.so
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/libraries/gridtools/gridtools_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def __init__(self, variant):
self.tags = {'scs', 'benchmark'}
self.maintainers = ['CB']

@rfm.require_deps
@require_deps
def set_executable(self, GridToolsCPUBuildCheck):
self.executable = os.path.join(
GridToolsCPUBuildCheck().stagedir,
Expand Down Expand Up @@ -176,7 +176,7 @@ def __init__(self, variant):
self.tags = {'scs', 'benchmark'}
self.maintainers = ['CB']

@rfm.require_deps
@require_deps
def set_executable(self, GridToolsGPUBuildCheck):
self.executable = os.path.join(
GridToolsGPUBuildCheck().stagedir,
Expand Down
6 changes: 3 additions & 3 deletions cscs-checks/libraries/hpx/hpx_hello_world.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(self):
self.tags = {'production'}
self.maintainers = ['VH', 'JG']

@rfm.run_after('setup')
@run_after('setup')
def set_tasks(self):
if self.current_partition.fullname == 'daint:gpu':
self.num_tasks = 2
Expand All @@ -42,11 +42,11 @@ def set_tasks(self):
self.num_tasks_per_node = 1
self.num_cpus_per_task = 36

@rfm.run_before('run')
@run_before('run')
def set_exec_opts(self):
self.executable_opts = ['--hpx:threads=%s' % self.num_cpus_per_task]

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity(self):
hellos = sn.findall(r'hello world from OS-thread \s*(?P<tid>\d+) on '
r'locality (?P<lid>\d+)', self.stdout)
Expand Down
12 changes: 6 additions & 6 deletions cscs-checks/libraries/hpx/hpx_stencil.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(self):
self.tags = {'production'}
self.maintainers = ['VH', 'JG']

@rfm.run_after('setup')
@run_after('setup')
def set_tasks(self):
if self.current_partition.fullname == 'daint:gpu':
self.num_tasks = 1
Expand All @@ -69,11 +69,11 @@ def set_tasks(self):
self.num_tasks_per_node = 1
self.num_cpus_per_task = 36

@rfm.run_before('run')
@run_before('run')
def set_exec_opts(self):
self.executable_opts += ['--hpx:threads=%s' % self.num_cpus_per_task]

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity(self):
result = sn.findall(r'(?P<tid>\d+),\s*(?P<time>(\d+)?.?\d+),'
r'\s*(?P<pts>\d+),\s*(?P<parts>\d+),'
Expand Down Expand Up @@ -137,7 +137,7 @@ def __init__(self):
self.tags = {'production'}
self.maintainers = ['VH', 'JG']

@rfm.run_after('setup')
@run_after('setup')
def set_tasks(self):
if self.current_partition.fullname == 'daint:gpu':
self.num_tasks = 2
Expand All @@ -158,11 +158,11 @@ def set_tasks(self):
self.num_cpus_per_task = 18
self.num_tasks_per_socket = 1

@rfm.run_before('run')
@run_before('run')
def set_exec_opts(self):
self.executable_opts += ['--hpx:threads=%s' % self.num_cpus_per_task]

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity(self):
result = sn.findall(r'(?P<lid>\d+),\s*(?P<tid>\d+),'
r'\s*(?P<time>(\d+)?.?\d+),'
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/io/netcdf_compile_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def __init__(self, lang, linkage):
self.maintainers = ['AJ', 'SO']
self.tags = {'production', 'craype', 'external-resources', 'health'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_system.name in ['arolla', 'tsa']:
self.modules = ['netcdf', 'netcdf-c++', 'netcdf-fortran']
Expand Down
6 changes: 3 additions & 3 deletions cscs-checks/libraries/math/scalapack_compile_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ class ScaLAPACKTest(rfm.RegressionTest):
maintainers = ['CB', 'LM']
tags = {'production', 'external-resources'}

@rfm.run_after('init')
@run_after('init')
def set_build_flags(self):
self.build_system.fflags = ['-O3']

@rfm.run_after('init')
@run_after('init')
def set_linkage(self):
if self.current_system.name in ['eiger', 'pilatus']:
self.skip_if(self.linkage == 'static',
'static linking not supported on Alps')

self.variables = {'CRAYPE_LINK_TYPE': self.linkage}

@rfm.run_before('sanity')
@run_before('sanity')
def set_sanity_patterns(self):
def fortran_float(value):
return float(value.replace('D', 'E'))
Expand Down
6 changes: 3 additions & 3 deletions cscs-checks/libraries/math/trilinos_compile_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ def __init__(self, linkage):
self.maintainers = ['AJ', 'CB']
self.tags = {'production', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def set_cxxflags(self):
flags = self.prgenv_flags[self.current_environ.name]
self.build_system.cxxflags = flags

@rfm.run_before('compile')
@run_before('compile')
def cdt2006_workaround_intel(self):
if (self.current_environ.name == 'PrgEnv-intel' and
osext.cray_cdt_version() == '20.06'):
Expand All @@ -61,7 +61,7 @@ def cdt2006_workaround_intel(self):
]
self.variables['PKG_CONFIG_PATH'] = '.:$PKG_CONFIG_PATH'

@rfm.run_before('compile')
@run_before('compile')
def cdt2006_workaround_dynamic(self):
if (osext.cray_cdt_version() == '20.06' and
self.linkage == 'dynamic' and
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/mch/automatic_arrays_acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self):
self.maintainers = ['AJ', 'MKr']
self.tags = {'production', 'mch', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name.startswith('PrgEnv-cray'):
envname = 'PrgEnv-cray'
Expand All @@ -64,7 +64,7 @@ def setflags(self):

self.reference = self.arrays_reference[envname]

@rfm.run_before('compile')
@run_before('compile')
def cdt2008_pgi_workaround(self):
cdt = osext.cray_cdt_version()
if not cdt:
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/mch/collectives_halo.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def __init__(self, bench_reference):
else:
self.tags = {'production', 'mch', 'craype'}

@rfm.run_before('run')
@run_before('run')
def set_launcher_options(self):
if self.current_system.name in ['arolla', 'tsa']:
self.job.launcher.options = ['--distribution=block:block',
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/mch/gpu_direct_acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(self):
self.maintainers = ['AJ', 'MKr']
self.tags = {'production', 'mch', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name.startswith('PrgEnv-cray'):
self.build_system.fflags = ['-hacc', '-hnoomp']
Expand All @@ -57,7 +57,7 @@ def setflags(self):
elif self.current_system.name in ['arolla', 'tsa']:
self.build_system.fflags += ['-ta=tesla:cc70']

@rfm.run_before('compile')
@run_before('compile')
def cdt2008_pgi_workaround(self):
cdt = osext.cray_cdt_version()
if not cdt:
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/mch/gpu_direct_cuda.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self):
self.maintainers = ['AJ', 'MKr']
self.tags = {'production', 'mch', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def pgi_workaround_tsa(self):
# FIXME: this is a temporary workaround for PGI on Tsa
if self.current_system.name in ('arolla', 'tsa'):
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/mch/multi_device_openacc.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(self):
self.maintainers = ['LM', 'AJ']
self.tags = {'production', 'mch'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name.startswith('PrgEnv-pgi'):
self.build_system.fflags += ['-acc']
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/mch/openacc_cuda_mpi_cppstd.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self):
self.maintainers = ['AJ', 'MKr']
self.tags = {'production', 'mch', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name.startswith('PrgEnv-cray'):
self.build_system.fflags += ['-hacc', '-hnoomp']
Expand All @@ -69,7 +69,7 @@ def setflags(self):
'-L$EBROOTCUDA/lib64', '-lcublas', '-lcudart'
]

@rfm.run_before('compile')
@run_before('compile')
def cdt2006_pgi_workaround(self):
cdt = osext.cray_cdt_version()
if not cdt:
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self):
self.maintainers = ['AJ', 'VH']
self.tags = {'benchmark', 'diagnostic', 'craype'}

@rfm.run_before('compile')
@run_before('compile')
def setflags(self):
if self.current_environ.name.startswith('PrgEnv-gnu'):
self.build_system.cflags += ['-fopenmp']
Expand All @@ -63,7 +63,7 @@ def setflags(self):
self.build_system.ldflags = ['-L$EBROOTOPENBLAS/lib', '-lopenblas',
'-lpthread', '-lgfortran']

@rfm.run_before('run')
@run_before('run')
def set_tasks(self):
if self.current_partition.fullname in ['daint:gpu', 'dom:gpu']:
self.num_cpus_per_task = 12
Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/microbenchmarks/cpu/likwid/likwid.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def __init__(self, mem_level, kernel_name):
},
}

@rfm.run_before('run')
@run_before('run')
def set_exec_opts(self):
partname = self.current_partition.fullname
self.data_size = self.system_cache_sizes[partname][self.mem_level]
Expand Down Expand Up @@ -138,7 +138,7 @@ def __init__(self):
},
}

@rfm.run_before('run')
@run_before('run')
def set_exec_opts(self):
partname = self.current_partition.fullname
self.num_cpus_per_task = self.system_num_cpus[partname]
Expand Down
Loading