Skip to content

Add PALS_LOCAL_RANKID to list of on-node local RANKID env-vars#2

Merged
tcclevenger merged 1 commit into
e3sm-masterfrom
azamat/update-e3sm-kokkos
Feb 18, 2026
Merged

Add PALS_LOCAL_RANKID to list of on-node local RANKID env-vars#2
tcclevenger merged 1 commit into
e3sm-masterfrom
azamat/update-e3sm-kokkos

Conversation

@amametjanov

Copy link
Copy Markdown
Member

Add PALS_LOCAL_RANKID to list of on-node local RANKID env-vars.

[BFB]

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Extends Kokkos’ CPU-side MPI rank discovery to recognize PALS-provided local-rank environment variables, improving interoperability on systems using PALS.

Changes:

  • Add PALS_LOCAL_RANKID to the set of environment variables checked to determine MPI local rank on a node.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@bartgol

bartgol commented Feb 13, 2026

Copy link
Copy Markdown

Is this mod already in kokkos main repo? If no, would it make sense to put in a PR in the kokkos repo itself? It seems like kokkos should support what's needed on Aurora...

@bartgol bartgol requested a review from tcclevenger February 13, 2026 05:38
@amametjanov

Copy link
Copy Markdown
Member Author

okay, in the main repo, submitted PR kokkos/pull/8890

@amametjanov

Copy link
Copy Markdown
Member Author

This was merged in E3SM-Project/EKAT#372. Closing.

@bartgol

bartgol commented Feb 18, 2026

Copy link
Copy Markdown

Shouldn't we merge this PR and make ekat point to E3SM-Project/kokkos/master? If this branch gets deleted, we have a broken submodule in ekat. And we should probably not point to an unmerged feature branch.

Another issue is what will happen when someone adds another fix to this kokkos fork. They will likely fork from master, so if this branch is not merged in master, we will lose this fix.

I think we should merge, and update e3sm-master.

@tcclevenger I don't know if you were planning something else, maybe in view of kokkos 5 upgrade, so I'm letting you decide. But leaving things as they are may be dangerous down the road...

@bartgol bartgol reopened this Feb 18, 2026
@tcclevenger

Copy link
Copy Markdown

Yes, I wasn't thinking about the state of the submodule branch, we should definitely merge this and update in EKAT. I'll create the PR.

@tcclevenger tcclevenger merged commit 750f3a5 into e3sm-master Feb 18, 2026
24 of 28 checks passed
@tcclevenger

Copy link
Copy Markdown

Wait, @bartgol I think I'm now confused. Currently, we have the branch E3SM-Project/kokkos/e3sm-master which is 2 commits with changes on top of kokkos 4.5.01, and EKAT points to the tip of e3sm-master.

@tcclevenger

Copy link
Copy Markdown

I went ahead and reorged the E3SM-Project/kokkos/e3sm-master branch to remove the merge commit from this PR and just be
Merge pull request from ndellingwood/master-release-4.5.01 (Kokkos/kokkos/release-4.5.01)
->
Cherry-pick 'Add E3SM's changes on top of latest kokkos master' and resolve conflicts.
->
Add PALS_LOCAL_RANKID to list of on-node local RANKID env-vars

I may further consolidate into a single commit from the E3SM side, then when updating to kokkos 5 we can decide how much of those extra changes are necessary (some are quite old, I believe), and the PALS commit will drop off.

EKAT currently points to the tip of this branch.

@bartgol

bartgol commented Feb 18, 2026

Copy link
Copy Markdown

@tcclevenger yes, the e3sm-master branch had a couple of commits that were added through the years to fix a couple of issues in kokkos. Honestly, I don't know for sure how much each of those still was. I see that the current version of e3sm-master still has them (at least the ones I remember). And I am now noticing this PR was into e3sm-master, so I think all was good. I got confused cause I thought we were merging into E3SM-Project/kokkos/master or something, which would have been wrong.

I think all is good.

@amametjanov amametjanov deleted the azamat/update-e3sm-kokkos branch February 19, 2026 03:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants