Skip to content

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

Merged
climbfuji merged 5 commits intoJCSDA:release/1.5.1from
climbfuji:bugfix/container_ectrans_fftw_derecho_docs
Oct 13, 2023
Merged

release/1.5.1: fix Intel container build (ectrans error), update Derecho documentation Bugfix/container ectrans fftw derecho docs#821
climbfuji merged 5 commits intoJCSDA:release/1.5.1from
climbfuji:bugfix/container_ectrans_fftw_derecho_docs

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Oct 11, 2023 •
edited
Loading

Summary

Same as for JCSDA/spack#342: This time I am doing it the other way round, add to release/1.5.1 and then merge back to develop by cherry-picking the commits ...

  1. Fix Intel CI container build failed in ectrans #820 correcting the fftw and mkl variants for ectrans and jedi-base-env in the container specs, and by commenting out intel-oneapi-mkl in the Intel container recipe (we want to use this in the future when we work on Switch to Intel MKL on systems with Intel compiler #759, therefore not deleting it).
  2. A last-minute documentation update for Derecho didn't make it into the release/1.5.0 branch and consequently also not into develop.

Testing

  • Manual build of docker-intel-impi container on Ubuntu CI instance - previously failing ectrans build now succeeds
  • CI

Applications affected

None

Systems affected

Ubuntu Intel Container builds

Dependencies

Issue(s) addressed

Resolves #818
Resolves #820

Checklist

  • This PR addresses one issue/problem/enhancement, or has a very good reason for not doing so.
  • These changes have been tested on the affected systems and applications.
  • All dependency PRs/issues have been resolved and this PR can be merged.

@climbfuji climbfuji marked this pull request as ready for review October 12, 2023 01:32
@climbfuji climbfuji mentioned this pull request Oct 12, 2023
Merged
3 tasks
@climbfuji climbfuji self-assigned this Oct 12, 2023
@climbfuji climbfuji added the INFRA JEDI Infrastructure label Oct 12, 2023
@climbfuji climbfuji enabled auto-merge (squash) October 13, 2023 13:02
@climbfuji climbfuji merged commit 0d248b5 into JCSDA:release/1.5.1 Oct 13, 2023
This was referenced Oct 13, 2023
Closed
Closed
climbfuji added a commit that referenced this pull request Nov 9, 2023
@climbfuji @ncrossette
@AlexanderRichert-NOAA @srherbener @DavidHuber-NOAA
Merge pull request #866 from climbfuji/feature/merge_rel151_into_dev
d75a997 
* Clarifying directions in Generating new site configs (#791)
* Change prod-util module to prod_util (#794) (#798)
* Bumped bufr version to 12.0.1 (#797)
* Workaround for spack-stack-1.5.0 on Hera: use new noavx512 install, add target 'haswell'
* Update default atlas version to 0.35.0
* Update build variants for ecmwf-atlas
* Update variants for ectrans
* Remove deprecated variant cgal from ecmwf-atlas, since it conflicts with the replacement qhull for tesselation and since it leads to compilation errors in ecmwf-atlas with Intel
* release/1.5.1: fix Intel container build (ectrans error), update Derecho documentation Bugfix/container ectrans fftw derecho docs (#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 gsi-ncdiag version number in config.
* Update fms default to 2023.02.01
* [email protected], [email protected] as defaults (#839)
* update fms versions in unified-dev
* update fms versions in ufs wm metapackage
* update gftl-shared default to 1.6.1
* release/1.5.1: backport mpich4 workarounds for [email protected] and [email protected] (#842)
* release/1.5.1: update site config for Hercules (gnu+mvapich2) (#849)
* release/1.5.1: Update site configs for Derecho, Narwhal, Gaea C5, Discover, AWS ParallelCluster, S4 (#853)
* release/1.5.1: add [email protected], site config updates round 3 (#855)
    * Update site configs for NOAA Parallel Works
    * Update casper site config and build documentation
    * Update container specs in configs/containers/README.md
    * Update Hercules site config (gnu@12, [email protected])
    * Update  doc/source/PreConfiguredSites.rst for casper, hera, gaea-c4, jet
    * Add [email protected] in spack submodule, add to unified-dev and skylab-dev templates
    * Update configs/containers after tagging spack submodule as spack-stack-1.5.1
    * Update documentation for AWS AMI release 1.5.1
    * Update macOS section in doc/source/NewSiteConfigs.rst to match Linux section

---------

Co-authored-by: Nate Crossette <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
Co-authored-by: Stephen Herbener <[email protected]>
Co-authored-by: DavidHuber <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
@climbfuji climbfuji deleted the bugfix/container_ectrans_fftw_derecho_docs branch March 24, 2026 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@srherbener srherbener srherbener approved these changes

@ulmononian ulmononian ulmononian approved these changes

@natalie-perlin natalie-perlin Awaiting requested review from natalie-perlin

@AlexanderRichert-NOAA AlexanderRichert-NOAA Awaiting requested review from AlexanderRichert-NOAA

Assignees

@climbfuji climbfuji

Labels

INFRA JEDI Infrastructure

Projects

No open projects
spack-stack-1.5.1
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@climbfuji @srherbener @ulmononian