From 600bccc05f25b12c37ababfd9df200b2eab17000 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 15 Oct 2018 15:45:13 +0200 Subject: [PATCH] Sync openmp versions for dom/daint in notool test --- .../tools/profiling_and_debugging/notool.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/notool.py b/cscs-checks/tools/profiling_and_debugging/notool.py index e684ce38da..598d6c2b1d 100644 --- a/cscs-checks/tools/profiling_and_debugging/notool.py +++ b/cscs-checks/tools/profiling_and_debugging/notool.py @@ -40,16 +40,11 @@ def __init__(self, lang): 'CRAYPE_LINK_TYPE': 'dynamic' } self.openmp_versions = ScopedDict({ - 'daint:PrgEnv-cray': {'version': 201307}, - 'daint:PrgEnv-gnu': {'version': 201307}, - 'daint:PrgEnv-intel': {'version': 201511}, - 'daint:PrgEnv-pgi': {'version': 201307}, - 'daint:PrgEnv-pgi:C++': {'version': 200805}, - 'dom:PrgEnv-cray': {'version': 201511}, - 'dom:PrgEnv-gnu': {'version': 201511}, - 'dom:PrgEnv-gnu:F90': {'version': 201307}, - 'dom:PrgEnv-intel': {'version': 201611}, - 'dom:PrgEnv-pgi': {'version': 201307}, + 'PrgEnv-cray': {'version': 201511}, + 'PrgEnv-gnu': {'version': 201511}, + 'PrgEnv-gnu:F90': {'version': 201307}, + 'PrgEnv-intel': {'version': 201611}, + 'PrgEnv-pgi': {'version': 201307}, }) # a scopedict is better than this: # if (self.language == 'C++' and @@ -86,8 +81,7 @@ def setup(self, partition, environ, **job_opts): self.build_system.ldflags = ['-lm'] found_version = sn.extractsingle( r'OpenMP-\s*(\d+)', self.stdout, 1, int) - ompversion_key = '%s:%s:%s:version' % ( - self.current_system.name, environ_name, self.language) + ompversion_key = '%s:%s:version' % (environ_name, self.language) self.sanity_patterns = sn.all([ sn.assert_eq(found_version, self.openmp_versions[ompversion_key]), sn.assert_found('SUCCESS', self.stdout),