From 32c6dbed3b8b36a39fb0754c9a6993bd76a60004 Mon Sep 17 00:00:00 2001 From: Doug Latornell Date: Tue, 19 Mar 2024 13:56:01 -0700 Subject: [PATCH 1/3] Update module loads for Alliance StdEnv/2023 --- salishsea_cmd/run.py | 14 +++++++------- tests/test_run.py | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/salishsea_cmd/run.py b/salishsea_cmd/run.py index bd1f9b6..7094f32 100644 --- a/salishsea_cmd/run.py +++ b/salishsea_cmd/run.py @@ -944,14 +944,14 @@ def _modules(): modules = { "beluga": textwrap.dedent( """\ - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 """ ), "cedar": textwrap.dedent( """\ - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 """ ), "delta": textwrap.dedent( @@ -961,8 +961,8 @@ def _modules(): ), "graham": textwrap.dedent( """\ - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 """ ), "omega": textwrap.dedent( @@ -1127,7 +1127,7 @@ def _execute( # variants script += textwrap.dedent( """\ - module load nco/4.9.5 + module load nco/5.1.7 """ ) script += textwrap.dedent( diff --git a/tests/test_run.py b/tests/test_run.py index abed1f1..c74b114 100644 --- a/tests/test_run.py +++ b/tests/test_run.py @@ -1981,8 +1981,8 @@ def test_beluga(self, account, deflate): """\ GATHER="${HOME}/.local/bin/salishsea gather" - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} cd ${WORK_DIR} @@ -2003,7 +2003,7 @@ def test_beluga(self, account, deflate): """\ echo "Results deflation started at $(date)" - module load nco/4.9.5 + module load nco/5.1.7 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\ *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\ --jobs 4 --debug @@ -2087,8 +2087,8 @@ def test_cedar(self, cpu_arch, nodes, cores_per_node, mem, deflate): """\ GATHER="${HOME}/.local/bin/salishsea gather" - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} cd ${WORK_DIR} @@ -2109,7 +2109,7 @@ def test_cedar(self, cpu_arch, nodes, cores_per_node, mem, deflate): """\ echo "Results deflation started at $(date)" - module load nco/4.9.5 + module load nco/5.1.7 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\ *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\ --jobs 4 --debug @@ -2191,8 +2191,8 @@ def test_graham(self, account, deflate): """\ GATHER="${HOME}/.local/bin/salishsea gather" - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} cd ${WORK_DIR} @@ -2213,7 +2213,7 @@ def test_graham(self, account, deflate): """\ echo "Results deflation started at $(date)" - module load nco/4.9.5 + module load nco/5.1.7 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\ *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\ --jobs 4 --debug @@ -3144,8 +3144,8 @@ def test_beluga_cedar_graham(self, system): modules = salishsea_cmd.run._modules() expected = textwrap.dedent( """\ - module load StdEnv/2020 - module load netcdf-fortran-mpi/4.6.0 + module load StdEnv/2023 + module load netcdf-fortran-mpi/4.6.1 """ ) assert modules == expected @@ -3268,7 +3268,7 @@ def test_execute_with_deflate(self, system, mpirun_cmd): if system in {"beluga", "cedar", "graham"}: expected += textwrap.dedent( """\ - module load nco/4.9.5 + module load nco/5.1.7 """ ) expected += textwrap.dedent( From 45f2108fbd5269abb86a35a9bf211a7171abf1a9 Mon Sep 17 00:00:00 2001 From: Doug Latornell Date: Tue, 7 May 2024 19:20:33 -0400 Subject: [PATCH 2/3] Chg to Intel module load for graham StdEnv/2023 StdEnv/2023 defaults to the GCC compiler collection, so we have to load the Intel compilers module explicitly. --- salishsea_cmd/run.py | 1 + 1 file changed, 1 insertion(+) diff --git a/salishsea_cmd/run.py b/salishsea_cmd/run.py index 7094f32..5db9622 100644 --- a/salishsea_cmd/run.py +++ b/salishsea_cmd/run.py @@ -962,6 +962,7 @@ def _modules(): "graham": textwrap.dedent( """\ module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 """ ), From 20e6ba98a07e3cb65303f9e7d06d51e34947e5a8 Mon Sep 17 00:00:00 2001 From: Doug Latornell Date: Wed, 8 May 2024 14:27:39 -0700 Subject: [PATCH 3/3] Chg to Intel module for beluga & cedar StdEnv/2023 StdEnv/2023 defaults to the GCC compiler collection, so we have to load the Intel compilers module explicitly. Also update test that was missed in 45f2108fb. --- salishsea_cmd/run.py | 3 ++- tests/test_run.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/salishsea_cmd/run.py b/salishsea_cmd/run.py index 5db9622..50793e3 100644 --- a/salishsea_cmd/run.py +++ b/salishsea_cmd/run.py @@ -38,7 +38,6 @@ import nemo_cmd import yaml from nemo_cmd.prepare import get_n_processors, get_run_desc_value, load_run_desc - from salishsea_cmd import api log = logging.getLogger(__name__) @@ -945,12 +944,14 @@ def _modules(): "beluga": textwrap.dedent( """\ module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 """ ), "cedar": textwrap.dedent( """\ module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 """ ), diff --git a/tests/test_run.py b/tests/test_run.py index c74b114..e6d5667 100644 --- a/tests/test_run.py +++ b/tests/test_run.py @@ -30,9 +30,8 @@ import cliff.app import f90nml import pytest -import yaml - import salishsea_cmd.run +import yaml @pytest.fixture @@ -1982,6 +1981,7 @@ def test_beluga(self, account, deflate): GATHER="${HOME}/.local/bin/salishsea gather" module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} @@ -2088,6 +2088,7 @@ def test_cedar(self, cpu_arch, nodes, cores_per_node, mem, deflate): GATHER="${HOME}/.local/bin/salishsea gather" module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} @@ -2192,6 +2193,7 @@ def test_graham(self, account, deflate): GATHER="${HOME}/.local/bin/salishsea gather" module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 mkdir -p ${RESULTS_DIR} @@ -3145,6 +3147,7 @@ def test_beluga_cedar_graham(self, system): expected = textwrap.dedent( """\ module load StdEnv/2023 + module load intel/2023.2.1 module load netcdf-fortran-mpi/4.6.1 """ )