Skip to content

[test] Adapt OpenMP flags for CCE 9.0.x in Jacobi tools tests #849

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 5 commits into from
Jul 4, 2019
Merged

[test] Adapt OpenMP flags for CCE 9.0.x in Jacobi tools tests #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6f821f
Adapt OpenMP flags for CCE 9.0.x in jacobi tests
Jul 1, 2019
a0114ec
Test also with PrgEnv-cray_classic
Jul 1, 2019
291b6b9
Merge branch 'master' into test/jacobi_cpp
jgphpc Jul 1, 2019
4a1fb52
Merge branch 'master' into test/jacobi_cpp
Jul 4, 2019
ccaa18b
Merge branch 'master' into test/jacobi_cpp
Jul 4, 2019
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
11 changes: 8 additions & 3 deletions cscs-checks/tools/profiling_and_debugging/notool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ def __init__(self, lang):
self.descr = 'Jacobi (without tool) %s check' % lang
self.name = '%s_%s' % (type(self).__name__, lang.replace('+', 'p'))
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi']
self.prgenv_flags = {
'PrgEnv-cray': ['-O2', '-g', '-homp'],
'PrgEnv-cray': ['-O2', '-g',
'-homp' if lang == 'F90' else '-fopenmp'],
'PrgEnv-cray_classic': ['-O2', '-g', '-homp'],
'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'],
'PrgEnv-intel': ['-O2', '-g', '-qopenmp'],
'PrgEnv-pgi': ['-O2', '-g', '-mp']
Expand All @@ -42,6 +44,7 @@ def __init__(self, lang):
# OpenMP support varies between compilers:
self.openmp_versions = ScopedDict({
'PrgEnv-cray': {'version': 201511},
'PrgEnv-cray_classic': {'version': 201511},
'PrgEnv-gnu': {'version': 201511},
'PrgEnv-intel': {'version': 201611},
'PrgEnv-pgi': {'version': 201307},
Expand All @@ -68,13 +71,15 @@ def __init__(self, lang):
if lang == 'C++':
self.reference_prgenv = {
'PrgEnv-cray': (0.38, -0.6, None, 's'),
'PrgEnv-cray_classic': (0.38, -0.6, None, 's'),
'PrgEnv-gnu': (0.38, -0.6, None, 's'),
'PrgEnv-intel': (0.38, -0.6, None, 's'),
'PrgEnv-pgi': (18.0, -0.6, None, 's'),
}
elif lang == 'F90':
self.reference_prgenv = {
'PrgEnv-cray': (0.17, -0.6, None, 's'),
'PrgEnv-cray_classic': (0.17, -0.6, None, 's'),
'PrgEnv-gnu': (0.17, -0.6, None, 's'),
'PrgEnv-intel': (0.17, -0.6, None, 's'),
'PrgEnv-pgi': (18.0, -0.6, None, 's'),
Expand Down
10 changes: 6 additions & 4 deletions cscs-checks/tools/profiling_and_debugging/perftools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def __init__(self, lang):
else:
self.valid_systems = ['daint:gpu', 'dom:gpu']

self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic',
'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi']
if lang == 'Cpp':
self.sourcesdir = os.path.join('src', 'C++')
else:
Expand All @@ -31,7 +31,10 @@ def __init__(self, lang):
self.build_system.max_concurrency = 1

self.prgenv_flags = {
'PrgEnv-cray': ['-O2', '-g', '-h nomessage=3140', '-homp'],
'PrgEnv-cray': ['-O2', '-g', '-h nomessage=3140',
'-homp' if lang == 'F90' else '-fopenmp'],
'PrgEnv-cray_classic': ['-O2', '-g', '-h nomessage=3140',
'-homp'],
'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'],
'PrgEnv-intel': ['-O2', '-g', '-qopenmp'],
'PrgEnv-pgi': ['-O2', '-g', '-mp']
Expand Down Expand Up @@ -79,4 +82,3 @@ def setup(self, environ, partition, **job_opts):
self.build_system.cflags = flags
self.build_system.cxxflags = flags
self.build_system.fflags = flags
self.build_system.ldflags = flags