Merge branch 'master' into fix/viscous-3d-gpu-private

Author: sbryngelson

.github/workflows/bench.yml

@@ -28,7 +28,7 @@ jobs:
 
   self:
     name: "${{ matrix.name }} (${{ matrix.device }}${{ matrix.interface != 'none' && format('-{0}', matrix.interface) || '' }})"
-    if: ${{ github.repository=='MFlowCode/MFC' && needs.file-changes.outputs.checkall=='true' && ((github.event_name=='pull_request_review' && github.event.review.state=='approved') || (github.event_name=='pull_request' && (github.event.pull_request.user.login=='sbryngelson' || github.event.pull_request.user.login=='wilfonba')) || github.event_name=='workflow_dispatch') }}
+    if: ${{ github.repository=='MFlowCode/MFC' && needs.file-changes.outputs.checkall=='true' && github.event.pull_request.draft != true && ((github.event_name=='pull_request_review' && github.event.review.state=='approved') || (github.event_name=='pull_request' && (github.event.pull_request.user.login=='sbryngelson' || github.event.pull_request.user.login=='wilfonba')) || github.event_name=='workflow_dispatch') }}
     needs: file-changes
     strategy:
       fail-fast: false

.github/workflows/claude-code-review.yml

@@ -15,7 +15,6 @@ jobs:
       id-token: write
 
     steps:
-      # IMPORTANT: checkout BASE repo only (safe on forks)
       - name: Checkout base repo (safe)
         uses: actions/checkout@v4
         with:
@@ -32,16 +31,14 @@ jobs:
 
           claude_args: >
             --dangerously-skip-permissions
-            --max-turns 30
+            --max-turns 60
             --allowedTools
             "Bash(gh pr view:*)"
             "Bash(gh pr diff:*)"
             "Bash(gh pr comment:*)"
-            "Bash(gh pr list:*)"
-            "Bash(gh pr status:*)"
-            "Bash(gh issue comment:*)"
             "Bash(gh api:*)"
-            "Bash(cat:*)"
+            "Bash(cat CLAUDE.md:*)"
+            "Bash(cat .claude/rules/*:*)"
             "Bash(ls:*)"
             "Bash(grep:*)"
             "Bash(find:*)"
@@ -58,26 +55,31 @@ jobs:
             "Bash(python3:*)"
 
           prompt: |
-            You are running in pull_request_target. DO NOT execute or inspect the fork's checked-out code.
+            You are running in pull_request_target. DO NOT execute or inspect PR fork code.
             Review ONLY via GitHub API/gh commands.
 
-            Always use numeric PR form with --repo:
-            - gh pr view ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --json files,title,body
-            - gh pr diff ${{ github.event.pull_request.number }} --repo ${{ github.repository }}
+            Read local guidance ONLY from:
+            - CLAUDE.md (root) if present
+            - .claude/rules/*.md if present
+            Do NOT read any other workspace files.
 
-            If CLAUDE.md exists in the base repo checkout, read it with:
-            - cat CLAUDE.md
-            Prefer jq/python3 for JSON parsing instead of shell loops.
+            Keep tool calls minimal:
+            1) ls .claude/rules || true
+            2) If CLAUDE.md exists: cat CLAUDE.md
+            3) If .claude/rules exists: cat each .md file directly (no loops; at most 10 files)
+            4) gh pr view ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --json title,body,files,changedFiles,additions,deletions,headRefOid
+            5) gh pr diff ${{ github.event.pull_request.number }} --repo ${{ github.repository }}
+            6) Post ONE top-level comment.
 
-            Output requirements (even if no issues):
-            - Files changed count + list up to 15 file paths
+            Output format:
+            - Head SHA
+            - Files changed count + list up to 10 file paths
             - Summary (3–6 bullets)
-            - Findings:
-              - If issues: include file + line numbers when possible
-              - If no issues: at least 3 concrete improvement opportunities with file paths
+            - Findings with file + line numbers when possible
+            - If no issues: 0–3 improvement opportunities (only if confident)
 
             Post ONE top-level PR comment titled "Claude Code Review".
-            If posting a PR comment is blocked, write the full review to the GitHub Actions job summary instead.
+            Then stop.
 
           additional_permissions: |
             actions: read

.github/workflows/test.yml

@@ -151,7 +151,7 @@ jobs:
 
   self:
     name: "${{ matrix.cluster_name }} (${{ matrix.device }}${{ matrix.interface != 'none' && format('-{0}', matrix.interface) || '' }})"
-    if: github.repository == 'MFlowCode/MFC' && needs.file-changes.outputs.checkall == 'true'
+    if: github.repository == 'MFlowCode/MFC' && needs.file-changes.outputs.checkall == 'true' && github.event.pull_request.draft != true
     needs: [lint-gate, file-changes]
     continue-on-error: false
     timeout-minutes: 480

CMakeLists.txt

@@ -238,6 +238,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "Release")
     if (CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
         if (MFC_Unified)
             message(STATUS "LTO/IPO is not available with NVHPC using Unified Memory")
+        elseif (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER "24.11" AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "25.9")
+            message(STATUS "LTO/IPO is not supported in NVHPC Version 24.11 to 25.9. Use >=25.9 or (<=24.11 && > 23.11) Performance will be degraded.")
+            set(NVHPC_USE_TWO_PASS_IPO FALSE)
         elseif(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "23.11")
             message(STATUS "LTO/IPO is not supported in NVHPC Version < 23.11. Use a newer version of NVHPC for best performance.")
         else()

toolchain/modules

@@ -57,9 +57,9 @@ tuo-gpu craype-accel-amd-gfx942
 tuo-gpu HSA_XNACK=0
 
 d     NCSA Delta
-d-all python/3.11.6
+d-all python
 d-cpu gcc/11.4.0 openmpi
-d-gpu nvhpc/24.1 cuda/12.3.0 openmpi/4.1.5+cuda cmake
+d-gpu PrgEnv-nvidia/8.6.0
 d-gpu CC=nvc CXX=nvc++ FC=nvfortran
 d-gpu MFC_CUDA_CC=80,86
 

toolchain/templates/delta.mako

@@ -36,8 +36,9 @@ cd "${MFC_ROOT_DIR}"
 cd - > /dev/null
 echo
 
-# Fixes Delta not being able to find core library file
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rhel8-zen3/nvhpc-24.1/openmpi-4.1.5-zkiklxi/lib/
+% if gpu_enabled:
+    export MPICH_GPU_SUPPORT_ENABLED=0 # Disable GPU-Direct MPI
+% endif
 
 % for target in targets:
     ${helpers.run_prologue(target)}