EAMxx: update EKAT submodule and adapt EAMxx #7362
Merged
Conversation
This file contains hidden or 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
jgfouca
approved these changes
May 19, 2025
jeff-cohere
approved these changes
May 19, 2025
There was a problem hiding this comment.
I agree, there's lots of good stuff here. Nicely and carefully done, @bartgol .
bartgol
force-pushed
the
bartgol/ekat-update-051425
branch
9 times, most recently
from
1046507 to
cb4c11d
Compare
|
@tcclevenger @jeff-cohere @jgfouca The deprecation of
Maybe option 3 is best, even though it ends up updating ekat twice in a short time? |
|
1 seems easiest. |
|
I agree with Jim. 1 would really be "asap". :-) |
|
I agree, 1. |
bartgol
force-pushed
the
bartgol/ekat-update-051425
branch
9 times, most recently
from
8af2326 to
5d63a77
Compare
|
bartgol
force-pushed
the
bartgol/ekat-update-051425
branch
from
5d63a77 to
e302fb3
Compare
bartgol
force-pushed
the
bartgol/ekat-update-051425
branch
from
7c8b232 to
d6c364c
Compare
Mostly changing includes, to remove ekat/*/ from the filename path, and removing includes not needed
In particular, physics_test_data.hpp only belongs in testing. So add those sources to scream_test_support target and link the test support target against unit tests
Make sure we match settings of eamxx
bartgol
force-pushed
the
bartgol/ekat-update-051425
branch
from
d6c364c to
878c029
Compare
bartgol
added a commit
that referenced
this pull request
Jul 30, 2025
Update the EKAT submodule and change EAMxx to conform to the new version of EKAT. [BFB]
bartgol
added a commit
that referenced
this pull request
Aug 1, 2025
Update the EKAT submodule and change EAMxx to conform to the new version of EKAT.
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.
Update the EKAT submodule and change EAMxx to conform to the new version of EKAT.
A (very disruptive) PR in EKAT (not yet integrated) will break EKAT into sub-packages, to facilitate its use in other applications without the need to bring in every single ekat dependency.
This PR adapts to those changes, which can be summarized in the following points:
ekatlibrary, but a bunch ofekat::XYZlibraries, including aekat::AllLibsone (for convenience).ekat_kokkos_utils.hppbroken in two:ekat_reduction_utils.hppandekat_team_policy_utils.hppExeSpaceUtilsno longer persent. In its place, useTeamPolicyFactory(fromekat_team_policy_utils.hpp) for team policy creation, andReductionUtils(fromekat_reduction_utils.hpp) for reduction utilities; both are templated on exec space, just likeExeSpaceUtilswas.ScalarTraitsno longer providesinvalid()andquiet_NaN(), but only provides type info. The functionsquiet_NaN()andfinite_max()have been added inekat_math_utils.hpp, but may disappear once we have C++20 (see comment inekat_pack.hppabout "introspective" constepxr)ekat_file_utils.hpphas been purged, and all tests now simply use the standard libraryifstream/ofstreamcapabilities.ekat::KokkosUtilshasinitialize_kokkos_session(and its finalize).EkatCreateUnitTestExecno longer hasEXCLUDE_TEST_SESSION, but instead hasUSER_DEFINED_TEST_SESSION, for more expressivity.The biggest challenge was how to break ekat into N packages, since some utilities were "generic enough", but required knowledge about kokkos (e.g., printing the current arch configuration seems generic enough to be in ekat::Core, but the kokkos backend info requires kokkos to be compiled).
The current result seems to be the best compromise between flexibility (for new customers) and robustness (for existing customers).
I have NOT updated mam4xx/haero to use the new ekat, so all their tests may fail to build (or even configure). I am opening the PR anyways, in the hope to get a build of all the rest until mam4xx is update too.
IMPORTANT NOTE FOR REVIEWERS: I strongly recommend to review the commits individually. I tried to group changes by topic, so reviewing one commit may be simpler; ha couple of commits are quite large, but seeing the same pattern over and over may make it easier to review.