From 9dbee63dbc62255bb97190f9544e7245f3f7036b Mon Sep 17 00:00:00 2001 From: jg Date: Sat, 11 May 2019 18:48:28 +0200 Subject: [PATCH 1/4] config --- config/cscs.py | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/config/cscs.py b/config/cscs.py index 6bf83d1b80..f5d8e87ac4 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -11,6 +11,46 @@ class ReframeSettings: checks_path_recurse = True site_configuration = { 'systems': { + + 'ault': { + 'descr': 'Ault TDS', + 'hostnames': ['ault'], + 'modules_system': 'lmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'modules': [], + 'access': [], + 'environs': ['PrgEnv-gnu'], + 'descr': 'Login nodes (SkylakeSilver)', + 'max_jobs': 4 + }, + + 'v100': { + 'scheduler': 'nativeslurm', + 'access': ['-pintelv100'], + 'environs': ['PrgEnv-gnu'], + 'descr': 'Hybrid Nvidia nodes (Skylake36c/4*V100)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + }, + + 'skl': { + 'scheduler': 'nativeslurm', + 'access': ['-pintel'], + 'environs': ['PrgEnv-gnu'], + 'descr': 'Multicore nodes (Skylake36c)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + }, + } + }, + 'daint': { 'descr': 'Piz Daint', 'hostnames': ['daint'], @@ -244,6 +284,29 @@ class ReframeSettings: }, 'environments': { + + 'ault': { + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['gcc/8.3.0', 'cuda/10.1', 'openmpi/4.0.1'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'builtin': { + 'type': 'ProgEnvironment', + 'cc': 'cc', + 'cxx': '', + 'ftn': '', + }, + 'builtin-gcc': { + 'type': 'ProgEnvironment', + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran', + } + }, + 'kesch': { 'PrgEnv-pgi-nompi': { 'type': 'ProgEnvironment', @@ -327,6 +390,7 @@ class ReframeSettings: 'ftn': 'mpif90', }, }, + 'leone': { 'PrgEnv-gnu': { 'type': 'ProgEnvironment', @@ -336,6 +400,7 @@ class ReframeSettings: 'ftn': 'mpif90', }, }, + 'monch': { 'PrgEnv-gnu': { 'type': 'ProgEnvironment', @@ -345,6 +410,7 @@ class ReframeSettings: 'ftn': 'mpif90', } }, + '*': { 'PrgEnv-cray': { 'type': 'ProgEnvironment', From cc839170f1536a22345d265fb1cf31dc374fb92c Mon Sep 17 00:00:00 2001 From: jg Date: Tue, 14 May 2019 13:51:18 +0200 Subject: [PATCH 2/4] fix for review --- config/cscs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/cscs.py b/config/cscs.py index f5d8e87ac4..e8ada008f0 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -288,7 +288,8 @@ class ReframeSettings: 'ault': { 'PrgEnv-gnu': { 'type': 'ProgEnvironment', - 'modules': ['gcc/8.3.0', 'cuda/10.1', 'openmpi/4.0.1'], + # defaults were gcc/8.3.0, cuda/10.1, openmpi/4.0.0 + 'modules': ['gcc/8.3.0', 'cuda', 'openmpi'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', From bdcdbff3e525d8fef7ac2e6bed7c9213b4457ccc Mon Sep 17 00:00:00 2001 From: jg Date: Tue, 14 May 2019 14:33:58 +0200 Subject: [PATCH 3/4] fix for review --- config/cscs.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index e8ada008f0..8e7362a0af 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -20,8 +20,6 @@ class ReframeSettings: 'partitions': { 'login': { 'scheduler': 'local', - 'modules': [], - 'access': [], 'environs': ['PrgEnv-gnu'], 'descr': 'Login nodes (SkylakeSilver)', 'max_jobs': 4 @@ -33,9 +31,6 @@ class ReframeSettings: 'environs': ['PrgEnv-gnu'], 'descr': 'Hybrid Nvidia nodes (Skylake36c/4*V100)', 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } }, 'skl': { @@ -44,9 +39,6 @@ class ReframeSettings: 'environs': ['PrgEnv-gnu'], 'descr': 'Multicore nodes (Skylake36c)', 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } }, } }, From 2c17f96c93d934717316e4500365205d8002dc62 Mon Sep 17 00:00:00 2001 From: jg Date: Tue, 14 May 2019 14:44:49 +0200 Subject: [PATCH 4/4] fix for review --- config/cscs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cscs.py b/config/cscs.py index 8e7362a0af..5df1f23d2e 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -281,7 +281,7 @@ class ReframeSettings: 'PrgEnv-gnu': { 'type': 'ProgEnvironment', # defaults were gcc/8.3.0, cuda/10.1, openmpi/4.0.0 - 'modules': ['gcc/8.3.0', 'cuda', 'openmpi'], + 'modules': ['gcc', 'cuda', 'openmpi'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90',