Skip to content

Commit

Permalink
Merge pull request #32 from lanl/brryan/format
Browse files Browse the repository at this point in the history
Fix formatting bash/venv environments
  • Loading branch information
brryan authored Dec 23, 2024
2 parents b204299 + 0356448 commit 25887e2
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions env/bash
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@ elif [[ "$HOST" =~ ^ve-rfe[1-7]$ || "$HOST" =~ ^ve-fe[1-7]$ ]]; then
PARTITION="venado-gg"
fi
else # Catch-all for Darwin
if [ -z "$SLURM_JOB_PARTITION" ]; then
if [[ $HOSTNAME == darwin-fe* ]]; then
echo "Do not compile on Darwin frontend nodes; use a specific partition!"
echo "Supported partitions are"
echo " skylake-gold"
echo " volta-x86"
echo "...setup FAILED"
fi
if [[ $HOSTNAME == darwin-fe* ]]; then
echo "Currently on darwin frontend node; formatting is supported but not compilation"
echo "Supported partitions are"
echo " skylake-gold"
echo " volta-x86"
PARTITION="darwin-fe"
elif [[ $SLURM_JOB_PARTITION == "power9-rhel7" ]]; then
PARTITION="darwin-power9-rhel7"
elif [[ $SLURM_JOB_PARTITION == "skylake-gold" ]]; then
Expand Down Expand Up @@ -84,6 +82,10 @@ elif [[ $PARTITION == "chicoma-cpu" ]]; then
module load cmake
export ARTEMIS_SUITE=chicoma-cpu
echo "...setup SUCCEEDED"
elif [[ $PARTITION == "darwin-fe" ]]; then
module load clang/12.0.1
module load miniconda3/py311_23.11.0
source /usr/projects/jovian/dependencies/python/darwin-fe/bin/activate
elif [[ $PARTITION == "darwin-power9-rhel7" ]]; then
echo "darwin-power9-rhel7 partition has been decommissioned! Exiting..."
elif [[ $PARTITION == "darwin-skylake-gold" ]]; then
Expand Down Expand Up @@ -210,6 +212,11 @@ function build_artemis {
esac
done

if [[ $PARTITION == "darwin-fe" ]]; then
echo "Building not supported on darwin frontend nodes!"
return 1
fi

if [[ "$BUILD_DIR" == /* ]]; then
# Use absolute path
ABS_BUILD_DIR=${BUILD_DIR}
Expand Down

0 comments on commit 25887e2

Please sign in to comment.