Skip to content

[test] Use builtin programming environment for tests loading EB modules #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 12, 2020
Merged

[test] Use builtin programming environment for tests loading EB modules #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2ebfd0
Use builtin Prg-Env for apps
victorusu Mar 9, 2020
f521a20
Merge branch 'master' of https://github.com/eth-cscs/reframe into tes…
victorusu Mar 11, 2020
f468b0f
Extend builtin PrgEnv to more tests
victorusu Mar 11, 2020
4e3e80a
Revert builtin modules changes to kesch et.al
victorusu Mar 12, 2020
3d2e9de
Address PR remarks
victorusu Mar 12, 2020
de9a97d
Fix PEP8 issues
Mar 12, 2020
b8f1349
Merge branch 'master' into test/builtin-apps
Mar 12, 2020
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
41 changes: 21 additions & 20 deletions config/cscs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@ class ReframeSettings:
'partitions': {
'login': {
'scheduler': 'local',
'environs': ['PrgEnv-gnu'],
'environs': ['builtin', 'PrgEnv-gnu'],
'descr': 'Login nodes',
'max_jobs': 4
},
'amdv100': {
'scheduler': 'nativeslurm',
'access': ['-pamdv100'],
'environs': ['PrgEnv-gnu'],
'environs': ['builtin', 'PrgEnv-gnu'],
'descr': 'AMD Naples 32c + 2x NVIDIA V100',
'max_jobs': 100,
},
'amdvega': {
'scheduler': 'nativeslurm',
'access': ['-pamdvega'],
'environs': ['PrgEnv-gnu'],
'environs': ['builtin', 'PrgEnv-gnu'],
'descr': 'AMD Naples 32c + 3x AMD GFX900',
'max_jobs': 100,
},
'intelv100': {
'scheduler': 'nativeslurm',
'access': ['-pintelv100'],
'environs': ['PrgEnv-gnu'],
'environs': ['builtin', 'PrgEnv-gnu'],
'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
'max_jobs': 100,
},
'intel': {
'scheduler': 'nativeslurm',
'access': ['-pintel'],
'environs': ['PrgEnv-gnu'],
'environs': ['builtin', 'PrgEnv-gnu'],
'descr': 'Intel Skylake 36c',
'max_jobs': 100,
}
Expand All @@ -66,7 +66,7 @@ class ReframeSettings:
'partitions': {
'login': {
'scheduler': 'local',
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Login nodes',
'max_jobs': 4
Expand All @@ -91,7 +91,7 @@ class ReframeSettings:
'scheduler': 'local',
'modules': [],
'access': [],
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Login nodes',
'max_jobs': 4
Expand All @@ -109,7 +109,7 @@ class ReframeSettings:
},
'modules': ['daint-gpu'],
'access': ['--constraint=gpu'],
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Hybrid nodes (Haswell/P100)',
'max_jobs': 100,
Expand All @@ -130,7 +130,7 @@ class ReframeSettings:
},
'modules': ['daint-mc'],
'access': ['--constraint=mc'],
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Multicore nodes (Broadwell)',
'max_jobs': 100,
Expand Down Expand Up @@ -168,9 +168,10 @@ class ReframeSettings:
'scheduler': 'local',
'modules': [],
'access': [],
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel',
'PrgEnv-pgi'],
'environs': [
'builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'
],
'descr': 'Login nodes',
'max_jobs': 4
},
Expand All @@ -187,9 +188,9 @@ class ReframeSettings:
},
'modules': ['daint-gpu'],
'access': ['--constraint=gpu'],
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel',
'PrgEnv-pgi'],
'environs': ['builtin', 'PrgEnv-cray',
'PrgEnv-cray_classic', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Hybrid nodes (Haswell/P100)',
'max_jobs': 100,
},
Expand All @@ -206,9 +207,9 @@ class ReframeSettings:
},
'modules': ['daint-mc'],
'access': ['--constraint=mc'],
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel',
'PrgEnv-pgi'],
'environs': ['builtin', 'PrgEnv-cray',
'PrgEnv-cray_classic', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'],
'descr': 'Multicore nodes (Broadwell)',
'max_jobs': 100,
'resources': {
Expand Down Expand Up @@ -534,8 +535,8 @@ class ReframeSettings:

'builtin': {
'cc': 'cc',
'cxx': '',
'ftn': '',
'cxx': 'CC',
'ftn': 'ftn',
},

'builtin-gcc': {
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/amber/amber_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AmberBaseCheck(rfm.RunOnlyRegressionTest):
def __init__(self, input_file, output_file):
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
'Amber')
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['Amber']
self.num_tasks = 1
self.num_tasks_per_node = 1
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/cp2k/cp2k_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class Cp2kCheck(rfm.RunOnlyRegressionTest):
def __init__(self):
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.executable = 'cp2k.psmp'
self.executable_opts = ['H2O-256.inp']

Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/cpmd/cpmd_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(self, scale):
self.num_tasks = 16

self.num_tasks_per_node = 1
self.valid_prog_environs = ['PrgEnv-intel']
self.valid_prog_environs = ['builtin']
self.modules = ['CPMD']
self.executable = 'cpmd.x'
self.executable_opts = ['ana_c4h6.in > stdout.txt']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/espresso/espresso_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __init__(self, scale):
'Espresso')

self.valid_systems = ['daint:mc']
self.valid_prog_environs = ['PrgEnv-intel']
self.valid_prog_environs = ['builtin']
self.modules = ['QuantumESPRESSO']
self.executable = 'pw.x'
self.executable_opts = ['-in', 'ausurf.in']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/gromacs/gromacs_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class GromacsBaseCheck(rfm.RunOnlyRegressionTest):
def __init__(self, output_file):
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.executable = 'gmx_mpi'

# Reset sources dir relative to the SCS apps prefix
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/lammps/lammps_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class LAMMPSBaseCheck(rfm.RunOnlyRegressionTest):
def __init__(self):
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['LAMMPS']

# Reset sources dir relative to the SCS apps prefix
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/namd/namd_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class NamdBaseCheck(rfm.RunOnlyRegressionTest):
def __init__(self, arch, scale, variant):
self.descr = 'NAMD check (%s, %s)' % (arch, variant)
self.valid_prog_environs = ['PrgEnv-intel']
self.valid_prog_environs = ['builtin']
self.modules = ['NAMD']

# Reset sources dir relative to the SCS apps prefix
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/openfoam/check_openfoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self):

# OpenFOAM currently runs only on Leone
self.valid_systems = ['leone:normal']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['OpenFOAM/4.1-foss-2016b']

self.num_tasks = 1
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/openfoam/check_openfoam_extend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self):

# OpenFOAM-Extend currently runs only on Leone
self.valid_systems = ['leone:normal']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['OpenFOAM-Extend/4.0-foss-2016b']

self.num_tasks = 1
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/paraview/paraview_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class ParaViewCheck(rfm.RunOnlyRegressionTest):
def __init__(self):
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.num_tasks = 12
self.num_tasks_per_node = 12
self.modules = ['ParaView']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/python/numpy_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class NumpyBaseTest(rfm.RunOnlyRegressionTest):
def __init__(self):
self.descr = 'Test a few typical numpy operations'
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['numpy/1.17.2-CrayGNU-19.10']
self.reference = {
'daint:gpu': {
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/spark/spark_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def __init__(self):
self.descr = 'Simple calculation of pi with Spark'
self.valid_systems = ['daint:gpu', 'daint:mc',
'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['Spark']
self.sourcesdir = None
self.pre_run = ['start-all.sh']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/tensorflow/tensorflow_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def __init__(self, model_name):
self.name = 'tensorflow_%s_check' % model_name
self.descr = 'Tensorflow official %s test' % model_name
self.valid_systems = ['daint:gpu', 'dom:gpu']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.sourcesdir = 'https://github.com/tensorflow/models.git'
self.maintainers = ['TM', 'RS']
self.tags = {'production'}
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/tensorflow/tf2_horovod_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TensorFlow2HorovodTest(rfm.RunOnlyRegressionTest):
def __init__(self, variant):
self.descr = 'Distributed training with TensorFlow2 and Horovod'
self.valid_systems = ['daint:gpu']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['Horovod/0.18.1-CrayGNU-19.10-tf-2.0.0']
self.sourcesdir = None
self.num_tasks_per_node = 1
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/tensorflow/tf_horovod_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TensorFlowHorovodTest(rfm.RunOnlyRegressionTest):
def __init__(self, variant):
self.descr = 'Distributed training with TensorFlow and Horovod'
self.valid_systems = ['daint:gpu']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
tfshortver = '1.14'
self.sourcesdir = 'https://github.com/tensorflow/benchmarks'
self.modules = ['Horovod/0.16.4-CrayGNU-19.10-tf-%s.0' % tfshortver]
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/boost/boost_python_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, boost_version, cray_gnu_version, python_version):
'support') % (boost_version, cray_gnu_version,
python_version)
self.valid_systems = ['daint:mc', 'daint:gpu', 'dom:mc', 'dom:gpu']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
python_major, python_minor = python_version.split('.')
self.modules = ['Boost/%s-CrayGNU-%s-python%s' % (
boost_version, cray_gnu_version, python_major)]
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/gridtools/gridtools_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class GridToolsCheck(rfm.RegressionTest):
def __init__(self, variant):
# Check if this is a device check
self.descr = 'GridTools test base'
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.modules = ['CMake', 'Boost']
is_cuda_test = 'cuda' in variant
if is_cuda_test:
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/hpx/hpx_hello_world.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class HelloWorldHPXCheck(rfm.RunOnlyRegressionTest):
def __init__(self):
self.descr = 'HPX hello, world check'
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']

self.modules = ['HPX']
self.executable = 'hello_world_distributed'
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/hpx/hpx_stencil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Stencil4HPXCheck(rfm.RunOnlyRegressionTest):
def __init__(self):
self.descr = 'HPX 1d_stencil_4 check'
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']

self.modules = ['HPX']
self.executable = '1d_stencil_4'
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/libraries/magma/magma_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self, subtest):

self.prebuild_cmd = ['patch < patch.txt']
self.build_system = 'Make'
self.valid_prog_environs = ['PrgEnv-intel']
self.valid_prog_environs = ['builtin']
self.build_system.makefile = 'Makefile_%s' % subtest
# Compile with -O0 since with a higher level the compiler seems to
# optimise something away
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/microbenchmarks/simd/nsimd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class NsimdTest(rfm.RegressionTest):
'''
def __init__(self):
self.valid_systems = ['dom:mc', 'dom:gpu']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.descr = 'sqrt.avx2.f64 example'
self.build_system = 'SingleSource'
self.testname = 'sqrt.avx2.f64'
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/microbenchmarks/simd/vc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class VcSimdTest(rfm.RegressionTest):
'''
def __init__(self):
self.valid_systems = ['*']
self.valid_prog_environs = ['PrgEnv-gnu']
self.valid_prog_environs = ['builtin']
self.descr = 'finitediff example'
self.build_system = 'SingleSource'
self.testname = 'finitediff'
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/tools/io/cdo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def __init__(self):
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
self.modules = ['cdo', 'netcdf-fortran']
else:
self.valid_prog_environs = ['PrgEnv-gnu']
self.modules = ['CDO']
self.valid_prog_environs = ['builtin']

self.maintainers = ['SO', 'CB']
self.tags = {'production', 'mch', 'external-resources'}
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/tools/io/nco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def __init__(self):
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
self.modules = ['nco']
else:
self.valid_prog_environs = ['PrgEnv-gnu']
self.modules = ['NCO']
self.valid_prog_environs = ['builtin']

self.maintainers = ['SO', 'CB']
self.tags = {'production', 'mch', 'external-resources'}
Expand Down