release/1.5.1: fix Intel container build (ectrans error), update Dere…

…cho documentation Bugfix/container ectrans fftw derecho docs (JCSDA#821) * Comment out intel-oneapi-mkl in configs/containers/docker-ubuntu-intel-impi.yaml and fix wrong variant ~fftw for jedi-base-env in configs/containers/README.md * Fix incorrect variant name for mkl for package ectrans in configs/common/packages.yaml * Fix outdated instructions for Derecho in doc/source/PreConfiguredSites.rst * Update submodule pointer for spack
AlexanderRichert-NOAA · Oct 13, 2023 · 0d248b5 · 0d248b5
1 parent 18834a1
commit 0d248b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -54,7 +54,7 @@
       variants: +fckit +ectrans +tesselation +fftw
     ectrans:
       version: ['1.2.0']
-      variants: ~enable_mkl +fftw
+      variants: ~mkl +fftw
     eigen:
       version: ['3.4.0']
     # Attention - when updating the version also check the common modules.yaml

diff --git a/configs/containers/README.md b/configs/containers/README.md
@@ -4,7 +4,7 @@ To avoid hardcoding specs in the generic container recipes, we keep the specs li
 
 ### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
 ```
-  specs: [[email protected], [email protected] ~fftw, [email protected], [email protected],
+  specs: [[email protected], [email protected], [email protected], [email protected],
     [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
     [email protected], [email protected] +fckit +ectrans +tesselation +fftw, [email protected], [email protected] +fftw,
     [email protected], [email protected], fms@release-jcsda, [email protected], [email protected], [email protected],

diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml
@@ -45,11 +45,12 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /opt/intel/oneapi
-    intel-oneapi-mkl:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        prefix: /opt/intel/oneapi
+    # Comment out for now so that fftw-api uses fftw and not mkl
+    #intel-oneapi-mkl:
+    #  buildable: false
+    #  externals:
+    #  - spec: [email protected]
+    #    prefix: /opt/intel/oneapi
     gmake:
       buildable: false
       externals:

diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
@@ -375,9 +375,7 @@ The following is required for building new spack environments and for using spac
    module purge
    # ignore that the sticky module ncarenv/... is not unloaded
    export LMOD_TMOD_FIND_FIRST=yes
-   # Temporary, until CISL created the module tree for the newest Intel compilers
-   module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra
-   module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles
+   module use /glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles
    module load ecflow/5.8.4
    module load mysql/8.0.33
 

diff --git a/spack b/spack
+3 −1		var/spack/repos/builtin/packages/ectrans/package.py
+1 −0		var/spack/repos/builtin/packages/py-openpyxl/package.py
+3 −0		var/spack/repos/builtin/packages/py-pandas/package.py