From e2ebfd088165409ff792ec5ee3bacaac2e84db2d Mon Sep 17 00:00:00 2001 From: Victor Holanda Rusu Date: Mon, 9 Mar 2020 16:25:20 +0100 Subject: [PATCH 1/5] Use builtin Prg-Env for apps --- config/cscs.py | 20 +++++++++---------- cscs-checks/apps/amber/amber_check.py | 2 +- cscs-checks/apps/cp2k/cp2k_check.py | 2 +- cscs-checks/apps/cpmd/cpmd_check.py | 2 +- cscs-checks/apps/espresso/espresso_check.py | 2 +- cscs-checks/apps/gromacs/gromacs_check.py | 2 +- cscs-checks/apps/lammps/lammps_check.py | 2 +- cscs-checks/apps/namd/namd_check.py | 2 +- cscs-checks/apps/openfoam/check_openfoam.py | 2 +- .../apps/openfoam/check_openfoam_extend.py | 2 +- cscs-checks/apps/paraview/paraview_check.py | 2 +- cscs-checks/apps/python/numpy_check.py | 2 +- cscs-checks/apps/spark/spark_check.py | 2 +- .../apps/tensorflow/tensorflow_check.py | 2 +- .../apps/tensorflow/tf2_horovod_check.py | 2 +- .../apps/tensorflow/tf_horovod_check.py | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index e18f8437e2..199ccd6146 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -91,7 +91,7 @@ class ReframeSettings: 'scheduler': 'local', 'modules': [], 'access': [], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Login nodes', 'max_jobs': 4 @@ -109,7 +109,7 @@ class ReframeSettings: }, 'modules': ['daint-gpu'], 'access': ['--constraint=gpu'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Hybrid nodes (Haswell/P100)', 'max_jobs': 100, @@ -130,7 +130,7 @@ class ReframeSettings: }, 'modules': ['daint-mc'], 'access': ['--constraint=mc'], - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Multicore nodes (Broadwell)', 'max_jobs': 100, @@ -168,7 +168,7 @@ class ReframeSettings: 'scheduler': 'local', 'modules': [], 'access': [], - 'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic', + 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Login nodes', @@ -187,9 +187,9 @@ class ReframeSettings: }, 'modules': ['daint-gpu'], 'access': ['--constraint=gpu'], - 'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic', - 'PrgEnv-gnu', 'PrgEnv-intel', - 'PrgEnv-pgi'], + 'environs': ['builtin', 'PrgEnv-cray', + 'PrgEnv-cray_classic', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Hybrid nodes (Haswell/P100)', 'max_jobs': 100, }, @@ -206,9 +206,9 @@ class ReframeSettings: }, 'modules': ['daint-mc'], 'access': ['--constraint=mc'], - 'environs': ['PrgEnv-cray', 'PrgEnv-cray_classic', - 'PrgEnv-gnu', 'PrgEnv-intel', - 'PrgEnv-pgi'], + 'environs': ['builtin', 'PrgEnv-cray', + 'PrgEnv-cray_classic', 'PrgEnv-gnu', + 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Multicore nodes (Broadwell)', 'max_jobs': 100, 'resources': { diff --git a/cscs-checks/apps/amber/amber_check.py b/cscs-checks/apps/amber/amber_check.py index 522d2a2253..d9d870320a 100644 --- a/cscs-checks/apps/amber/amber_check.py +++ b/cscs-checks/apps/amber/amber_check.py @@ -13,7 +13,7 @@ class AmberBaseCheck(rfm.RunOnlyRegressionTest): def __init__(self, input_file, output_file): self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'Amber') - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['Amber'] self.num_tasks = 1 self.num_tasks_per_node = 1 diff --git a/cscs-checks/apps/cp2k/cp2k_check.py b/cscs-checks/apps/cp2k/cp2k_check.py index a23c47e9ab..d2baf09dd3 100644 --- a/cscs-checks/apps/cp2k/cp2k_check.py +++ b/cscs-checks/apps/cp2k/cp2k_check.py @@ -10,7 +10,7 @@ class Cp2kCheck(rfm.RunOnlyRegressionTest): def __init__(self): - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.executable = 'cp2k.psmp' self.executable_opts = ['H2O-256.inp'] diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index 803d053324..b0a03dbbaa 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -23,7 +23,7 @@ def __init__(self, scale): self.num_tasks = 16 self.num_tasks_per_node = 1 - self.valid_prog_environs = ['PrgEnv-intel'] + self.valid_prog_environs = ['builtin'] self.modules = ['CPMD'] self.executable = 'cpmd.x' self.executable_opts = ['ana_c4h6.in > stdout.txt'] diff --git a/cscs-checks/apps/espresso/espresso_check.py b/cscs-checks/apps/espresso/espresso_check.py index ea90f6f2fb..0f2fcf26da 100644 --- a/cscs-checks/apps/espresso/espresso_check.py +++ b/cscs-checks/apps/espresso/espresso_check.py @@ -20,7 +20,7 @@ def __init__(self, scale): 'Espresso') self.valid_systems = ['daint:mc'] - self.valid_prog_environs = ['PrgEnv-intel'] + self.valid_prog_environs = ['builtin'] self.modules = ['QuantumESPRESSO'] self.executable = 'pw.x' self.executable_opts = ['-in', 'ausurf.in'] diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index 75bb8e8918..fd8ec5f513 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -12,7 +12,7 @@ class GromacsBaseCheck(rfm.RunOnlyRegressionTest): def __init__(self, output_file): - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.executable = 'gmx_mpi' # Reset sources dir relative to the SCS apps prefix diff --git a/cscs-checks/apps/lammps/lammps_check.py b/cscs-checks/apps/lammps/lammps_check.py index e3299bf411..df7f632a8c 100644 --- a/cscs-checks/apps/lammps/lammps_check.py +++ b/cscs-checks/apps/lammps/lammps_check.py @@ -11,7 +11,7 @@ class LAMMPSBaseCheck(rfm.RunOnlyRegressionTest): def __init__(self): - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['LAMMPS'] # Reset sources dir relative to the SCS apps prefix diff --git a/cscs-checks/apps/namd/namd_check.py b/cscs-checks/apps/namd/namd_check.py index cfd208c641..1962dec67d 100644 --- a/cscs-checks/apps/namd/namd_check.py +++ b/cscs-checks/apps/namd/namd_check.py @@ -12,7 +12,7 @@ class NamdBaseCheck(rfm.RunOnlyRegressionTest): def __init__(self, arch, scale, variant): self.descr = 'NAMD check (%s, %s)' % (arch, variant) - self.valid_prog_environs = ['PrgEnv-intel'] + self.valid_prog_environs = ['builtin'] self.modules = ['NAMD'] # Reset sources dir relative to the SCS apps prefix diff --git a/cscs-checks/apps/openfoam/check_openfoam.py b/cscs-checks/apps/openfoam/check_openfoam.py index 23cfe6a8e2..a14d6635a5 100644 --- a/cscs-checks/apps/openfoam/check_openfoam.py +++ b/cscs-checks/apps/openfoam/check_openfoam.py @@ -19,7 +19,7 @@ def __init__(self): # OpenFOAM currently runs only on Leone self.valid_systems = ['leone:normal'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['OpenFOAM/4.1-foss-2016b'] self.num_tasks = 1 diff --git a/cscs-checks/apps/openfoam/check_openfoam_extend.py b/cscs-checks/apps/openfoam/check_openfoam_extend.py index e9d9d1de23..8042786364 100644 --- a/cscs-checks/apps/openfoam/check_openfoam_extend.py +++ b/cscs-checks/apps/openfoam/check_openfoam_extend.py @@ -19,7 +19,7 @@ def __init__(self): # OpenFOAM-Extend currently runs only on Leone self.valid_systems = ['leone:normal'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['OpenFOAM-Extend/4.0-foss-2016b'] self.num_tasks = 1 diff --git a/cscs-checks/apps/paraview/paraview_check.py b/cscs-checks/apps/paraview/paraview_check.py index 52df0c1f81..5822c7ecfa 100644 --- a/cscs-checks/apps/paraview/paraview_check.py +++ b/cscs-checks/apps/paraview/paraview_check.py @@ -11,7 +11,7 @@ class ParaViewCheck(rfm.RunOnlyRegressionTest): def __init__(self): self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.num_tasks = 12 self.num_tasks_per_node = 12 self.modules = ['ParaView'] diff --git a/cscs-checks/apps/python/numpy_check.py b/cscs-checks/apps/python/numpy_check.py index 82ba9f6e8b..d8e91c235b 100644 --- a/cscs-checks/apps/python/numpy_check.py +++ b/cscs-checks/apps/python/numpy_check.py @@ -10,7 +10,7 @@ class NumpyBaseTest(rfm.RunOnlyRegressionTest): def __init__(self): self.descr = 'Test a few typical numpy operations' - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['numpy/1.17.2-CrayGNU-19.10'] self.reference = { 'daint:gpu': { diff --git a/cscs-checks/apps/spark/spark_check.py b/cscs-checks/apps/spark/spark_check.py index 93e5e01ae4..df95ea1bc0 100644 --- a/cscs-checks/apps/spark/spark_check.py +++ b/cscs-checks/apps/spark/spark_check.py @@ -16,7 +16,7 @@ def __init__(self): self.descr = 'Simple calculation of pi with Spark' self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['Spark'] self.sourcesdir = None self.pre_run = ['start-all.sh'] diff --git a/cscs-checks/apps/tensorflow/tensorflow_check.py b/cscs-checks/apps/tensorflow/tensorflow_check.py index 4510ee05d8..3eb18a6b45 100644 --- a/cscs-checks/apps/tensorflow/tensorflow_check.py +++ b/cscs-checks/apps/tensorflow/tensorflow_check.py @@ -12,7 +12,7 @@ def __init__(self, model_name): self.name = 'tensorflow_%s_check' % model_name self.descr = 'Tensorflow official %s test' % model_name self.valid_systems = ['daint:gpu', 'dom:gpu'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.sourcesdir = 'https://github.com/tensorflow/models.git' self.maintainers = ['TM', 'RS'] self.tags = {'production'} diff --git a/cscs-checks/apps/tensorflow/tf2_horovod_check.py b/cscs-checks/apps/tensorflow/tf2_horovod_check.py index ec49de6918..22751dcb0b 100644 --- a/cscs-checks/apps/tensorflow/tf2_horovod_check.py +++ b/cscs-checks/apps/tensorflow/tf2_horovod_check.py @@ -13,7 +13,7 @@ class TensorFlow2HorovodTest(rfm.RunOnlyRegressionTest): def __init__(self, variant): self.descr = 'Distributed training with TensorFlow2 and Horovod' self.valid_systems = ['daint:gpu'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['Horovod/0.18.1-CrayGNU-19.10-tf-2.0.0'] self.sourcesdir = None self.num_tasks_per_node = 1 diff --git a/cscs-checks/apps/tensorflow/tf_horovod_check.py b/cscs-checks/apps/tensorflow/tf_horovod_check.py index 12062be743..7f64908145 100644 --- a/cscs-checks/apps/tensorflow/tf_horovod_check.py +++ b/cscs-checks/apps/tensorflow/tf_horovod_check.py @@ -13,7 +13,7 @@ class TensorFlowHorovodTest(rfm.RunOnlyRegressionTest): def __init__(self, variant): self.descr = 'Distributed training with TensorFlow and Horovod' self.valid_systems = ['daint:gpu'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] tfshortver = '1.14' self.sourcesdir = 'https://github.com/tensorflow/benchmarks' self.modules = ['Horovod/0.16.4-CrayGNU-19.10-tf-%s.0' % tfshortver] From f468b0f005d54c62ec11f1b716e72e20bee3493d Mon Sep 17 00:00:00 2001 From: Victor Holanda Rusu Date: Wed, 11 Mar 2020 17:53:03 +0100 Subject: [PATCH 2/5] Extend builtin PrgEnv to more tests --- config/cscs.py | 39 ++++++++++++------- cscs-checks/libraries/hpx/hpx_hello_world.py | 2 +- cscs-checks/libraries/hpx/hpx_stencil.py | 2 +- .../libraries/io/netcdf_compile_run.py | 4 +- cscs-checks/mch/fieldextra_check.py | 2 +- cscs-checks/microbenchmarks/simd/nsimd.py | 2 +- cscs-checks/microbenchmarks/simd/vc.py | 2 +- cscs-checks/tools/io/cdo.py | 4 +- cscs-checks/tools/io/nco.py | 3 +- 9 files changed, 33 insertions(+), 27 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 199ccd6146..7017e6f6d8 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -23,35 +23,35 @@ class ReframeSettings: 'partitions': { 'login': { 'scheduler': 'local', - 'environs': ['PrgEnv-gnu'], + 'environs': ['builtin', 'PrgEnv-gnu'], 'descr': 'Login nodes', 'max_jobs': 4 }, 'amdv100': { 'scheduler': 'nativeslurm', 'access': ['-pamdv100'], - 'environs': ['PrgEnv-gnu'], + 'environs': ['builtin', 'PrgEnv-gnu'], 'descr': 'AMD Naples 32c + 2x NVIDIA V100', 'max_jobs': 100, }, 'amdvega': { 'scheduler': 'nativeslurm', 'access': ['-pamdvega'], - 'environs': ['PrgEnv-gnu'], + 'environs': ['builtin', 'PrgEnv-gnu'], 'descr': 'AMD Naples 32c + 3x AMD GFX900', 'max_jobs': 100, }, 'intelv100': { 'scheduler': 'nativeslurm', 'access': ['-pintelv100'], - 'environs': ['PrgEnv-gnu'], + 'environs': ['builtin', 'PrgEnv-gnu'], 'descr': 'Intel Skylake 36c + 4x NVIDIA V100', 'max_jobs': 100, }, 'intel': { 'scheduler': 'nativeslurm', 'access': ['-pintel'], - 'environs': ['PrgEnv-gnu'], + 'environs': ['builtin', 'PrgEnv-gnu'], 'descr': 'Intel Skylake 36c', 'max_jobs': 100, } @@ -66,7 +66,7 @@ class ReframeSettings: 'partitions': { 'login': { 'scheduler': 'local', - 'environs': ['PrgEnv-cray', 'PrgEnv-gnu', + 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'], 'descr': 'Login nodes', 'max_jobs': 4 @@ -279,7 +279,8 @@ class ReframeSettings: 'scheduler': 'local', 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Kesch login nodes', }, 'pn': { @@ -287,7 +288,8 @@ class ReframeSettings: 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Kesch post-processing nodes' }, @@ -296,7 +298,8 @@ 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', + 'builtin'], 'descr': 'Kesch compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], @@ -314,21 +317,24 @@ class ReframeSettings: 'login': { 'scheduler': 'local', 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Arolla login nodes', }, 'pn': { 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Arolla post-processing nodes', }, 'cn': { 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'builtin'], 'descr': 'Arolla compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], @@ -346,21 +352,24 @@ class ReframeSettings: 'login': { 'scheduler': 'local', 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Tsa login nodes', }, 'pn': { 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'builtin'], 'descr': 'Tsa post-processing nodes', }, 'cn': { 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'builtin'], 'descr': 'Tsa compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], diff --git a/cscs-checks/libraries/hpx/hpx_hello_world.py b/cscs-checks/libraries/hpx/hpx_hello_world.py index 420028bafc..424132c5b5 100644 --- a/cscs-checks/libraries/hpx/hpx_hello_world.py +++ b/cscs-checks/libraries/hpx/hpx_hello_world.py @@ -12,7 +12,7 @@ class HelloWorldHPXCheck(rfm.RunOnlyRegressionTest): def __init__(self): self.descr = 'HPX hello, world check' self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['HPX'] self.executable = 'hello_world_distributed' diff --git a/cscs-checks/libraries/hpx/hpx_stencil.py b/cscs-checks/libraries/hpx/hpx_stencil.py index 9b25989851..4613f1082a 100644 --- a/cscs-checks/libraries/hpx/hpx_stencil.py +++ b/cscs-checks/libraries/hpx/hpx_stencil.py @@ -12,7 +12,7 @@ class Stencil4HPXCheck(rfm.RunOnlyRegressionTest): def __init__(self): self.descr = 'HPX 1d_stencil_4 check' self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['HPX'] self.executable = '1d_stencil_4' diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 73490b0891..8dd618acf0 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -32,10 +32,10 @@ def __init__(self, lang, linkage): elif self.current_system.name == 'kesch': self.exclusive_access = True if linkage == 'dynamic': - self.valid_prog_environs = ['PrgEnv-pgi-nompi'] + self.valid_prog_environs = ['builtin'] if lang != 'f90': - self.valid_prog_environs += ['PrgEnv-cray-nompi'] + self.valid_prog_environs += ['builtin'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi'] diff --git a/cscs-checks/mch/fieldextra_check.py b/cscs-checks/mch/fieldextra_check.py index b0dece55d3..b1063f452d 100644 --- a/cscs-checks/mch/fieldextra_check.py +++ b/cscs-checks/mch/fieldextra_check.py @@ -15,7 +15,7 @@ def __init__(self): self.tags = {'mch', 'external-resources'} self.valid_systems = ['kesch:cn'] - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + self.valid_prog_environs = ['builtin'] self.executable = 'cookbook/run.bash' self.num_tasks = 1 diff --git a/cscs-checks/microbenchmarks/simd/nsimd.py b/cscs-checks/microbenchmarks/simd/nsimd.py index 9fb7665e80..387527af19 100644 --- a/cscs-checks/microbenchmarks/simd/nsimd.py +++ b/cscs-checks/microbenchmarks/simd/nsimd.py @@ -76,7 +76,7 @@ class NsimdTest(rfm.RegressionTest): ''' def __init__(self): self.valid_systems = ['dom:mc', 'dom:gpu'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.descr = 'sqrt.avx2.f64 example' self.build_system = 'SingleSource' self.testname = 'sqrt.avx2.f64' diff --git a/cscs-checks/microbenchmarks/simd/vc.py b/cscs-checks/microbenchmarks/simd/vc.py index a352bce9be..fb0ccd6983 100644 --- a/cscs-checks/microbenchmarks/simd/vc.py +++ b/cscs-checks/microbenchmarks/simd/vc.py @@ -29,7 +29,7 @@ class VcSimdTest(rfm.RegressionTest): ''' def __init__(self): self.valid_systems = ['*'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.descr = 'finitediff example' self.build_system = 'SingleSource' self.testname = 'finitediff' diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index ab1f66bd2b..e469e953ac 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -35,16 +35,14 @@ def __init__(self): 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'kesch:pn', 'arolla:pn', 'tsa:pn'] + self.valid_prog_environs = ['builtin'] if self.current_system.name == 'kesch': self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['cdo'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['cdo', 'netcdf-fortran'] else: - self.valid_prog_environs = ['PrgEnv-gnu'] self.modules = ['CDO'] self.maintainers = ['SO', 'CB'] diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py index 89f561bd95..fda2f80f77 100644 --- a/cscs-checks/tools/io/nco.py +++ b/cscs-checks/tools/io/nco.py @@ -28,12 +28,11 @@ def __init__(self): 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'kesch:pn', 'arolla:pn', 'tsa:pn'] + self.valid_prog_environs = ['builtin'] if self.current_system.name in ['arolla', 'kesch', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['nco'] else: - self.valid_prog_environs = ['PrgEnv-gnu'] self.modules = ['NCO'] self.maintainers = ['SO', 'CB'] From 4e3e80ab716fa1831a450b00eb151e2de52ebca4 Mon Sep 17 00:00:00 2001 From: Victor Holanda Rusu Date: Thu, 12 Mar 2020 13:44:17 +0100 Subject: [PATCH 3/5] Revert builtin modules changes to kesch et.al --- config/cscs.py | 27 +++++++------------ .../libraries/io/netcdf_compile_run.py | 4 +-- cscs-checks/mch/fieldextra_check.py | 2 +- cscs-checks/tools/io/cdo.py | 4 ++- cscs-checks/tools/io/nco.py | 3 ++- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 7017e6f6d8..ac69d4f9e9 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -279,8 +279,7 @@ class ReframeSettings: 'scheduler': 'local', 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch login nodes', }, 'pn': { @@ -288,8 +287,7 @@ class ReframeSettings: 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch post-processing nodes' }, @@ -298,8 +296,7 @@ class ReframeSettings: 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Kesch compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], @@ -317,24 +314,21 @@ class ReframeSettings: 'login': { 'scheduler': 'local', 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Arolla login nodes', }, 'pn': { 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Arolla post-processing nodes', }, 'cn': { 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'builtin'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], 'descr': 'Arolla compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], @@ -352,24 +346,21 @@ class ReframeSettings: 'login': { 'scheduler': 'local', 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Tsa login nodes', }, 'pn': { 'scheduler': 'nativeslurm', 'access': ['--partition=pn-regression'], 'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'builtin'], + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi'], 'descr': 'Tsa post-processing nodes', }, 'cn': { 'scheduler': 'nativeslurm', 'access': ['--partition=cn-regression'], 'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', - 'builtin'], + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'], 'descr': 'Tsa compute nodes', 'resources': { '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'], diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 8dd618acf0..73490b0891 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -32,10 +32,10 @@ def __init__(self, lang, linkage): elif self.current_system.name == 'kesch': self.exclusive_access = True if linkage == 'dynamic': - self.valid_prog_environs = ['builtin'] + self.valid_prog_environs = ['PrgEnv-pgi-nompi'] if lang != 'f90': - self.valid_prog_environs += ['builtin'] + self.valid_prog_environs += ['PrgEnv-cray-nompi'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi'] diff --git a/cscs-checks/mch/fieldextra_check.py b/cscs-checks/mch/fieldextra_check.py index b1063f452d..b0dece55d3 100644 --- a/cscs-checks/mch/fieldextra_check.py +++ b/cscs-checks/mch/fieldextra_check.py @@ -15,7 +15,7 @@ def __init__(self): self.tags = {'mch', 'external-resources'} self.valid_systems = ['kesch:cn'] - self.valid_prog_environs = ['builtin'] + self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.executable = 'cookbook/run.bash' self.num_tasks = 1 diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index e469e953ac..042a11fed3 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -35,15 +35,17 @@ def __init__(self): 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'kesch:pn', 'arolla:pn', 'tsa:pn'] - self.valid_prog_environs = ['builtin'] if self.current_system.name == 'kesch': self.exclusive_access = True + self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['cdo'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True + self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['cdo', 'netcdf-fortran'] else: self.modules = ['CDO'] + self.valid_prog_environs = ['builtin'] self.maintainers = ['SO', 'CB'] self.tags = {'production', 'mch', 'external-resources'} diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py index fda2f80f77..b253c87713 100644 --- a/cscs-checks/tools/io/nco.py +++ b/cscs-checks/tools/io/nco.py @@ -28,12 +28,13 @@ def __init__(self): 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'kesch:pn', 'arolla:pn', 'tsa:pn'] - self.valid_prog_environs = ['builtin'] if self.current_system.name in ['arolla', 'kesch', 'tsa']: self.exclusive_access = True + self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['nco'] else: self.modules = ['NCO'] + self.valid_prog_environs = ['builtin'] self.maintainers = ['SO', 'CB'] self.tags = {'production', 'mch', 'external-resources'} From 3d2e9de4edc00d6378518de73595e1b7641e4a3a Mon Sep 17 00:00:00 2001 From: Victor Holanda Rusu Date: Thu, 12 Mar 2020 14:27:44 +0100 Subject: [PATCH 4/5] Address PR remarks --- config/cscs.py | 4 ++-- cscs-checks/libraries/boost/boost_python_check.py | 2 +- cscs-checks/libraries/gridtools/gridtools_tests.py | 2 +- cscs-checks/libraries/magma/magma_checks.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index ac69d4f9e9..7672c8a71b 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -534,8 +534,8 @@ class ReframeSettings: 'builtin': { 'cc': 'cc', - 'cxx': '', - 'ftn': '', + 'cxx': 'CC', + 'ftn': 'ftn', }, 'builtin-gcc': { diff --git a/cscs-checks/libraries/boost/boost_python_check.py b/cscs-checks/libraries/boost/boost_python_check.py index da5eebdcf2..e6a51a786e 100644 --- a/cscs-checks/libraries/boost/boost_python_check.py +++ b/cscs-checks/libraries/boost/boost_python_check.py @@ -14,7 +14,7 @@ def __init__(self, boost_version, cray_gnu_version, python_version): 'support') % (boost_version, cray_gnu_version, python_version) self.valid_systems = ['daint:mc', 'daint:gpu', 'dom:mc', 'dom:gpu'] - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] python_major, python_minor = python_version.split('.') self.modules = ['Boost/%s-CrayGNU-%s-python%s' % ( boost_version, cray_gnu_version, python_major)] diff --git a/cscs-checks/libraries/gridtools/gridtools_tests.py b/cscs-checks/libraries/gridtools/gridtools_tests.py index 1b445489eb..5b2386a844 100644 --- a/cscs-checks/libraries/gridtools/gridtools_tests.py +++ b/cscs-checks/libraries/gridtools/gridtools_tests.py @@ -18,7 +18,7 @@ class GridToolsCheck(rfm.RegressionTest): def __init__(self, variant): # Check if this is a device check self.descr = 'GridTools test base' - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['builtin'] self.modules = ['CMake', 'Boost'] is_cuda_test = 'cuda' in variant if is_cuda_test: diff --git a/cscs-checks/libraries/magma/magma_checks.py b/cscs-checks/libraries/magma/magma_checks.py index 09856a3866..badefc65f0 100644 --- a/cscs-checks/libraries/magma/magma_checks.py +++ b/cscs-checks/libraries/magma/magma_checks.py @@ -18,7 +18,7 @@ def __init__(self, subtest): self.prebuild_cmd = ['patch < patch.txt'] self.build_system = 'Make' - self.valid_prog_environs = ['PrgEnv-intel'] + self.valid_prog_environs = ['builtin'] self.build_system.makefile = 'Makefile_%s' % subtest # Compile with -O0 since with a higher level the compiler seems to # optimise something away From de9a97d7a43096fa86ec67d17d2f71e804f54bdb Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 12 Mar 2020 23:20:44 +0100 Subject: [PATCH 5/5] Fix PEP8 issues --- config/cscs.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 7672c8a71b..a0b1b2e3a8 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -168,9 +168,10 @@ class ReframeSettings: 'scheduler': 'local', 'modules': [], 'access': [], - 'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic', - 'PrgEnv-gnu', 'PrgEnv-intel', - 'PrgEnv-pgi'], + 'environs': [ + 'builtin', 'PrgEnv-cray', 'PrgEnv-cray_classic', + 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi' + ], 'descr': 'Login nodes', 'max_jobs': 4 },