Skip to content

Commit 40e2de5

Browse files
author
Spencer Bryngelson
committed
ci: clean stale Frontier build slugs before compile, fix famd LD_LIBRARY_PATH ordering
On Frontier, the compute-node build step previously inherited whatever CMake state the login-node --deps-only step left behind. Wipe compiled Fortran staging/install slugs before each build while preserving dep dirs (silo, hdf5, lapack, fftw) that require internet to fetch. Also remove trailing whitespace in famd LD_LIBRARY_PATH export.
1 parent 2443f8b commit 40e2de5

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

.github/workflows/common/build.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,23 @@ fi
2525
# source code is built here on the compute node.
2626
# Phoenix: always start fresh to avoid SIGILL from stale binaries compiled
2727
# on a different microarchitecture.
28+
# Frontier: wipe only compiled Fortran staging/install slugs; preserve dep
29+
# dirs (silo, hdf5, lapack, fftw) which were built on the login node and
30+
# cannot be re-fetched from a compute node (no internet).
2831
if [ "$job_cluster" = "phoenix" ]; then
2932
source .github/scripts/clean-build.sh
3033
clean_build
34+
elif [ "$job_cluster" = "frontier" ] || [ "$job_cluster" = "frontier_amd" ]; then
35+
for _dir in build/staging/ build/install/; do
36+
if [ -d "$_dir" ]; then
37+
for _sub in "$_dir"*/; do
38+
_name=$(basename "$_sub")
39+
case "$_name" in silo|hdf5|lapack|fftw) continue ;; esac
40+
rm -rf "$_sub"
41+
done
42+
fi
43+
done
44+
unset _dir _sub _name
3145
fi
3246

3347
source .github/scripts/retry-build.sh

toolchain/bootstrap/modules.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if [ "$u_c" '==' 'famd' ]; then
145145
export CRAY_MPICH_LIB="-L${CRAY_MPICH_PREFIX}/lib \
146146
${CRAY_PMI_POST_LINK_OPTS} \
147147
-lmpifort_amd -lmpi_amd -lmpi -lpmi -lpmi2"
148-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CRAY_LD_LIBRARY_PATH}"
148+
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CRAY_LD_LIBRARY_PATH}"
149149
export CMAKE_PREFIX_PATH="${OLCF_AFAR_ROOT}:${CMAKE_PREFIX_PATH}"
150150
export FC="${OLCF_AFAR_ROOT}/bin/amdflang"
151151

0 commit comments

Comments
 (0)