Various version updates for spack-stack-1.5.0 (met, metplus, eckit, fckit, fiat, ecmwf-atlas) #304
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
climbfuji
force-pushed
the
feature/version_updates_20230817
branch
from
6b5b126
to
c0acdb1
Compare
climbfuji
force-pushed
the
feature/version_updates_20230817
branch
from
61b6d16
to
f8335a0
Compare
climbfuji
force-pushed
the
feature/version_updates_20230817
branch
from
f8335a0
to
28fe0d6
Compare
…into feature/version_updates_20230817
climbfuji
commented
Aug 18, 2023
| version("0.33.0", sha256="a91fffe9cecb51c6ee8549cbc20f8279e7b1f67dd90448e6c04c1889281b0600") | ||
| version("0.32.1", sha256="3d1a46cb7f50e1a6ae9e7627c158760e132cc9f568152358e5f78460f1aaf01b") | ||
| version("0.31.1", sha256="fa9274c74c40c2115b9c6120a7040e357b0c7f37b20b601b684d2a83a479cdfb") | ||
| version("0.31.0", sha256="fa4ff8665544b8e19f79d171c540a9ca8bfc4127f52a3c4d4d618a2fe23354d7") | ||
|
|
||
| depends_on("ecbuild", type=("build")) | ||
| depends_on("eckit") | ||
| depends_on("boost cxxstd=14 visibility=hidden", when="@0.26.0:", type=("build", "run")) | ||
| depends_on("eckit@:1.23", when="@:0.33") |
There was a problem hiding this comment.
I am creating this clear separation due to the update to C++-17 in eckit 1.24, fckit 0.11, ecmwf-atlas 0.34.
…version 1.2.0 requires a differently formatted patch
…into feature/version_updates_20230817
… vectorization patch
climbfuji
changed the title
climbfuji
commented
Aug 21, 2023
| variant("fckit", default=True) | ||
| depends_on("fckit", when="+fckit") | ||
| depends_on("fckit@:0.10", when="@:0.33 +fckit") | ||
| depends_on("[email protected]:", when="@0.34: +fckit") |
climbfuji
commented
Aug 21, 2023
| depends_on('eckit+mpi', when='+eckit') | ||
| variant("eckit", default=True) | ||
| depends_on("eckit@:1.23 +mpi", when="@:0.10 +eckit") | ||
| depends_on("[email protected]: +mpi", when="@0.11: +eckit") |
There was a problem hiding this comment.
Same as for ecmwf-atlas. Clear cut between versions that ran fine with C++-11 standard and newer versions that require C++-17.
climbfuji
commented
Aug 21, 2023
|
|
||
| if "+python" in spec: | ||
| python = spec["python"] | ||
| # Syntax changed from 11.0.x to 11.1.y |
There was a problem hiding this comment.
Take note of this please
climbfuji
requested review from
AlexanderRichert-NOAA,
srherbener,
fmahebert and
ulmononian
fmahebert
approved these changes
Aug 23, 2023
ulmononian
approved these changes
Aug 23, 2023
srherbener
reviewed
Aug 23, 2023
var/spack/repos/builtin/packages/ecmwf-atlas/intel_vectorization_v0p34.patch
Show resolved
Hide resolved
| patch("apple-clang-string-cast-operator.patch", when="@10.1.1: %apple-clang@14:") | ||
| patch("apple-clang-no-register.patch", when="@10.1.1: %apple-clang@14:") | ||
| patch("apple-clang-string-cast-operator.patch", when="@10.1.1:11.0.99 %apple-clang@14:") | ||
| patch("apple-clang-no-register.patch", when="@10.1.1:11.0.99 %apple-clang@14:") |
There was a problem hiding this comment.
Thanks for adding the upper limit on the version numbers for these patches!
srherbener
approved these changes
Aug 23, 2023
var/spack/repos/builtin/packages/ecmwf-atlas/intel_vectorization_v0p34.patch
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note - to be merged as merge commit, not as squashed commit
I made sure that each commit was for a specific package only. Merging this as a merge commit allows us to identify the individual commits, to cherry-pick them for sending them upstream to spack etc.
Description
Several new versions for spack-stack-1.5.0 (individual commits):
[email protected](based on testing on Hercules)Note that due to the recent move to C++-17 for the ECMWF libraries, I am making a clear cut for the version dependencies. Versions of eckit/fckit/ecmwf-atlas that didn't strictly require C++-17 go together, and same for versions that do require C++-17.
Testing
This PR is tested as part of JCSDA/spack-stack#722