From 2e49ac4df1988382eff412ac07bda71948523e0f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 18 Jan 2024 11:52:00 -0700 Subject: [PATCH] Remove additional esmf/mapl builds from skylab-dev and unified-dev templates, only build mapl@2.40.3 with esmf@8.6.0 (#954) --- configs/common/packages.yaml | 2 +- configs/templates/skylab-dev/spack.yaml | 6 +----- configs/templates/unified-dev/spack.yaml | 10 +++------- doc/source/MaintainersSection.rst | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 75b58eabc..9ab083172 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -60,7 +60,7 @@ # config and update the projections for lmod/tcl. # Also, check the acorn and derecho site configs which have esmf modifications. esmf: - version: ['8.5.0'] + version: ['8.6.0'] variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio require: - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 615157137..e9df7134b 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -12,7 +12,7 @@ spack: - jedi-fv3-env - jedi-mpas-env - jedi-neptune-env - - jedi-ufs-env ^mapl@2.40.3 ^esmf@8.5.0 + - jedi-ufs-env - jedi-um-env - soca-env @@ -24,10 +24,6 @@ spack: - crtm@2.4.0.1 - crtm@v2.4.1-jedi - # Various esmf/mapl tags (list all to avoid duplicate packages) - - mapl@2.40.3 ^esmf@8.5.0 - - mapl@2.40.3 ^esmf@8.6.0 - specs: - matrix: - [$packages] diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 8baebc82b..e028d3106 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -16,13 +16,13 @@ spack: - jedi-mpas-env - jedi-neptune-env - jedi-tools-env - - jedi-ufs-env ^mapl@2.40.3 ^esmf@8.5.0 + - jedi-ufs-env - jedi-um-env #- nceplibs-env - soca-env - - ufs-srw-app-env ^mapl@2.40.3 ^esmf@8.5.0 + - ufs-srw-app-env #- ufs-utils-env - - ufs-weather-model-env ^mapl@2.40.3 ^esmf@8.5.0 + - ufs-weather-model-env #- upp-env #- ww3-env @@ -34,10 +34,6 @@ spack: - crtm@2.4.0.1 - crtm@v2.4.1-jedi - # Various esmf/mapl tags (list all to avoid duplicate packages) - - mapl@2.40.3 ^esmf@8.5.0 - - mapl@2.40.3 ^esmf@8.6.0 - # MADIS for WCOSS2 decoders. - madis@4.5 diff --git a/doc/source/MaintainersSection.rst b/doc/source/MaintainersSection.rst index 6cf8a46dc..aa3ccb56d 100644 --- a/doc/source/MaintainersSection.rst +++ b/doc/source/MaintainersSection.rst @@ -366,7 +366,7 @@ ecflow module load comp/gcc/10.1.0 openmpi - Installing ``openmpi`` requires adapting the installation to the network hardware and ``slurm`` scheduler. It is easier to build and test ``openmpi`` manually and use it as an external package, instead of building it as part of spack-stack. These instructions were used to build the ``openmpi@4.1.3`` MPI library with ``gcc@10.1.0`` as referenced in the Discover site config. After the installation, create modulefile `openmpi/4.1.3-gcc-10.1.0` using the template ``doc/modulefile_templates/openmpi``. Note the site-specific module settings at the end of the template, this will likely be different for other HPCs. + Installing ``openmpi`` requires adapting the installation to the network hardware and ``slurm`` scheduler. It is easier to build and test ``openmpi`` manually and use it as an external package, instead of building it as part of spack-stack. These instructions were used to build the ``openmpi@4.1.3`` MPI library with ``gcc@10.1.0`` as referenced in the Discover site config. After the installation, create modulefile `openmpi/4.1.3-gcc-10.1.0` using the template ``doc/modulefile_templates/openmpi``. Note the site-specific module settings at the end of the template, this will likely be different for other HPCs. The instructions below have also been tested with ``gcc@12.1.0`` (update instructions accordingly) and the module is available on Discover for future use. .. code-block:: console