From df5db12bf5bf95fa107afd40c4efb3f0a1166a09 Mon Sep 17 00:00:00 2001 From: jgp Date: Mon, 7 Oct 2019 15:22:57 +0200 Subject: [PATCH 1/3] removing cce compiler --- .../tools/profiling_and_debugging/scorep_mpi_omp.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py index dbb2c0dc53..4717926ff7 100644 --- a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py @@ -12,10 +12,8 @@ def __init__(self, lang): self.name = 'scorep_mpi_omp_%s' % lang.replace('+', 'p') self.descr = 'SCORE-P %s check' % lang self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi', - 'PrgEnv-cray'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] self.prgenv_flags = { - 'PrgEnv-cray': ['-g', '-homp'], 'PrgEnv-gnu': ['-g', '-fopenmp'], 'PrgEnv-intel': ['-g', '-openmp'], 'PrgEnv-pgi': ['-g', '-mp'] @@ -58,14 +56,13 @@ def __init__(self, lang): ] def setup(self, partition, environ, **job_opts): - scorep_ver = '5.0' - tc_ver = '19.03' - cu_ver = '10.0' + scorep_ver = '6.0' + tc_ver = '19.09' + cu_ver = '10.1' self.scorep_modules = { 'PrgEnv-gnu': ['Score-P/%s-CrayGNU-%s' % (scorep_ver, tc_ver)], 'PrgEnv-intel': ['Score-P/%s-CrayIntel-%s' % (scorep_ver, tc_ver)], 'PrgEnv-pgi': ['Score-P/%s-CrayPGI-%s' % (scorep_ver, tc_ver)], - 'PrgEnv-cray': ['Score-P/%s-CrayCCE-%s' % (scorep_ver, tc_ver)] } if partition.fullname in ['daint:gpu', 'dom:gpu']: self.scorep_modules['PrgEnv-gnu'] = [ From f713ff667fdd933debd8cfceab47da18dfc1dc7a Mon Sep 17 00:00:00 2001 From: jgp Date: Tue, 8 Oct 2019 10:01:16 +0200 Subject: [PATCH 2/3] doc --- cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py index 4717926ff7..b9ca67c54a 100644 --- a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py @@ -13,6 +13,10 @@ def __init__(self, lang): self.descr = 'SCORE-P %s check' % lang self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] + # scorep fails with latest clang based cce compiler: + # src/measurement/thread/fork_join/scorep_thread_fork_join_omp.c:402: + # Fatal: Bug 'TPD == 0': Invalid OpenMP thread specific data object. + # -> removing cce from supported compiler for now. self.prgenv_flags = { 'PrgEnv-gnu': ['-g', '-fopenmp'], 'PrgEnv-intel': ['-g', '-openmp'], From 065eddb038e83592b8f61e5ff86739149b7d6fb4 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 16 Oct 2019 23:23:42 +0200 Subject: [PATCH 3/3] Fix placement of comment --- cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py index b9ca67c54a..f22e1a7c09 100644 --- a/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py @@ -12,11 +12,12 @@ def __init__(self, lang): self.name = 'scorep_mpi_omp_%s' % lang.replace('+', 'p') self.descr = 'SCORE-P %s check' % lang self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] - # scorep fails with latest clang based cce compiler: + + # Score-P fails with latest clang based cce compiler: # src/measurement/thread/fork_join/scorep_thread_fork_join_omp.c:402: # Fatal: Bug 'TPD == 0': Invalid OpenMP thread specific data object. # -> removing cce from supported compiler for now. + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] self.prgenv_flags = { 'PrgEnv-gnu': ['-g', '-fopenmp'], 'PrgEnv-intel': ['-g', '-openmp'],