From b04a2897c9afee17aa55f75edad2cd4fe5ab6468 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 15:47:31 -0600 Subject: [PATCH 01/11] doc/testing.sh: Add git-fleximod update. --- doc/testing.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/testing.sh b/doc/testing.sh index a44b6ad18a..63974ec869 100755 --- a/doc/testing.sh +++ b/doc/testing.sh @@ -2,6 +2,10 @@ set -e set -x +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +cd "${SCRIPT_DIR}" + +../bin/git-fleximod update -o rm -rf _publish* # Build all docs using container From af46c56d0662d485e647b6d499f6be153662fcfb Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:05:59 -0600 Subject: [PATCH 02/11] docs-omnibus.yml: testing.sh itself doesn't need to be conda run. --- .github/workflows/docs-omnibus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-omnibus.yml b/.github/workflows/docs-omnibus.yml index 655813c366..1636150fae 100644 --- a/.github/workflows/docs-omnibus.yml +++ b/.github/workflows/docs-omnibus.yml @@ -51,4 +51,4 @@ jobs: # TODO: Split testing.sh tests into their own steps in this job - name: Text Sphinx builds with omnibus script run: | - cd doc && conda run -n ctsm_pylib ./testing.sh + cd doc && ./testing.sh From 6f8ef105b3e4f4c6fbd8fba93e7ec667cfaf0311 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:11:49 -0600 Subject: [PATCH 03/11] fleximod_test.yaml: Include optional submodules. --- .github/workflows/fleximod_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 8680541676..b62cb5a28e 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - id: run-fleximod run: | - $GITHUB_WORKSPACE/bin/git-fleximod update + $GITHUB_WORKSPACE/bin/git-fleximod update -o echo echo "Update complete, checking status" echo From 2967370909876e67ce9a291efd6acb75a388b8b0 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:27:25 -0600 Subject: [PATCH 04/11] fleximod_test.yaml: Catch STAGED uncommitted changes. --- .github/workflows/fleximod_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index b62cb5a28e..bf92cb3a91 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -32,4 +32,4 @@ jobs: echo echo "Checking if git fleximod matches expected externals" echo - git diff --exit-code + git add . && git diff --quiet && git diff --cached --quiet From 30677b8e8f6b2620f8e16b064c2881d1c40e1aeb Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:33:22 -0600 Subject: [PATCH 05/11] Actually add FTorch submodule. --- libraries/FTorch | 1 + 1 file changed, 1 insertion(+) create mode 160000 libraries/FTorch diff --git a/libraries/FTorch b/libraries/FTorch new file mode 160000 index 0000000000..79e7675694 --- /dev/null +++ b/libraries/FTorch @@ -0,0 +1 @@ +Subproject commit 79e7675694b19b9980f3459ffd42a85d1e6f3316 From 647e319d931058292a60e3ebeac76a045053bfc9 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:41:49 -0600 Subject: [PATCH 06/11] testing.sh: conda run Makefile method. --- doc/testing.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/testing.sh b/doc/testing.sh index 63974ec869..9253df848c 100755 --- a/doc/testing.sh +++ b/doc/testing.sh @@ -38,7 +38,7 @@ rm -rf _build_container # Check that Makefile method works echo "~~~~~ Check that Makefile method works" rm -rf _build -make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html +conda run -n ctsm_pylib make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html # Check that -b works echo "~~~~~ Check that -b works (Podman)" From 43267c92fd3350d63e730c92d9d14c515023973d Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 31 May 2025 16:46:56 -0600 Subject: [PATCH 07/11] fleximod_test.yaml: Show the diffs again. --- .github/workflows/fleximod_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index bf92cb3a91..d85958f972 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -32,4 +32,4 @@ jobs: echo echo "Checking if git fleximod matches expected externals" echo - git add . && git diff --quiet && git diff --cached --quiet + git add . && git diff --exit-code && git diff --cached --exit-code From 45f47d88d06a89fa404b6c00769fcc8bca9054d2 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 2 Jun 2025 13:55:54 -0600 Subject: [PATCH 08/11] Update CMEPS from cmeps1.0.48 to cmeps1.0.51. BROKEN. --- .gitmodules | 2 +- components/cmeps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d6c16471a0..70dfd225b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.48 +fxtag = cmeps1.0.51 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/components/cmeps b/components/cmeps index b7b50a64d6..b72438eda5 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit b7b50a64d66a76490a9bb39e0050acd179391342 +Subproject commit b72438eda538ac6410aeaea27dd305f4d370d1ce From f62261b80aa0cfc9e9923987368c260da0878e1c Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 5 Jun 2025 11:55:57 -0600 Subject: [PATCH 09/11] Revert "Update CMEPS from cmeps1.0.48 to cmeps1.0.51. BROKEN." This reverts commit 45f47d88d06a89fa404b6c00769fcc8bca9054d2. --- .gitmodules | 2 +- components/cmeps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 70dfd225b3..d6c16471a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.51 +fxtag = cmeps1.0.48 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/components/cmeps b/components/cmeps index b72438eda5..b7b50a64d6 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit b72438eda538ac6410aeaea27dd305f4d370d1ce +Subproject commit b7b50a64d66a76490a9bb39e0050acd179391342 From ce59fea60a0d90082ff5c55bf877e86170beaa47 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 5 Jun 2025 11:57:06 -0600 Subject: [PATCH 10/11] Remove broken FTorch. Resolves ESCOMP/CTSM#3214. --- .gitmodules | 10 ---------- libraries/FTorch | 1 - 2 files changed, 11 deletions(-) delete mode 160000 libraries/FTorch diff --git a/.gitmodules b/.gitmodules index d6c16471a0..5ff53c215e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -128,13 +128,3 @@ fxtag = v2.2.6 fxrequired = ToplevelOptional # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/doc-builder - -# FTorch is an optional library useful for AI and Machine Learning -# In order to use it -- it must be checked out with git-fleximod -[submodule "FTorch"] -path = libraries/FTorch -url = https://github.com/ESCOMP/FTorch_interface -fxtag = v0.0.5 -fxrequired = ToplevelOptional -# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed -fxDONOTUSEurl = https://github.com/ESCOMP/FTorch_interface diff --git a/libraries/FTorch b/libraries/FTorch deleted file mode 160000 index 79e7675694..0000000000 --- a/libraries/FTorch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 79e7675694b19b9980f3459ffd42a85d1e6f3316 From d081a3a12c5f8cbaf8de71fd929d0e5cac40b964 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 5 Jun 2025 14:03:00 -0600 Subject: [PATCH 11/11] Update ChangeLog/ChangeSum. --- doc/ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 55 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index b3fbeb31bb..793b324524 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,58 @@ =============================================================== +Tag name: ctsm5.3.055 +Originator(s): samrabin (Sam Rabin, UCAR/TSS) +Date: Thu Jun 5 13:59:20 MDT 2025 +One-line Summary: Remove FTorch + +Purpose and description of changes +---------------------------------- + +Incorrect CMEPS version causes a build failure. + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm6_0 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + +List of CTSM issues fixed (include CTSM Issue # and description): +- [Issue #3210: build-and-deploy failure at ctsm5.3.053](https://github.com/ESCOMP/CTSM/issues/3210) +- [Issue #3214: Build fails with FTorch checked out](https://github.com/ESCOMP/CTSM/issues/3214) + + +Testing summary: +---------------- + +Model now builds successfully on Izumi with all optional submodules checked out. + + +Other details +------------- +[Remove any lines that don't apply. Remove entire section if nothing applies.] + +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): +- FTorch removed + +Pull Requests that document the changes (include PR ids): +- [Pull Request #3211: ctsm5.3.055: Remove broken FTorch submodule by samsrabin](https://github.com/ESCOMP/CTSM/pull/3211) + +=============================================================== +=============================================================== Tag name: ctsm5.3.054 Originator(s): samrabin (Sam Rabin, UCAR/TSS) Date: Mon Jun 2 11:39:50 MDT 2025 diff --git a/doc/ChangeSum b/doc/ChangeSum index 9570dc96e2..3b5c59acfe 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.055 samrabin 06/05/2025 Remove FTorch ctsm5.3.054 samrabin 06/02/2025 CDEPS: Allow anomaly forcings with any DATM ctsm5.3.053 samrabin 05/30/2025 Fix and improve anomaly forcings for ISSP cases ctsm5.3.052 erik 05/30/2025 Changes to MEGAN needed for coupled cases