Skip to content

Conversation

@samsrabin
Copy link
Member

@samsrabin samsrabin commented May 31, 2025

Description of changes

As of ctsm5.3.051 (#3125), bin/git-fleximod checkout -o results in an unclean state, which prevents the documentation from deploying. This PR resolves the issue. It also edits a couple of GitHub workflows to catch such problems in the future.

Additionally, ctsm5.3.051 did not bring in the version of CMEPS required for FTorch to build properly—see #3214. Fixing it is going to be a big task, so for now we're just removing it. Issue to add it back: #3228

Specific notes

Contributors other than yourself, if any: None

CTSM Issues Fixed:

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)? No

Does this create a need to change or add documentation? Did you do so? No

Testing performed, if any: GitHub workflows, plus:

  • SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.izumi_nag.clm-crop to check build

@samsrabin samsrabin added bfb bit-for-bit devops Development Operations to improve development throughput, E.g., adding GitHub Workflows docs:infrastructure New features or bug fixes in the documentation infrastructure docs-loc:infrastructure Relates to documentation infrastructure labels May 31, 2025
@samsrabin samsrabin marked this pull request as ready for review May 31, 2025 22:37
@samsrabin samsrabin added the test: none No tests required (e.g. tools/contrib) label May 31, 2025
@samsrabin samsrabin added the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label May 31, 2025
@samsrabin samsrabin moved this to In progress - master in CTSM: Upcoming tags May 31, 2025
@samsrabin samsrabin changed the title Fix checkout of FTorch? Fix FTorch submodule checkout May 31, 2025
@samsrabin samsrabin requested a review from ekluzek May 31, 2025 22:54
@samsrabin samsrabin self-assigned this May 31, 2025
@samsrabin samsrabin added the PR status: awaiting review Work on this PR is paused while waiting for review. label May 31, 2025
ekluzek
ekluzek previously approved these changes Jun 2, 2025
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

This is great and good to come in now. This was a great catch by @samsrabin and good to have in place.

@ekluzek
Copy link
Collaborator

ekluzek commented Jun 2, 2025

Oh, shouldn't this be going to b4b-dev?

@samsrabin samsrabin removed the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Jun 2, 2025
@samsrabin
Copy link
Member Author

Thanks @ekluzek! Per discussion just now we'll put this on master. I'll wait until #3212 before doing this, just because I tested that one without this. I don't think there'll be side effects of this but who knows.

@samsrabin samsrabin added PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete bug something is working incorrectly and removed PR status: awaiting review Work on this PR is paused while waiting for review. labels Jun 2, 2025
@samsrabin samsrabin changed the title Fix FTorch submodule checkout ctsm5.3.055: Fix FTorch submodule checkout Jun 2, 2025
@samsrabin
Copy link
Member Author

#3214 means this is more complicated now. I'm passing it off to @ekluzek to fix, because I think updating CMEPS to cmeps1.0.51 is going to require other submodule updates.

@samsrabin samsrabin changed the title ctsm5.3.055: Fix FTorch submodule checkout ctsm5.3.055: Fix FTorch submodule Jun 2, 2025
@samsrabin samsrabin added next this should get some attention in the next week or two. Normally each Thursday SE meeting. and removed PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete labels Jun 2, 2025
@samsrabin samsrabin removed the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Jun 5, 2025
@wwieder
Copy link
Contributor

wwieder commented Jun 5, 2025

Hey all, I think this is good work, but I don't really understand why it's suddenly at the top of the project board (not where on our sprint planning board)? It seems like this is ready to go, and OK to move it. But I'm kind of surprised it was prioritized when it's not really a required focus for CESM3 / CLM6 release.

@wwieder
Copy link
Contributor

wwieder commented Jun 5, 2025

Reading this a little more carefully it seems like this is fixing submodules needed for documentation, which is required for CLM6. I guess I was confused by the FTorch capabilities (which don't seem critical for CESM3).

@samsrabin
Copy link
Member Author

samsrabin commented Jun 5, 2025

@wwieder Yeah, Erik thought it would be easy to bring in, so he did (ctsm5.3.051) but later I realized it was broken. The decision from this morning is we're just going to remove it. Changing the title of this PR to reflect that.

@samsrabin samsrabin changed the title ctsm5.3.055: Fix FTorch submodule ctsm5.3.055: Remove FTorch submodule Jun 5, 2025
@samsrabin samsrabin changed the title ctsm5.3.055: Remove FTorch submodule ctsm5.3.055: Remove broken FTorch submodule Jun 5, 2025
@samsrabin samsrabin requested a review from ekluzek June 5, 2025 18:01
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

Cool, this does the obvious thing with removing FTorch, and it does a few documentation things which is great.

I'm marking approve. The one substantial thing that I request is to check that doc-builder is in place, rather than doing the git-fleximod update in the testing.sh script.

But, thanks for putting this together and having it ready to go.

@samsrabin samsrabin merged commit 53057f0 into ESCOMP:master Jun 5, 2025
7 checks passed
@github-project-automation github-project-automation bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Jun 5, 2025
mvdebolskiy added a commit to mvdebolskiy/CTSM that referenced this pull request Jun 14, 2025
ctsm5.3.055: Remove broken FTorch submodule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bfb bit-for-bit bug something is working incorrectly devops Development Operations to improve development throughput, E.g., adding GitHub Workflows docs:infrastructure New features or bug fixes in the documentation infrastructure docs-loc:infrastructure Relates to documentation infrastructure test: none No tests required (e.g. tools/contrib)

Projects

Status: Done (non release/external)

Development

Successfully merging this pull request may close these issues.

Build fails with FTorch checked out build-and-deploy failure at ctsm5.3.053

3 participants