From 7e7931b411a476b734a05784ddbb1e9d4e21433e Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 25 Sep 2018 11:57:41 +0200 Subject: [PATCH 1/3] Adapt Kesch settings - Two programming environments (Cray, PGI) - Two variants (MPI and non-MPI) --- config/cscs.py | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 90bab0ca82..28214cb40d 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -107,25 +107,22 @@ class ReframeSettings: 'partitions': { 'login': { 'scheduler': 'local', - 'environs': ['PrgEnv-gnu', 'PrgEnv-cray', - 'PrgEnv-pgi', 'PrgEnv-gnu-gdr'], + 'environs': ['PrgEnv-cray-nompi', 'PrgEnv-pgi-nompi'], 'descr': 'Kesch login nodes', }, 'pn': { 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], - 'environs': ['PrgEnv-gnu', 'PrgEnv-cray', - 'PrgEnv-pgi', 'PrgEnv-gnu-gdr'], + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], 'descr': 'Kesch post-processing nodes' }, 'cn': { 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], - 'environs': ['PrgEnv-gnu', 'PrgEnv-cray', - 'PrgEnv-pgi', 'PrgEnv-gnu-gdr', - 'PrgEnv-pgi_17.10_gdr', 'PrgEnv-pgi_18.4_gdr', - 'PrgEnv-cray_gdr', 'PrgEnv-cray_gdr_2.3'], + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], 'descr': 'Kesch compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'] @@ -196,48 +193,27 @@ class ReframeSettings: 'environments': { 'kesch': { - 'PrgEnv-gnu': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-pgi': { + 'PrgEnv-pgi-nompi': { 'type': 'ProgEnvironment', 'modules': ['PrgEnv-pgi/17.10'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', + 'cc': 'pgcc', + 'cxx': 'pgc++', + 'ftn': 'pgf90', }, - 'PrgEnv-pgi_17.10_gdr': { + 'PrgEnv-pgi': { 'type': 'ProgEnvironment', 'modules': ['PrgEnv-pgi/17.10_gdr'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', }, - 'PrgEnv-pgi_18.4_gdr': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi/18.4_gdr'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-cray_gdr': { + 'PrgEnv-cray': { 'type': 'ProgEnvironment', 'modules': ['PrgEnv-cray/1.0.2_gdr'], }, - 'PrgEnv-cray_gdr_2.3': { + 'PrgEnv-cray-nompi': { 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray/1.0.2_gdr_2.3'], - }, - 'PrgEnv-gnu-gdr': { - 'type': 'ProgEnvironment', - 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], - 'cc': 'mpicc', - 'cxx': 'mpic++', - 'ftn': 'mpif90', + 'modules': ['PrgEnv-cray'], }, }, 'leone': { From c73224d5c387069d07f12ab0aa4027e002cf39da Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 25 Sep 2018 13:53:31 +0200 Subject: [PATCH 2/3] Add PrgEnv-gnu in Kesch settings --- config/cscs.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 28214cb40d..22ed7052f7 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -114,7 +114,8 @@ class ReframeSettings: 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch post-processing nodes' }, @@ -122,7 +123,8 @@ class ReframeSettings: 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'] @@ -215,6 +217,20 @@ class ReframeSettings: 'type': 'ProgEnvironment', 'modules': ['PrgEnv-cray'], }, + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], + 'cc': 'mpicc', + 'cxx': 'mpic++', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-nompi': { + 'type': 'ProgEnvironment', + 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran', + }, }, 'leone': { 'PrgEnv-gnu': { From 5c42d92ee09d39bf5d6868b70d4622c52272139c Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 25 Sep 2018 16:56:25 +0200 Subject: [PATCH 3/3] Fix PrgEnv-gnu definition. --- config/cscs.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 22ed7052f7..a099537cbe 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -107,7 +107,9 @@ class ReframeSettings: 'partitions': { 'login': { 'scheduler': 'local', - 'environs': ['PrgEnv-cray-nompi', 'PrgEnv-pgi-nompi'], + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch login nodes', }, 'pn': { @@ -226,7 +228,7 @@ class ReframeSettings: }, 'PrgEnv-gnu-nompi': { 'type': 'ProgEnvironment', - 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], + 'modules': ['PrgEnv-gnu'], 'cc': 'gcc', 'cxx': 'g++', 'ftn': 'gfortran',