Update modules for Carpenter (#527)

Co-authored-by: Hyeoksu Lee <[email protected]>
Co-authored-by: Hyeoksu Lee <[email protected]>
Co-authored-by: Hyeoksu Lee <[email protected]>
Co-authored-by: Spencer Bryngelson <[email protected]>

Author: 5 people

.github/workflows/coverage.yml

@@ -40,12 +40,11 @@ jobs:
         run: /bin/bash mfc.sh test -a -j $(nproc)
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4.0.1
+        uses: codecov/codecov-action@v4.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
           verbose: true
-          version: v0.6.0
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

toolchain/bootstrap/modules.sh

@@ -16,7 +16,7 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-# Get computer (if not supplied in command-line)
+# Get computer (if not supplied in command line)
 if [ -v $u_c ]; then
     log   "Select a system:"
     log   "$G""ORNL$W:    Ascent     (a) | Frontier (f) | Summit (s) | Wombat (w)"
@@ -66,8 +66,8 @@ fi
 
 log "Loading modules (& env variables) for $M$COMPUTER$CR on $M$CG$CR"'s:'
 
-# Reset modules to default system configuration
-if [ "$u_c" != 'p' ]; then
+# Reset modules to default system configuration (unless Phoenix or Carpenter)
+if [ "$u_c" != 'p' ] && [ "$u_c" != 'c' ]; then
     module reset > /dev/null 2>&1
     code="$?"
 
@@ -102,7 +102,8 @@ for element in ${ELEMENTS[@]}; do
     fi
 done
 
-if [ ! -z ${CRAY_LD_LIBRARY_PATH+x} ]; then
+# Don't check for Cray paths on Carpenter, otherwise do check if they exist
+if [ ! -z ${CRAY_LD_LIBRARY_PATH+x} ] && [ "$u_c" != 'c' ]; then
     ok "Found $M\$CRAY_LD_LIBRARY_PATH$CR. Prepending to $M\$LD_LIBRARY_PATH$CR."
     export LD_LIBRARY_PATH="$CRAY_LD_LIBRARY_PATH:$LD_LIBRARY_PATH"
 fi

toolchain/modules

@@ -61,12 +61,12 @@ d-gpu nvhpc/22.11 openmpi+cuda/4.1.5+cuda cmake
 d-gpu CC=nvc CXX=nvc++ FC=nvfortran
 
 c     DoD Carpenter
-c-all python
-c-cpu gcc/12.2.0 cmake/3.28.1-gcc-12.2.0 openmpi/4.1.6
-c-gpu nvhpc/23.7 cuda/12.2
+c-all python/3.12.1
+c-cpu compiler-rt/2024.2.0 ifort/2024.2.0 icc/2023.1.0 mpi/latest cmake/3.28.1-intel-2023.0.0
+c-cpu CC=gcc CXX=g++ FC=gfortran
 
 n     DoD Nautilus
 n-all slurm
 n-cpu penguin/openmpi/4.1.5/gcc-8.5.0
 n-gpu penguin/openmpi/4.1.5/nvhpc-22.3 nvidia/nvhpc/22.3 cuda/cuda-11.6
-n-gpu CC=nvc CXX=nvc++ FC=nvfortran
+n-gpu CC=nvc CXX=nvc++ FC=nvfortran

toolchain/templates/carpenter.mako

@@ -29,7 +29,6 @@ cd "${MFC_ROOTDIR}"
 cd - > /dev/null
 echo
 
-    
 % for target in targets:
     ${helpers.run_prologue(target)}
 
@@ -40,7 +39,7 @@ echo
             mpirun -np ${nodes*tasks_per_node}            \
                    "${target.get_install_binpath(case)}")
     % endif
-
+            
     ${helpers.run_epilogue(target)}
 
     echo