Skip to content

Commit 1fdf880

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1224 from victorusu/test/builtin-apps
[test] Use builtin programming environment for tests loading EB modules
2 parents 978a670 + b8f1349 commit 1fdf880

File tree

25 files changed

+45
-44
lines changed

25 files changed

+45
-44
lines changed

‎config/cscs.py‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,35 @@ class ReframeSettings:
2323
'partitions': {
2424
'login': {
2525
'scheduler': 'local',
26-
'environs': ['PrgEnv-gnu'],
26+
'environs': ['builtin', 'PrgEnv-gnu'],
2727
'descr': 'Login nodes',
2828
'max_jobs': 4
2929
},
3030
'amdv100': {
3131
'scheduler': 'nativeslurm',
3232
'access': ['-pamdv100'],
33-
'environs': ['PrgEnv-gnu'],
33+
'environs': ['builtin', 'PrgEnv-gnu'],
3434
'descr': 'AMD Naples 32c + 2x NVIDIA V100',
3535
'max_jobs': 100,
3636
},
3737
'amdvega': {
3838
'scheduler': 'nativeslurm',
3939
'access': ['-pamdvega'],
40-
'environs': ['PrgEnv-gnu'],
40+
'environs': ['builtin', 'PrgEnv-gnu'],
4141
'descr': 'AMD Naples 32c + 3x AMD GFX900',
4242
'max_jobs': 100,
4343
},
4444
'intelv100': {
4545
'scheduler': 'nativeslurm',
4646
'access': ['-pintelv100'],
47-
'environs': ['PrgEnv-gnu'],
47+
'environs': ['builtin', 'PrgEnv-gnu'],
4848
'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
4949
'max_jobs': 100,
5050
},
5151
'intel': {
5252
'scheduler': 'nativeslurm',
5353
'access': ['-pintel'],
54-
'environs': ['PrgEnv-gnu'],
54+
'environs': ['builtin', 'PrgEnv-gnu'],
5555
'descr': 'Intel Skylake 36c',
5656
'max_jobs': 100,
5757
}
@@ -66,7 +66,7 @@ class ReframeSettings:
6666
'partitions': {
6767
'login': {
6868
'scheduler': 'local',
69-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
69+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
7070
'PrgEnv-intel', 'PrgEnv-pgi'],
7171
'descr': 'Login nodes',
7272
'max_jobs': 4
@@ -91,7 +91,7 @@ class ReframeSettings:
9191
'scheduler': 'local',
9292
'modules': [],
9393
'access': [],
94-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
94+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
9595
'PrgEnv-intel', 'PrgEnv-pgi'],
9696
'descr': 'Login nodes',
9797
'max_jobs': 4
@@ -109,7 +109,7 @@ class ReframeSettings:
109109
},
110110
'modules': ['daint-gpu'],
111111
'access': ['--constraint=gpu'],
112-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
112+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
113113
'PrgEnv-intel', 'PrgEnv-pgi'],
114114
'descr': 'Hybrid nodes (Haswell/P100)',
115115
'max_jobs': 100,
@@ -130,7 +130,7 @@ class ReframeSettings:
130130
},
131131
'modules': ['daint-mc'],
132132
'access': ['--constraint=mc'],
133-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
133+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
134134
'PrgEnv-intel', 'PrgEnv-pgi'],
135135
'descr': 'Multicore nodes (Broadwell)',
136136
'max_jobs': 100,
@@ -168,9 +168,10 @@ class ReframeSettings:
168168
'scheduler': 'local',
169169
'modules': [],
170170
'access': [],
171-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
172-
'PrgEnv-gnu', 'PrgEnv-intel',
173-
'PrgEnv-pgi'],
171+
'environs': [
172+
'builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic',
173+
'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'
174+
],
174175
'descr': 'Login nodes',
175176
'max_jobs': 4
176177
},
@@ -187,9 +188,9 @@ class ReframeSettings:
187188
},
188189
'modules': ['daint-gpu'],
189190
'access': ['--constraint=gpu'],
190-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
191-
'PrgEnv-gnu', 'PrgEnv-intel',
192-
'PrgEnv-pgi'],
191+
'environs': ['builtin', 'PrgEnv-cray',
192+
'PrgEnv-cray_classic', 'PrgEnv-gnu',
193+
'PrgEnv-intel', 'PrgEnv-pgi'],
193194
'descr': 'Hybrid nodes (Haswell/P100)',
194195
'max_jobs': 100,
195196
},
@@ -206,9 +207,9 @@ class ReframeSettings:
206207
},
207208
'modules': ['daint-mc'],
208209
'access': ['--constraint=mc'],
209-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
210-
'PrgEnv-gnu', 'PrgEnv-intel',
211-
'PrgEnv-pgi'],
210+
'environs': ['builtin', 'PrgEnv-cray',
211+
'PrgEnv-cray_classic', 'PrgEnv-gnu',
212+
'PrgEnv-intel', 'PrgEnv-pgi'],
212213
'descr': 'Multicore nodes (Broadwell)',
213214
'max_jobs': 100,
214215
'resources': {
@@ -534,8 +535,8 @@ class ReframeSettings:
534535

535536
'builtin': {
536537
'cc': 'cc',
537-
'cxx': '',
538-
'ftn': '',
538+
'cxx': 'CC',
539+
'ftn': 'ftn',
539540
},
540541

541542
'builtin-gcc': {

‎cscs-checks/apps/amber/amber_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AmberBaseCheck(rfm.RunOnlyRegressionTest):
1313
def __init__(self, input_file, output_file):
1414
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
1515
'Amber')
16-
self.valid_prog_environs = ['PrgEnv-gnu']
16+
self.valid_prog_environs = ['builtin']
1717
self.modules = ['Amber']
1818
self.num_tasks = 1
1919
self.num_tasks_per_node = 1

‎cscs-checks/apps/cp2k/cp2k_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class Cp2kCheck(rfm.RunOnlyRegressionTest):
1212
def __init__(self):
13-
self.valid_prog_environs = ['PrgEnv-gnu']
13+
self.valid_prog_environs = ['builtin']
1414
self.executable = 'cp2k.psmp'
1515
self.executable_opts = ['H2O-256.inp']
1616

‎cscs-checks/apps/cpmd/cpmd_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __init__(self, scale):
2323
self.num_tasks = 16
2424

2525
self.num_tasks_per_node = 1
26-
self.valid_prog_environs = ['PrgEnv-intel']
26+
self.valid_prog_environs = ['builtin']
2727
self.modules = ['CPMD']
2828
self.executable = 'cpmd.x'
2929
self.executable_opts = ['ana_c4h6.in > stdout.txt']

‎cscs-checks/apps/espresso/espresso_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def __init__(self, scale):
2020
'Espresso')
2121

2222
self.valid_systems = ['daint:mc']
23-
self.valid_prog_environs = ['PrgEnv-intel']
23+
self.valid_prog_environs = ['builtin']
2424
self.modules = ['QuantumESPRESSO']
2525
self.executable = 'pw.x'
2626
self.executable_opts = ['-in', 'ausurf.in']

‎cscs-checks/apps/gromacs/gromacs_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

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

1818
# Reset sources dir relative to the SCS apps prefix

‎cscs-checks/apps/lammps/lammps_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class LAMMPSBaseCheck(rfm.RunOnlyRegressionTest):
1313
def __init__(self):
14-
self.valid_prog_environs = ['PrgEnv-gnu']
14+
self.valid_prog_environs = ['builtin']
1515
self.modules = ['LAMMPS']
1616

1717
# Reset sources dir relative to the SCS apps prefix

‎cscs-checks/apps/namd/namd_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class NamdBaseCheck(rfm.RunOnlyRegressionTest):
1313
def __init__(self, arch, scale, variant):
1414
self.descr = 'NAMD check (%s, %s)' % (arch, variant)
15-
self.valid_prog_environs = ['PrgEnv-intel']
15+
self.valid_prog_environs = ['builtin']
1616
self.modules = ['NAMD']
1717

1818
# Reset sources dir relative to the SCS apps prefix

‎cscs-checks/apps/openfoam/check_openfoam.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self):
1919

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

2525
self.num_tasks = 1

‎cscs-checks/apps/openfoam/check_openfoam_extend.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self):
1919

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

2525
self.num_tasks = 1

0 commit comments

Comments
 (0)