From 2d637e0a444b337c4a8eaa59f85d95b8cf510b7f Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Fri, 5 Jul 2019 09:30:53 +0200 Subject: [PATCH 1/5] Update system config for Kesch --- config/cscs.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 7da16e7cd0..673df11c82 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -337,29 +337,34 @@ class ReframeSettings: 'kesch': { 'PrgEnv-pgi-nompi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi/17.10'], + 'modules': ['PE/17.06', + 'PrgEnv-pgi/18.05'], 'cc': 'pgcc', 'cxx': 'pgc++', 'ftn': 'pgf90', }, 'PrgEnv-pgi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi/17.10_gdr'], + 'modules': ['PE/17.06', + 'PrgEnv-pgi/18.05'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', }, 'PrgEnv-cray': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray/1.0.2_gdr'], + 'modules': ['PE/17.06', + 'PrgEnv-CrayCCE/17.06'], }, 'PrgEnv-cray-nompi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray'], + 'modules': ['PE/17.06', + 'PrgEnv-cray'], }, 'PrgEnv-gnu': { 'type': 'ProgEnvironment', - 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], + 'modules': ['PE/17.06', + 'gmvapich2/17.02_cuda_8.0_gdr'], 'variables': { 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' }, @@ -369,7 +374,8 @@ class ReframeSettings: }, 'PrgEnv-gnu-nompi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], + 'modules': ['PE/17.06', + 'PrgEnv-gnu'], 'cc': 'gcc', 'cxx': 'g++', 'ftn': 'gfortran', From 6936a1718b0f31e4c3b1fccbfd8cba8b0136867d Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Fri, 5 Jul 2019 10:27:38 +0200 Subject: [PATCH 2/5] Update CI config file --- config/cscs-ci.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/config/cscs-ci.py b/config/cscs-ci.py index 3275625359..5353932335 100644 --- a/config/cscs-ci.py +++ b/config/cscs-ci.py @@ -111,7 +111,10 @@ class ReframeSettings: 'kesch': { 'PrgEnv-gnu': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], + 'modules': [ + 'PE/17.06', + 'PrgEnv-gnu' + ], 'cc': 'gcc', 'cxx': 'g++', 'ftn': 'gfortran', @@ -120,22 +123,26 @@ class ReframeSettings: '*': { 'PrgEnv-cray': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray'], + 'modules': [ + 'PE/17.06', + 'PrgEnv-CrayCCE/17.06' + ], }, 'PrgEnv-gnu': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], - }, - - 'PrgEnv-intel': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-intel'], + 'modules': [ + 'PE/17.06', + 'PrgEnv-gnu' + ], }, 'PrgEnv-pgi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi'], + 'modules': [ + 'PE/17.06', + 'PrgEnv-pgi' + ], }, 'builtin': { From 6d1939468e1d29a6ec3e3fafc376229614047d3f Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Fri, 5 Jul 2019 11:18:13 +0200 Subject: [PATCH 3/5] Revert update of CI config for other systems --- config/cscs-ci.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/config/cscs-ci.py b/config/cscs-ci.py index 5353932335..7b561860f5 100644 --- a/config/cscs-ci.py +++ b/config/cscs-ci.py @@ -123,26 +123,22 @@ class ReframeSettings: '*': { 'PrgEnv-cray': { 'type': 'ProgEnvironment', - 'modules': [ - 'PE/17.06', - 'PrgEnv-CrayCCE/17.06' - ], + 'modules': ['PrgEnv-cray'], }, 'PrgEnv-gnu': { 'type': 'ProgEnvironment', - 'modules': [ - 'PE/17.06', - 'PrgEnv-gnu' - ], + 'modules': ['PrgEnv-gnu'], + }, + + 'PrgEnv-intel': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-intel'], }, 'PrgEnv-pgi': { 'type': 'ProgEnvironment', - 'modules': [ - 'PE/17.06', - 'PrgEnv-pgi' - ], + 'modules': ['PrgEnv-pgi'], }, 'builtin': { From 1d8f70c8aa1b4867a6279990d116e0d2dab46ef9 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Fri, 5 Jul 2019 11:23:16 +0200 Subject: [PATCH 4/5] Add PrgEnv-cray/pgi to Kesch environments --- config/cscs-ci.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/cscs-ci.py b/config/cscs-ci.py index 7b561860f5..3e2bcdceb3 100644 --- a/config/cscs-ci.py +++ b/config/cscs-ci.py @@ -119,6 +119,19 @@ class ReframeSettings: 'cxx': 'g++', 'ftn': 'gfortran', }, + 'PrgEnv-cray': { + 'type': 'ProgEnvironment', + 'modules': ['PE/17.06', + 'PrgEnv-CrayCCE/17.06'], + }, + 'PrgEnv-pgi': { + 'type': 'ProgEnvironment', + 'modules': ['PE/17.06', + 'PrgEnv-pgi/18.05'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, }, '*': { 'PrgEnv-cray': { From 60691709d031ee69849618f18b295b105986cf90 Mon Sep 17 00:00:00 2001 From: kraushm Date: Tue, 9 Jul 2019 11:34:12 +0200 Subject: [PATCH 5/5] Correct PrgEnv-pgi module version --- config/cscs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index d331162cf8..69a8c43a0d 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -341,7 +341,7 @@ class ReframeSettings: 'PrgEnv-pgi-nompi': { 'type': 'ProgEnvironment', 'modules': ['PE/17.06', - 'PrgEnv-pgi/18.05'], + 'PrgEnv-pgi/18.5'], 'cc': 'pgcc', 'cxx': 'pgc++', 'ftn': 'pgf90', @@ -349,7 +349,7 @@ class ReframeSettings: 'PrgEnv-pgi': { 'type': 'ProgEnvironment', 'modules': ['PE/17.06', - 'PrgEnv-pgi/18.05'], + 'PrgEnv-pgi/18.5'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90',