Skip to content

Commit d12895e

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into feat/deprecate-regtest-override
2 parents 3dd8a87 + 106a774 commit d12895e

File tree

82 files changed

+2315
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2315
-918
lines changed

‎ci-scripts/ci-runner.bash‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,15 @@ fi
137137
if [[ $(hostname) =~ tsa ]]; then
138138
# FIXME: Temporary workaround until we have a reframe module on Tsa
139139
module load python
140-
python3 -m venv venv.unittests
141-
source venv.unittests/bin/activate
142-
pip install -r requirements.txt
143140
else
144141
module load reframe
145142
fi
146143

144+
# Always install our requirements
145+
python3 -m venv venv.unittests
146+
source venv.unittests/bin/activate
147+
pip install -r requirements.txt
148+
147149
echo "=============="
148150
echo "Loaded Modules"
149151
echo "=============="

‎config/cscs.py‎

Lines changed: 29 additions & 23 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,12 +109,13 @@ 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,
116116
'resources': {
117-
'switches': ['--switches={num_switches}']
117+
'switches': ['--switches={num_switches}'],
118+
'gres': ['--gres={gres}']
118119
}
119120
},
120121

@@ -130,12 +131,13 @@ class ReframeSettings:
130131
},
131132
'modules': ['daint-mc'],
132133
'access': ['--constraint=mc'],
133-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
134+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
134135
'PrgEnv-intel', 'PrgEnv-pgi'],
135136
'descr': 'Multicore nodes (Broadwell)',
136137
'max_jobs': 100,
137138
'resources': {
138-
'switches': ['--switches={num_switches}']
139+
'switches': ['--switches={num_switches}'],
140+
'gres': ['--gres={gres}']
139141
}
140142
},
141143

@@ -168,9 +170,10 @@ class ReframeSettings:
168170
'scheduler': 'local',
169171
'modules': [],
170172
'access': [],
171-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
172-
'PrgEnv-gnu', 'PrgEnv-intel',
173-
'PrgEnv-pgi'],
173+
'environs': [
174+
'builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic',
175+
'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'
176+
],
174177
'descr': 'Login nodes',
175178
'max_jobs': 4
176179
},
@@ -187,11 +190,14 @@ class ReframeSettings:
187190
},
188191
'modules': ['daint-gpu'],
189192
'access': ['--constraint=gpu'],
190-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
191-
'PrgEnv-gnu', 'PrgEnv-intel',
192-
'PrgEnv-pgi'],
193+
'environs': ['builtin', 'PrgEnv-cray',
194+
'PrgEnv-cray_classic', 'PrgEnv-gnu',
195+
'PrgEnv-intel', 'PrgEnv-pgi'],
193196
'descr': 'Hybrid nodes (Haswell/P100)',
194197
'max_jobs': 100,
198+
'resources': {
199+
'gres': ['--gres={gres}']
200+
}
195201
},
196202

197203
'mc': {
@@ -206,13 +212,13 @@ class ReframeSettings:
206212
},
207213
'modules': ['daint-mc'],
208214
'access': ['--constraint=mc'],
209-
'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic',
210-
'PrgEnv-gnu', 'PrgEnv-intel',
211-
'PrgEnv-pgi'],
215+
'environs': ['builtin', 'PrgEnv-cray',
216+
'PrgEnv-cray_classic', 'PrgEnv-gnu',
217+
'PrgEnv-intel', 'PrgEnv-pgi'],
212218
'descr': 'Multicore nodes (Broadwell)',
213219
'max_jobs': 100,
214220
'resources': {
215-
'switches': ['--switches={num_switches}']
221+
'gres': ['--gres={gres}']
216222
}
217223
},
218224

@@ -534,8 +540,8 @@ class ReframeSettings:
534540

535541
'builtin': {
536542
'cc': 'cc',
537-
'cxx': '',
538-
'ftn': '',
543+
'cxx': 'CC',
544+
'ftn': 'ftn',
539545
},
540546

541547
'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: 7 additions & 7 deletions
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

@@ -62,7 +62,7 @@ def __init__(self, scale, variant):
6262
'maint': {
6363
'small': {
6464
'dom:mc': {'time': (202.2, None, 0.05, 's')},
65-
'daint:mc': {'time': (214.5, None, 0.15, 's')}
65+
'daint:mc': {'time': (180.9, None, 0.08, 's')}
6666
},
6767
'large': {
6868
'daint:mc': {'time': (141.0, None, 0.05, 's')}
@@ -71,7 +71,7 @@ def __init__(self, scale, variant):
7171
'prod': {
7272
'small': {
7373
'dom:mc': {'time': (202.2, None, 0.05, 's')},
74-
'daint:mc': {'time': (214.5, None, 0.15, 's')}
74+
'daint:mc': {'time': (180.9, None, 0.08, 's')}
7575
},
7676
'large': {
7777
'daint:mc': {'time': (113.0, None, 0.05, 's')}
@@ -105,19 +105,19 @@ def __init__(self, scale, variant):
105105
'maint': {
106106
'small': {
107107
'dom:gpu': {'time': (251.8, None, 0.15, 's')},
108-
'daint:gpu': {'time': (262.6, None, 0.10, 's')}
108+
'daint:gpu': {'time': (241.3, None, 0.05, 's')}
109109
},
110110
'large': {
111-
'daint:gpu': {'time': (222.6, None, 0.05, 's')}
111+
'daint:gpu': {'time': (199.6, None, 0.06, 's')}
112112
}
113113
},
114114
'prod': {
115115
'small': {
116116
'dom:gpu': {'time': (240.0, None, 0.05, 's')},
117-
'daint:gpu': {'time': (262.6, None, 0.10, 's')}
117+
'daint:gpu': {'time': (241.3, None, 0.05, 's')}
118118
},
119119
'large': {
120-
'daint:gpu': {'time': (222.6, None, 0.05, 's')}
120+
'daint:gpu': {'time': (199.6, None, 0.06, 's')}
121121
}
122122
}
123123
}

‎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: 3 additions & 3 deletions
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']
@@ -33,15 +33,15 @@ def __init__(self, scale):
3333
'time': (159.0, None, 0.05, 's'),
3434
},
3535
'daint:mc': {
36-
'time': (151.6, None, 0.05, 's')
36+
'time': (147.3, None, 0.41, 's')
3737
},
3838
}
3939
else:
4040
self.num_tasks = 576
4141
self.num_tasks_per_node = 36
4242
self.reference = {
4343
'daint:mc': {
44-
'time': (157.0, None, 0.40, 's')
44+
'time': (149.7, None, 0.52, 's')
4545
},
4646
}
4747

0 commit comments

Comments
 (0)