From 52f91e572fc39d77cdd029c9865f6f3ec790e9ea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:45:54 +0000
Subject: [PATCH 1/4] Initial plan


From bc2186374f58221f577aac3fb938ce65c0467667 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:49:51 +0000
Subject: [PATCH 2/4] ci: disable rustfmt import reordering

Co-authored-by: sbryngelson <39740593+sbryngelson@users.noreply.github.com>
---
 rustfmt.toml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 rustfmt.toml

diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..fa09141
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+reorder_imports = false

From 610c9867829d453157889622f3b8b98f10467c88 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 1 Sep 2026 17:04:25 +0000
Subject: [PATCH 3/4] ci: pin mfc-nvhpc MFC clone to eb793928 to fix gpu-omp
 NVHPC crash

MFC d101a279 (2026-07-29) removed #ifndef MFC_POST_PROCESS guards in
m_model.fpp. This triggers an NVHPC 24.5 internal LLVM crash in
m_model_s_read_stl_binary_ during X86 DAG instruction selection when
compiled with --gpu mp. Pin to eb793928 (2026-07-14), the last commit
known to compile cleanly, using a shallow fetch to keep CI fast.

Co-authored-by: sbryngelson <39740593+sbryngelson@users.noreply.github.com>
---
 .github/workflows/ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ecaad6..7e87432 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -157,7 +157,15 @@ jobs:
           cargo build --release
 
       - name: Clone MFC
-        run: git clone --depth 1 https://github.com/MFlowCode/MFC.git /tmp/MFC
+        # Pin to the last commit known to compile cleanly with NVHPC 24.5 --gpu mp.
+        # MFC d101a279 (2026-07-29) removed #ifndef MFC_POST_PROCESS guards in
+        # m_model.fpp, which triggers an NVHPC 24.5 internal LLVM crash in
+        # m_model_s_read_stl_binary_ during X86 DAG instruction selection.
+        run: |
+          git clone --no-checkout https://github.com/MFlowCode/MFC.git /tmp/MFC
+          cd /tmp/MFC
+          git fetch --depth 1 origin eb7939281874118ff6c84223591f45751cec7e3c
+          git checkout FETCH_HEAD
 
       - name: Format MFC source with ffmt
         run: |

From 0f623c8bf8637d21d4e596b5cc34d4bb2388f807 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 1 Sep 2026 17:05:16 +0000
Subject: [PATCH 4/4] ci: revert MFC commit pin in mfc-nvhpc job

Co-authored-by: sbryngelson <39740593+sbryngelson@users.noreply.github.com>
---
 .github/workflows/ci.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e87432..6ecaad6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -157,15 +157,7 @@ jobs:
           cargo build --release
 
       - name: Clone MFC
-        # Pin to the last commit known to compile cleanly with NVHPC 24.5 --gpu mp.
-        # MFC d101a279 (2026-07-29) removed #ifndef MFC_POST_PROCESS guards in
-        # m_model.fpp, which triggers an NVHPC 24.5 internal LLVM crash in
-        # m_model_s_read_stl_binary_ during X86 DAG instruction selection.
-        run: |
-          git clone --no-checkout https://github.com/MFlowCode/MFC.git /tmp/MFC
-          cd /tmp/MFC
-          git fetch --depth 1 origin eb7939281874118ff6c84223591f45751cec7e3c
-          git checkout FETCH_HEAD
+        run: git clone --depth 1 https://github.com/MFlowCode/MFC.git /tmp/MFC
 
       - name: Format MFC source with ffmt
         run: |