Skip to content

Commit 84fee46

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into checks/fft
2 parents 744fa20 + 12b7110 commit 84fee46

File tree

28 files changed

+1148
-115
lines changed

28 files changed

+1148
-115
lines changed

‎ci-scripts/genrelnotes.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def extract_release_notes(git_output, tag):
2222

2323
prev_release, curr_release, *_ = sys.argv[1:]
2424
try:
25-
git_cmd = 'git log --merges v%s..v%s' % (prev_release, curr_release)
25+
git_cmd = 'git log --merges %s..%s' % (prev_release, curr_release)
2626
completed = subprocess.run(git_cmd.split(),
2727
stdout=subprocess.PIPE,
2828
stderr=subprocess.STDOUT,

‎config/cscs.py‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,49 @@ class ReframeSettings:
1111
checks_path_recurse = True
1212
site_configuration = {
1313
'systems': {
14+
'ault': {
15+
'descr': 'Ault TDS',
16+
'hostnames': ['ault'],
17+
'modules_system': 'lmod',
18+
'resourcesdir': '/apps/common/UES/reframe/resources',
19+
'partitions': {
20+
'login': {
21+
'scheduler': 'local',
22+
'environs': ['PrgEnv-gnu'],
23+
'descr': 'Login nodes',
24+
'max_jobs': 4
25+
},
26+
'amdv100': {
27+
'scheduler': 'nativeslurm',
28+
'access': ['-pamdv100'],
29+
'environs': ['PrgEnv-gnu'],
30+
'descr': 'AMD Naples 32c + 2x NVIDIA V100',
31+
'max_jobs': 100,
32+
},
33+
'amdvega': {
34+
'scheduler': 'nativeslurm',
35+
'access': ['-pamdvega'],
36+
'environs': ['PrgEnv-gnu'],
37+
'descr': 'AMD Naples 32c + 3x AMD GFX900',
38+
'max_jobs': 100,
39+
},
40+
'intelv100': {
41+
'scheduler': 'nativeslurm',
42+
'access': ['-pintelv100'],
43+
'environs': ['PrgEnv-gnu'],
44+
'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
45+
'max_jobs': 100,
46+
},
47+
'intel': {
48+
'scheduler': 'nativeslurm',
49+
'access': ['-pintel'],
50+
'environs': ['PrgEnv-gnu'],
51+
'descr': 'Intel Skylake 36c',
52+
'max_jobs': 100,
53+
}
54+
}
55+
},
56+
1457
'daint': {
1558
'descr': 'Piz Daint',
1659
'hostnames': ['daint'],
@@ -244,6 +287,30 @@ class ReframeSettings:
244287
},
245288

246289
'environments': {
290+
291+
'ault': {
292+
'PrgEnv-gnu': {
293+
'type': 'ProgEnvironment',
294+
# defaults were gcc/8.3.0, cuda/10.1, openmpi/4.0.0
295+
'modules': ['gcc', 'cuda/10.1', 'openmpi'],
296+
'cc': 'mpicc',
297+
'cxx': 'mpicxx',
298+
'ftn': 'mpif90',
299+
},
300+
'builtin': {
301+
'type': 'ProgEnvironment',
302+
'cc': 'cc',
303+
'cxx': '',
304+
'ftn': '',
305+
},
306+
'builtin-gcc': {
307+
'type': 'ProgEnvironment',
308+
'cc': 'gcc',
309+
'cxx': 'g++',
310+
'ftn': 'gfortran',
311+
}
312+
},
313+
247314
'kesch': {
248315
'PrgEnv-pgi-nompi': {
249316
'type': 'ProgEnvironment',
@@ -327,6 +394,7 @@ class ReframeSettings:
327394
'ftn': 'mpif90',
328395
},
329396
},
397+
330398
'leone': {
331399
'PrgEnv-gnu': {
332400
'type': 'ProgEnvironment',
@@ -336,6 +404,7 @@ class ReframeSettings:
336404
'ftn': 'mpif90',
337405
},
338406
},
407+
339408
'monch': {
340409
'PrgEnv-gnu': {
341410
'type': 'ProgEnvironment',
@@ -345,6 +414,7 @@ class ReframeSettings:
345414
'ftn': 'mpif90',
346415
}
347416
},
417+
348418
'*': {
349419
'PrgEnv-cray': {
350420
'type': 'ProgEnvironment',

‎cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ def __init__(self, hugepages):
1616
if hugepages == 'no':
1717
self.valid_systems += ['kesch:cn', 'kesch:pn']
1818
else:
19-
self.modules = ['craype-hugepages%s' % hugepages]
19+
if self.current_system.name in {'dom', 'daint'}:
20+
self.modules = ['craype-hugepages%s' % hugepages]
2021

2122
self.sanity_patterns = sn.assert_found('4096 MB', self.stdout)
2223
self.perf_patterns = {
@@ -42,6 +43,9 @@ def __init__(self, hugepages):
4243
},
4344
'kesch:pn': {
4445
'time': (0.55, None, 0.10, 's')
46+
},
47+
'*': {
48+
'time': (0, None, None, 's')
4549
}
4650
},
4751
'2M': {
@@ -57,6 +61,9 @@ def __init__(self, hugepages):
5761
'daint:mc': {
5862
'time': (0.20, None, 0.10, 's')
5963
},
64+
'*': {
65+
'time': (0, None, None, 's')
66+
}
6067
},
6168
}
6269
self.reference = self.sys_reference[hugepages]

‎cscs-checks/microbenchmarks/kernel_latency/kernel_latency.py‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,35 @@
77
class KernelLatencyTest(rfm.RegressionTest):
88
def __init__(self, kernel_version):
99
super().__init__()
10-
self.sourcepath = 'kernel_latency.cu'
11-
self.build_system = 'SingleSource'
10+
# List known partitions here so as to avoid specifying them every time
11+
# with --system
1212
self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
13-
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi']
1413
self.num_tasks = 0
1514
self.num_tasks_per_node = 1
16-
15+
self.sourcepath = 'kernel_latency.cu'
16+
self.build_system = 'SingleSource'
17+
self.build_system.cxxflags = ['-std=c++11']
1718
if self.current_system.name in {'dom', 'daint'}:
1819
self.num_gpus_per_node = 1
1920
gpu_arch = '60'
2021
self.modules = ['craype-accel-nvidia60']
21-
self.valid_prog_environs += ['PrgEnv-gnu']
22-
else:
22+
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi',
23+
'PrgEnv-gnu']
24+
elif self.current_system.name == 'kesch':
2325
self.num_gpus_per_node = 16
26+
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi']
2427
self.modules = ['craype-accel-nvidia35']
2528
gpu_arch = '37'
29+
else:
30+
# Enable test when running on an unknown system
31+
self.num_gpus_per_node = 1
32+
self.valid_systems = ['*']
33+
self.valid_prog_environs = ['*']
34+
gpu_arch = None
2635

27-
self.build_system.cxxflags = ['-arch=compute_%s' % gpu_arch,
28-
'-code=sm_%s' % gpu_arch, '-std=c++11']
36+
if gpu_arch:
37+
self.build_system.cxxflags += ['-arch=compute_%s' % gpu_arch,
38+
'-code=sm_%s' % gpu_arch]
2939

3040
if kernel_version == 'sync':
3141
self.build_system.cppflags = ['-D SYNCKERNEL=1']
@@ -59,6 +69,9 @@ def __init__(self, kernel_version):
5969
'kesch:cn': {
6070
'latency': (12.0, None, 0.10, 'us')
6171
},
72+
'*': {
73+
'latency': (0.0, None, None, 'us')
74+
}
6275
},
6376
'async': {
6477
'dom:gpu': {
@@ -70,6 +83,9 @@ def __init__(self, kernel_version):
7083
'kesch:cn': {
7184
'latency': (5.7, None, 0.10, 'us')
7285
},
86+
'*': {
87+
'latency': (0.0, None, None, 'us')
88+
}
7389
},
7490
}
7591

‎cscs-checks/microbenchmarks/osu/osu_tests.py‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ def __init__(self, variant):
1313
self.build_system = 'Make'
1414
self.build_system.makefile = 'Makefile_alltoall'
1515
self.executable = './osu_alltoall'
16-
# The -x option controls the number of warm-up iterations
17-
# The -i option controls the number of iterations
16+
# The -m option sets the maximum message size
17+
# The -x option sets the number of warm-up iterations
18+
# The -i option sets the number of iterations
1819
self.executable_opts = ['-m', '8', '-x', '1000', '-i', '20000']
1920
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
2021
'PrgEnv-intel']
@@ -24,22 +25,24 @@ def __init__(self, variant):
2425
'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',
2526
self.stdout, 'latency', float)
2627
}
27-
self.tags = {variant}
28+
self.tags = {variant, 'benchmark'}
2829
self.reference = {
2930
'dom:gpu': {
3031
'latency': (8.23, None, 0.1, 'us')
3132
},
3233
'daint:gpu': {
3334
'latency': (20.73, None, 2.0, 'us')
3435
},
36+
'*': {
37+
'latency': (0, None, None, 'us')
38+
},
3539
}
3640
self.num_tasks_per_node = 1
3741
self.num_gpus_per_node = 1
38-
if self.current_system.name == 'dom':
39-
self.num_tasks = 6
40-
4142
if self.current_system.name == 'daint':
4243
self.num_tasks = 16
44+
else:
45+
self.num_tasks = 6
4346

4447
self.extra_resources = {
4548
'switches': {
@@ -69,7 +72,7 @@ def __init__(self):
6972
self.num_tasks_per_node = 1
7073
self.num_tasks = 0
7174
self.sanity_patterns = sn.assert_found(r'^1048576', self.stdout)
72-
self.tags = {'diagnostic', 'ops'}
75+
self.tags = {'diagnostic', 'ops', 'benchmark'}
7376

7477

7578
@rfm.required_version('>=2.16')
@@ -96,7 +99,7 @@ def __init__(self, variant):
9699
'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',
97100
self.stdout, 'latency', float)
98101
}
99-
self.tags = {'production'}
102+
self.tags = {'production', 'benchmark'}
100103
if variant == 'small':
101104
self.num_tasks = 6
102105
self.reference = {
@@ -108,6 +111,9 @@ def __init__(self, variant):
108111
},
109112
'daint:mc': {
110113
'latency': (8.79, None, 0.25, 'us')
114+
},
115+
'*': {
116+
'latency': (0, None, None, 'us')
111117
}
112118
}
113119
else:
@@ -118,11 +124,12 @@ def __init__(self, variant):
118124
},
119125
'daint:mc': {
120126
'latency': (10.85, None, 0.20, 'us')
127+
},
128+
'*': {
129+
'latency': (0, None, None, 'us')
121130
}
122131
}
123132

124-
# Allow test to run on new systems without errors
125-
self.reference['*:latency'] = (0, None, None, 'us')
126133
self.num_tasks_per_node = 1
127134
self.num_gpus_per_node = 1
128135
self.extra_resources = {
@@ -175,7 +182,7 @@ def __init__(self):
175182
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
176183
'PrgEnv-intel']
177184
self.maintainers = ['RS', 'VK']
178-
self.tags = {'production'}
185+
self.tags = {'production', 'benchmark'}
179186
self.sanity_patterns = sn.assert_found(r'^4194304', self.stdout)
180187

181188
self.extra_resources = {
@@ -213,6 +220,9 @@ def __init__(self):
213220
},
214221
'kesch:cn': {
215222
'bw': (6311.48, -0.15, None, 'MB/s')
223+
},
224+
'*': {
225+
'bw': (0, None, None, 'MB/s')
216226
}
217227
}
218228
self.perf_patterns = {
@@ -250,6 +260,9 @@ def __init__(self):
250260
},
251261
'kesch:cn': {
252262
'latency': (1.17, None, 0.1, 'us')
263+
},
264+
'*': {
265+
'latency': (0, None, None, 'us')
253266
}
254267
}
255268
self.perf_patterns = {
@@ -280,6 +293,9 @@ def __init__(self):
280293
'kesch:cn': {
281294
'bw': (6288.98, -0.1, None, 'MB/s')
282295
},
296+
'*': {
297+
'bw': (0, None, None, 'MB/s')
298+
}
283299
}
284300
self.perf_patterns = {
285301
'bw': sn.extractsingle(r'^4194304\s+(?P<bw>\S+)',
@@ -317,6 +333,9 @@ def __init__(self):
317333
'kesch:cn': {
318334
'latency': (23.09, None, 0.1, 'us')
319335
},
336+
'*': {
337+
'latency': (0, None, None, 'us')
338+
}
320339
}
321340
self.perf_patterns = {
322341
'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',

0 commit comments

Comments
 (0)