Point to ekat master branch, and fix usage of deprecated kokkos code in Homme #6421
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
|
jgfouca
approved these changes
May 16, 2024
jgfouca
added a commit
that referenced
this pull request
May 16, 2024
Point to ekat master branch, and fix usage of deprecated kokkos code in Homme We just merged the kokkos-4.2 branch in ekat/master, so now we can make e3sm point directly to the ekat/master branch, which avoids conflicts when doing a downstream merge into scream repo. Also, fix usage of deprecated kokkos code in Homme. The tests on e3sm repo are set so that Kokkos allows using deprecated code (with warnings), but it caused some errors downstream in eamxx. Using the non-deprecated code is a simple fix [BFB]
|
Merged to next. |
This was referenced May 17, 2024
|
Should I merge to master or hold off? I assume the additional cmake modification should be made in this PR. |
|
@noel has another PR where he adds the mod to mueller mach file. Since mueller is not part of nightly testing, it's ok to do a separate merge (or merge here, whatever). That said, I haven't checked whether the next failures have anything to do with this PR (though I doubt it). If you can quickly figure that out, then we can merge. |
|
The new failures were just some DIFFs for lnd compsets. I will merge. |
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.
We just merged the kokkos-4.2 branch in ekat/master, so now we can make e3sm point directly to the ekat/master branch, which avoids conflicts when doing a downstream merge into scream repo.
Also, fix usage of deprecated kokkos code in Homme. The tests on e3sm repo are set so that Kokkos allows using deprecated code (with warnings), but it caused some errors downstream in eamxx. Using the non-deprecated code is a simple fix.