From 661e4d7b857db84b6549d01084c3b744ec20dd31 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Fri, 12 Oct 2018 14:37:06 +0200 Subject: [PATCH 1/5] MCH environment on kesch --- config/cscs_mch.py | 435 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 435 insertions(+) create mode 100644 config/cscs_mch.py diff --git a/config/cscs_mch.py b/config/cscs_mch.py new file mode 100644 index 0000000000..f389b0545a --- /dev/null +++ b/config/cscs_mch.py @@ -0,0 +1,435 @@ +# +# CSCS ReFrame settings +# + + +class ReframeSettings: + reframe_module = 'reframe' + job_poll_intervals = [1, 2, 3] + job_submit_timeout = 60 + checks_path = ['checks/'] + checks_path_recurse = True + site_configuration = { + 'systems': { + 'daint': { + 'descr': 'Piz Daint', + 'hostnames': ['daint'], + 'modules_system': 'tmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'modules': [], + 'access': [], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], + 'descr': 'Login nodes', + 'max_jobs': 4 + }, + + 'gpu': { + 'scheduler': 'nativeslurm', + 'modules': ['daint-gpu'], + 'access': ['--constraint=gpu'], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], + 'descr': 'Hybrid nodes (Haswell/P100)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + }, + + 'mc': { + 'scheduler': 'nativeslurm', + 'modules': ['daint-mc'], + 'access': ['--constraint=mc'], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], + 'descr': 'Multicore nodes (Broadwell)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + } + } + }, + + 'dom': { + 'descr': 'Dom TDS', + 'hostnames': ['dom'], + 'modules_system': 'tmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'modules': [], + 'access': [], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], + 'descr': 'Login nodes', + 'max_jobs': 4 + }, + + 'gpu': { + 'scheduler': 'nativeslurm', + 'modules': ['daint-gpu'], + 'access': ['--constraint=gpu'], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi', + 'PrgEnv-cray-c2sm-base', + 'PrgEnv-pgi-c2sm-base', + 'PrgEnv-gnu-c2sm-base', + 'PrgEnv-cray-c2sm-gpu', + 'PrgEnv-gnu-c2sm-gpu', + 'PrgEnv-cray-c2sm-gpu'], + 'descr': 'Hybrid nodes (Haswell/P100)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + }, + + 'mc': { + 'scheduler': 'nativeslurm', + 'modules': ['daint-mc'], + 'access': ['--constraint=mc'], + 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], + 'descr': 'Multicore nodes (Broadwell)', + 'max_jobs': 100, + 'resources': { + 'switches': ['--switches={num_switches}'] + } + }, + } + }, + + 'kesch': { + 'descr': 'Kesch MCH', + 'hostnames': ['keschln-\d+'], + 'modules_system': 'tmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'descr': 'Kesch login nodes', + }, + 'pn': { + 'scheduler': 'nativeslurm', + 'access': ['--partition=pn-regression'], + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'descr': 'Kesch post-processing nodes' + }, + + 'cn': { + 'scheduler': 'nativeslurm', + 'access': ['--partition=cn-regression'], + 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-cray-c2sm-base', + 'PrgEnv-pgi-c2sm-base', + 'PrgEnv-gnu-c2sm-base', + 'PrgEnv-cray-c2sm-gpu', + 'PrgEnv-gnu-c2sm-gpu', + 'PrgEnv-cray-c2sm-gpu'], + 'descr': 'Kesch compute nodes', + 'resources': { + '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'] + } + } + } + }, + + 'leone': { + 'descr': 'Leone', + 'hostnames': ['leone'], + 'modules_system': 'tmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'environs': ['PrgEnv-gnu'], + 'descr': 'Leone login nodes', + 'max_jobs': 1 + }, + + 'normal': { + 'scheduler': 'nativeslurm', + 'environs': ['PrgEnv-gnu'], + 'descr': ('Leone compute nodes - ' + 'default partition'), + 'max_jobs': 10 + }, + } + }, + + 'monch': { + 'descr': 'Monch PASC', + 'hostnames': ['monch'], + 'modules_system': 'tmod', + 'resourcesdir': '/apps/common/UES/reframe/resources', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'environs': ['PrgEnv-gnu'], + 'descr': 'Monch login nodes', + 'max_jobs': 1 + }, + + 'compute': { + 'scheduler': 'slurm+mpirun', + 'access': ['--partition=compute'], + 'environs': ['PrgEnv-gnu'], + 'descr': 'Monch compute nodes', + 'max_jobs': 10 + } + } + }, + + 'generic': { + 'descr': 'Generic example system', + 'partitions': { + 'login': { + 'scheduler': 'local', + 'modules': [], + 'access': [], + 'environs': ['builtin-gcc'], + 'descr': 'Login nodes' + } + } + } + }, + + 'environments': { + 'kesch': { + 'PrgEnv-pgi-nompi': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-pgi/17.10'], + 'cc': 'pgcc', + 'cxx': 'pgc++', + 'ftn': 'pgf90', + }, + 'PrgEnv-pgi': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-pgi/17.10_gdr'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-cray': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-cray/1.0.2_gdr'], + }, + 'PrgEnv-cray-nompi': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-cray'], + }, + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], + 'variables': { + 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' + }, + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-nompi': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-gnu'], + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran', + }, + 'PrgEnv-cray-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/cray-env/gpu'], + }, + 'PrgEnv-pgi-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/pgi-env/gpu'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/gnu-env/gpu'], + 'variables': { + 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' + }, + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-cray-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/cray-env/base'], + }, + 'PrgEnv-pgi-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/pgi-env/base'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/gnu-env/base'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + }, + 'leone': { + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-gnu/leone-foss-2016b'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + }, + 'monch': { + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-gnu'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + } + }, + '*': { + 'PrgEnv-cray': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-cray'], + }, + + 'PrgEnv-gnu': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-gnu'], + }, + + 'PrgEnv-intel': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-intel'], + }, + + 'PrgEnv-pgi': { + 'type': 'ProgEnvironment', + 'modules': ['PrgEnv-pgi'], + }, + + 'builtin': { + 'type': 'ProgEnvironment', + 'cc': 'cc', + 'cxx': '', + 'ftn': '', + }, + + 'builtin-gcc': { + 'type': 'ProgEnvironment', + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran', + }, + + } + }, + + 'modes': { + '*': { + 'maintenance': [ + '--exec-policy=async', + '--strict', + '--output=$APPS/UES/$USER/regression/maintenance', + '--perflogdir=$APPS/UES/$USER/regression/maintenance/logs', + '--stage=$SCRATCH/regression/maintenance/stage', + '--reservation=maintenance', + '--save-log-files', + '--tag=maintenance', + '--timestamp=%F_%H-%M-%S' + ], + 'production': [ + '--exec-policy=async', + '--strict', + '--output=$APPS/UES/$USER/regression/production', + '--perflogdir=$APPS/UES/$USER/regression/production/logs', + '--stage=$SCRATCH/regression/production/stage', + '--save-log-files', + '--tag=production', + '--timestamp=%F_%H-%M-%S' + ] + } + } + } + + logging_config = { + 'level': 'DEBUG', + 'handlers': [ + { + 'type': 'file', + 'name': 'reframe.log', + 'level': 'DEBUG', + 'format': '[%(asctime)s] %(levelname)s: ' + '%(check_info)s: %(message)s', + 'append': False, + }, + + # Output handling + { + 'type': 'stream', + 'name': 'stdout', + 'level': 'INFO', + 'format': '%(message)s' + }, + { + 'type': 'file', + 'name': 'reframe.out', + 'level': 'INFO', + 'format': '%(message)s', + 'append': False, + } + ] + } + + perf_logging_config = { + 'level': 'DEBUG', + 'handlers': [ + #@ { + #@ 'type': 'graylog', + #@ 'host': 'your-server-here', + #@ 'port': 12345, + #@ 'level': 'INFO', + #@ 'format': '%(message)s', + #@ 'extras': { + #@ 'facility': 'reframe', + #@ 'data-version': '1.0', + #@ } + #@ }, + { + 'type': 'filelog', + 'prefix': '%(check_system)s/%(check_partition)s', + 'level': 'INFO', + 'format': ( + '%(asctime)s|reframe %(version)s|' + '%(check_info)s|jobid=%(check_jobid)s|' + '%(check_perf_var)s=%(check_perf_value)s|' + 'ref=%(check_perf_ref)s ' + '(l=%(check_perf_lower_thres)s, ' + 'u=%(check_perf_upper_thres)s)' + ), + 'append': True + } + ] + } + + +settings = ReframeSettings() From 91b4719139aac65aec5debc0fc0998b34645c8ef Mon Sep 17 00:00:00 2001 From: ajocksch Date: Fri, 12 Oct 2018 15:06:31 +0200 Subject: [PATCH 2/5] bugfix --- config/cscs_mch.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/config/cscs_mch.py b/config/cscs_mch.py index f389b0545a..7173cda354 100644 --- a/config/cscs_mch.py +++ b/config/cscs_mch.py @@ -76,13 +76,7 @@ class ReframeSettings: 'modules': ['daint-gpu'], 'access': ['--constraint=gpu'], 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi', - 'PrgEnv-cray-c2sm-base', - 'PrgEnv-pgi-c2sm-base', - 'PrgEnv-gnu-c2sm-base', - 'PrgEnv-cray-c2sm-gpu', - 'PrgEnv-gnu-c2sm-gpu', - 'PrgEnv-cray-c2sm-gpu'], + 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Hybrid nodes (Haswell/P100)', 'max_jobs': 100, 'resources': { From 374860a789267719c144497f84b06029b52a9bf2 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 16 Oct 2018 17:29:25 +0200 Subject: [PATCH 3/5] Update CSCS config with C2SM environments --- config/cscs.py | 50 +++++- config/cscs_mch.py | 429 --------------------------------------------- 2 files changed, 48 insertions(+), 431 deletions(-) delete mode 100644 config/cscs_mch.py diff --git a/config/cscs.py b/config/cscs.py index 9faa698680..7173cda354 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -126,7 +126,13 @@ class ReframeSettings: 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-cray-c2sm-base', + 'PrgEnv-pgi-c2sm-base', + 'PrgEnv-gnu-c2sm-base', + 'PrgEnv-cray-c2sm-gpu', + 'PrgEnv-gnu-c2sm-gpu', + 'PrgEnv-cray-c2sm-gpu'], 'descr': 'Kesch compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'] @@ -236,6 +242,45 @@ class ReframeSettings: 'cxx': 'g++', 'ftn': 'gfortran', }, + 'PrgEnv-cray-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/cray-env/gpu'], + }, + 'PrgEnv-pgi-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/pgi-env/gpu'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-c2sm-gpu': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/gnu-env/gpu'], + 'variables': { + 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' + }, + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-cray-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/cray-env/base'], + }, + 'PrgEnv-pgi-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/pgi-env/base'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, + 'PrgEnv-gnu-c2sm-base': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/gnu-env/base'], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpif90', + }, }, 'leone': { 'PrgEnv-gnu': { @@ -288,7 +333,8 @@ class ReframeSettings: 'cc': 'gcc', 'cxx': 'g++', 'ftn': 'gfortran', - } + }, + } }, diff --git a/config/cscs_mch.py b/config/cscs_mch.py deleted file mode 100644 index 7173cda354..0000000000 --- a/config/cscs_mch.py +++ /dev/null @@ -1,429 +0,0 @@ -# -# CSCS ReFrame settings -# - - -class ReframeSettings: - reframe_module = 'reframe' - job_poll_intervals = [1, 2, 3] - job_submit_timeout = 60 - checks_path = ['checks/'] - checks_path_recurse = True - site_configuration = { - 'systems': { - 'daint': { - 'descr': 'Piz Daint', - 'hostnames': ['daint'], - 'modules_system': 'tmod', - 'resourcesdir': '/apps/common/UES/reframe/resources', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'modules': [], - 'access': [], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Login nodes', - 'max_jobs': 4 - }, - - 'gpu': { - 'scheduler': 'nativeslurm', - 'modules': ['daint-gpu'], - 'access': ['--constraint=gpu'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Hybrid nodes (Haswell/P100)', - 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } - }, - - 'mc': { - 'scheduler': 'nativeslurm', - 'modules': ['daint-mc'], - 'access': ['--constraint=mc'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Multicore nodes (Broadwell)', - 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } - } - } - }, - - 'dom': { - 'descr': 'Dom TDS', - 'hostnames': ['dom'], - 'modules_system': 'tmod', - 'resourcesdir': '/apps/common/UES/reframe/resources', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'modules': [], - 'access': [], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Login nodes', - 'max_jobs': 4 - }, - - 'gpu': { - 'scheduler': 'nativeslurm', - 'modules': ['daint-gpu'], - 'access': ['--constraint=gpu'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Hybrid nodes (Haswell/P100)', - 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } - }, - - 'mc': { - 'scheduler': 'nativeslurm', - 'modules': ['daint-mc'], - 'access': ['--constraint=mc'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'], - 'descr': 'Multicore nodes (Broadwell)', - 'max_jobs': 100, - 'resources': { - 'switches': ['--switches={num_switches}'] - } - }, - } - }, - - 'kesch': { - 'descr': 'Kesch MCH', - 'hostnames': ['keschln-\d+'], - 'modules_system': 'tmod', - 'resourcesdir': '/apps/common/UES/reframe/resources', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], - 'descr': 'Kesch login nodes', - }, - 'pn': { - 'scheduler': 'nativeslurm', - 'access': ['--partition=pn-regression'], - 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], - 'descr': 'Kesch post-processing nodes' - }, - - 'cn': { - 'scheduler': 'nativeslurm', - 'access': ['--partition=cn-regression'], - 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-cray-c2sm-base', - 'PrgEnv-pgi-c2sm-base', - 'PrgEnv-gnu-c2sm-base', - 'PrgEnv-cray-c2sm-gpu', - 'PrgEnv-gnu-c2sm-gpu', - 'PrgEnv-cray-c2sm-gpu'], - 'descr': 'Kesch compute nodes', - 'resources': { - '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'] - } - } - } - }, - - 'leone': { - 'descr': 'Leone', - 'hostnames': ['leone'], - 'modules_system': 'tmod', - 'resourcesdir': '/apps/common/UES/reframe/resources', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'environs': ['PrgEnv-gnu'], - 'descr': 'Leone login nodes', - 'max_jobs': 1 - }, - - 'normal': { - 'scheduler': 'nativeslurm', - 'environs': ['PrgEnv-gnu'], - 'descr': ('Leone compute nodes - ' - 'default partition'), - 'max_jobs': 10 - }, - } - }, - - 'monch': { - 'descr': 'Monch PASC', - 'hostnames': ['monch'], - 'modules_system': 'tmod', - 'resourcesdir': '/apps/common/UES/reframe/resources', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'environs': ['PrgEnv-gnu'], - 'descr': 'Monch login nodes', - 'max_jobs': 1 - }, - - 'compute': { - 'scheduler': 'slurm+mpirun', - 'access': ['--partition=compute'], - 'environs': ['PrgEnv-gnu'], - 'descr': 'Monch compute nodes', - 'max_jobs': 10 - } - } - }, - - 'generic': { - 'descr': 'Generic example system', - 'partitions': { - 'login': { - 'scheduler': 'local', - 'modules': [], - 'access': [], - 'environs': ['builtin-gcc'], - 'descr': 'Login nodes' - } - } - } - }, - - 'environments': { - 'kesch': { - 'PrgEnv-pgi-nompi': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi/17.10'], - 'cc': 'pgcc', - 'cxx': 'pgc++', - 'ftn': 'pgf90', - }, - 'PrgEnv-pgi': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi/17.10_gdr'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-cray': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray/1.0.2_gdr'], - }, - 'PrgEnv-cray-nompi': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray'], - }, - 'PrgEnv-gnu': { - 'type': 'ProgEnvironment', - 'modules': ['gmvapich2/17.02_cuda_8.0_gdr'], - 'variables': { - 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' - }, - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-gnu-nompi': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], - 'cc': 'gcc', - 'cxx': 'g++', - 'ftn': 'gfortran', - }, - 'PrgEnv-cray-c2sm-gpu': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/cray-env/gpu'], - }, - 'PrgEnv-pgi-c2sm-gpu': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/pgi-env/gpu'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-gnu-c2sm-gpu': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/gnu-env/gpu'], - 'variables': { - 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' - }, - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-cray-c2sm-base': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/cray-env/base'], - }, - 'PrgEnv-pgi-c2sm-base': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/pgi-env/base'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - 'PrgEnv-gnu-c2sm-base': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/gnu-env/base'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - }, - 'leone': { - 'PrgEnv-gnu': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu/leone-foss-2016b'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - }, - }, - 'monch': { - 'PrgEnv-gnu': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpif90', - } - }, - '*': { - 'PrgEnv-cray': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-cray'], - }, - - 'PrgEnv-gnu': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-gnu'], - }, - - 'PrgEnv-intel': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-intel'], - }, - - 'PrgEnv-pgi': { - 'type': 'ProgEnvironment', - 'modules': ['PrgEnv-pgi'], - }, - - 'builtin': { - 'type': 'ProgEnvironment', - 'cc': 'cc', - 'cxx': '', - 'ftn': '', - }, - - 'builtin-gcc': { - 'type': 'ProgEnvironment', - 'cc': 'gcc', - 'cxx': 'g++', - 'ftn': 'gfortran', - }, - - } - }, - - 'modes': { - '*': { - 'maintenance': [ - '--exec-policy=async', - '--strict', - '--output=$APPS/UES/$USER/regression/maintenance', - '--perflogdir=$APPS/UES/$USER/regression/maintenance/logs', - '--stage=$SCRATCH/regression/maintenance/stage', - '--reservation=maintenance', - '--save-log-files', - '--tag=maintenance', - '--timestamp=%F_%H-%M-%S' - ], - 'production': [ - '--exec-policy=async', - '--strict', - '--output=$APPS/UES/$USER/regression/production', - '--perflogdir=$APPS/UES/$USER/regression/production/logs', - '--stage=$SCRATCH/regression/production/stage', - '--save-log-files', - '--tag=production', - '--timestamp=%F_%H-%M-%S' - ] - } - } - } - - logging_config = { - 'level': 'DEBUG', - 'handlers': [ - { - 'type': 'file', - 'name': 'reframe.log', - 'level': 'DEBUG', - 'format': '[%(asctime)s] %(levelname)s: ' - '%(check_info)s: %(message)s', - 'append': False, - }, - - # Output handling - { - 'type': 'stream', - 'name': 'stdout', - 'level': 'INFO', - 'format': '%(message)s' - }, - { - 'type': 'file', - 'name': 'reframe.out', - 'level': 'INFO', - 'format': '%(message)s', - 'append': False, - } - ] - } - - perf_logging_config = { - 'level': 'DEBUG', - 'handlers': [ - #@ { - #@ 'type': 'graylog', - #@ 'host': 'your-server-here', - #@ 'port': 12345, - #@ 'level': 'INFO', - #@ 'format': '%(message)s', - #@ 'extras': { - #@ 'facility': 'reframe', - #@ 'data-version': '1.0', - #@ } - #@ }, - { - 'type': 'filelog', - 'prefix': '%(check_system)s/%(check_partition)s', - 'level': 'INFO', - 'format': ( - '%(asctime)s|reframe %(version)s|' - '%(check_info)s|jobid=%(check_jobid)s|' - '%(check_perf_var)s=%(check_perf_value)s|' - 'ref=%(check_perf_ref)s ' - '(l=%(check_perf_lower_thres)s, ' - 'u=%(check_perf_upper_thres)s)' - ), - 'append': True - } - ] - } - - -settings = ReframeSettings() From a15d08d65e67f275995a7d33b4058127413110a6 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 17 Oct 2018 09:07:34 +0200 Subject: [PATCH 4/5] Fine tune C2SM environment definitions --- config/cscs.py | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 7173cda354..9e518ea82e 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -127,9 +127,9 @@ class ReframeSettings: 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-cray-c2sm-base', - 'PrgEnv-pgi-c2sm-base', - 'PrgEnv-gnu-c2sm-base', + 'PrgEnv-cray-c2sm', + 'PrgEnv-pgi-c2sm', + 'PrgEnv-gnu-c2sm', 'PrgEnv-cray-c2sm-gpu', 'PrgEnv-gnu-c2sm-gpu', 'PrgEnv-cray-c2sm-gpu'], @@ -242,41 +242,38 @@ class ReframeSettings: 'cxx': 'g++', 'ftn': 'gfortran', }, + 'PrgEnv-cray-c2sm': { + 'type': 'ProgEnvironment', + 'modules': ['env', 'c2sm/cray-env/base'], + }, 'PrgEnv-cray-c2sm-gpu': { 'type': 'ProgEnvironment', 'modules': ['env', 'c2sm/cray-env/gpu'], }, - 'PrgEnv-pgi-c2sm-gpu': { + 'PrgEnv-pgi-c2sm': { 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/pgi-env/gpu'], + 'modules': ['env', 'c2sm/pgi-env/base'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', }, - 'PrgEnv-gnu-c2sm-gpu': { + 'PrgEnv-pgi-c2sm-gpu': { 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/gnu-env/gpu'], - 'variables': { - 'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so' - }, + 'modules': ['env', 'c2sm/pgi-env/gpu'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', }, - 'PrgEnv-cray-c2sm-base': { - 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/cray-env/base'], - }, - 'PrgEnv-pgi-c2sm-base': { + 'PrgEnv-gnu-c2sm': { 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/pgi-env/base'], + 'modules': ['env', 'c2sm/gnu-env/base'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', }, - 'PrgEnv-gnu-c2sm-base': { + 'PrgEnv-gnu-c2sm-gpu': { 'type': 'ProgEnvironment', - 'modules': ['env', 'c2sm/gnu-env/base'], + 'modules': ['env', 'c2sm/gnu-env/gpu'], 'cc': 'mpicc', 'cxx': 'mpicxx', 'ftn': 'mpif90', From 3176bbc06e6540e5fd11f9f288f4f1831a3d3c4b Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 18 Oct 2018 09:18:19 +0200 Subject: [PATCH 5/5] Fix style in configuration file --- config/cscs.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 9e518ea82e..80f492864f 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -330,8 +330,7 @@ class ReframeSettings: 'cc': 'gcc', 'cxx': 'g++', 'ftn': 'gfortran', - }, - + } } },