Skip to content

release/1.5.1: fix Intel container build (ectrans error), update Derecho documentation Bugfix/container ectrans fftw derecho docs #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 5 commits into from
Oct 13, 2023
Merged

release/1.5.1: fix Intel container build (ectrans error), update Derecho documentation Bugfix/container ectrans fftw derecho docs #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b36994
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Oct 11, 2023
c11fe61
Comment out intel-oneapi-mkl in configs/containers/docker-ubuntu-inte…
climbfuji Oct 11, 2023
c6499a9
Fix incorrect variant name for mkl for package ectrans in configs/com…
climbfuji Oct 11, 2023
e049976
Fix outdated instructions for Derecho in doc/source/PreConfiguredSite…
climbfuji Oct 11, 2023
ea6a284
Revert .gitmodules and update submodule pointer for spack
climbfuji Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/containers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [base-env@1.0.0, jedi-base-env@1.0.0 ~fftw, ewok-env@1.0.0, jedi-fv3-env@1.0.0,
specs: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0,
jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.0, ecbuild@3.7.2, eccodes@2.27.0, ecflow@5,
eckit@1.24.4, ecmwf-atlas@0.35.0 +fckit +ectrans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw,
eigen@3.4.0, fckit@0.11.0, fms@release-jcsda, g2@3.4.5, g2tmpl@1.10.0, gftl-shared@1.5.0,
Expand Down
11 changes: 6 additions & 5 deletions configs/containers/docker-ubuntu-intel-impi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ spack:
externals:
- spec: intel-oneapi-mpi@2021.6.0
prefix: /opt/intel/oneapi
intel-oneapi-mkl:
buildable: false
externals:
- spec: intel-oneapi-mkl@2022.1.0
prefix: /opt/intel/oneapi
# Comment out for now so that fftw-api uses fftw and not mkl
#intel-oneapi-mkl:
# buildable: false
# externals:
# - spec: intel-oneapi-mkl@2022.1.0
# prefix: /opt/intel/oneapi
gmake:
buildable: false
externals:
Expand Down
4 changes: 1 addition & 3 deletions doc/source/PreConfiguredSites.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 3 files
+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