Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
Browse files Browse the repository at this point in the history
…eature/update_mapl_from_spack_dev_20240613
  • Loading branch information
climbfuji committed Jun 17, 2024
2 parents 88305af + 0b6bb6b commit 196f0c0
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 41 deletions.
97 changes: 64 additions & 33 deletions .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,28 @@ jobs:
rm -fr *
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: prepare-directories
run: |
mkdir -p /Users/ec2-user/spack-stack/build-cache
mkdir -p /Users/ec2-user/spack-stack/source-cache
- name: create-env
run: |
# Get day of week to decide whether to use build caches or not
DOW=$(date +%u)
# Monday is 1 ... Sunday is 7
if [[ $DOW == 7 ]]; then
export USE_BINARY_CACHE=false
echo "Ignore existing binary cache for creating buildcache environment"
else
export USE_BINARY_CACHE=true
echo "Use existing binary cache for creating buildcache environment"
fi
# Set up homebrew and lmod support
eval "$(/opt/homebrew/bin/brew shellenv)"
source /opt/homebrew/opt/lmod/init/profile
Expand All @@ -42,23 +58,21 @@ jobs:
source ./setup.sh
# Important!
export SPACK_PYTHON=/usr/bin/python3
# DH* 20230302 - to avoid using padded_length for build caches,
# always build in the same environment so that the length of the
# path doesn't change - see also other 'DH* 20230302' changes below
#export ENVNAME=${{ inputs.template || 'unified-dev' }}.macos-ci-aarch64
export ENVNAME=ci-env.macos-ci-aarch64
# *DH
export ENVNAME=ue-apple-clang-14.0.3
export ENVDIR=$PWD/envs/${ENVNAME}
spack stack create env --site macos.default --template ${{ inputs.template || 'unified-dev' }} --name ${ENVNAME}
spack clean -ab
spack bootstrap now
spack stack create env --site macos.default --template unified-dev --name ${ENVNAME}
spack env activate ${ENVDIR}
spack add ${{ inputs.specs || '' }}
export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
# Find external packages
spack external find --scope system \
--exclude bison --exclude openssl \
--exclude python
--exclude curl --exclude python
spack external find --scope system perl
spack external find --scope system libiconv
spack external find --scope system wget
Expand All @@ -74,11 +88,6 @@ jobs:
export -n SPACK_SYSTEM_CONFIG_PATH
# DH* 20230302 - Don't use yet, too many problems
## For buildcaches
#spack config add config:install_tree:padded_length:true
# *DH
# Set compiler and MPI
spack config add "packages:all:providers:mpi:[[email protected]]"
spack config add "packages:all:compiler:[[email protected]]"
Expand All @@ -98,11 +107,15 @@ jobs:
spack mirror add local-source file:///Users/ec2-user/spack-stack/source-cache/
spack mirror create -a -d /Users/ec2-user/spack-stack/source-cache/
# Add binary cache and reindex it
spack mirror add local-binary file:///Users/ec2-user/spack-stack/build-cache/
spack buildcache update-index local-binary
echo "Packages in combined spack build caches:"
spack buildcache list
# Add binary cache if requested
if [ "$USE_BINARY_CACHE" = true ] ; then
set +e
spack mirror add local-binary file:///Users/ec2-user/spack-stack/build-cache/
spack buildcache update-index local-binary || (echo "No valid binary cache found, proceed without" && spack mirror rm local-binary)
set +e
echo "Packages in spack binary cache:"
spack buildcache list
fi
# Break installation up in pieces and create build caches in between
# This allows us to "spin up" builds that altogether take longer than
Expand All @@ -113,16 +126,39 @@ jobs:
spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.apple-clang-14.0.3.base-env
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ base-env
# jedi-base-env
echo "jedi-base-env ..."
spack install --fail-fast --source --no-check-signature jedi-base-env 2>&1 | tee log.install.apple-clang-14.0.3.jedi-base-env
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ jedi-base-env
# the rest
echo "${{ inputs.template || 'unified-dev' }} ..."
spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.apple-clang-14.0.3.${{ inputs.template || 'unified-dev' }}
echo "unified-env ..."
spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.apple-clang-14.0.3.unified-env
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/
# Next steps: synchronize source and build cache to a central/combined mirror?
echo "Next steps ..."
# Remove binary cache for next round of concretization
if [ "$USE_BINARY_CACHE" = true ] ; then
spack mirror rm local-binary
fi
# Create modules
spack clean -a
spack module lmod refresh -y
spack stack setup-meta-modules
# Next steps: synchronize source and build cache to a central/combined mirror?
spack env deactivate
# Test environment chaining
echo "Test environment chaining"
spack stack create env --name chaintest --template empty --site macos.default --upstream $(realpath envs/${ENVNAME}/install)
# Retain config from upstream so we don't have to rebuild:
cp -r $PWD/envs/${ENVNAME}/{site,common} $PWD/envs/chaintest/.
spack env activate ${PWD}/envs/chaintest
spack add [email protected]%apple-clang
spack concretize | tee envs/chaintest/log.concretize
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv '[email protected]' || true ) | wc -l)
if [ ${unwanted_duplicates} -gt 0 ]; then echo "Environment chaining test failed"; exit 1; fi
spack env deactivate
- name: test-env
Expand All @@ -131,12 +167,7 @@ jobs:
eval "$(/opt/homebrew/bin/brew shellenv)"
source /opt/homebrew/opt/lmod/init/profile
# DH* 20230302 - to avoid using padded_length for build caches,
# always build in the same environment so that the length of the
# path doesn't change - see also other 'DH* 20230302' changes below
#export ENVNAME=${{ inputs.template || 'unified-dev' }}.macos-ci-aarch64
export ENVNAME=ci-env.macos-ci-aarch64
# *DH
export ENVNAME=ue-apple-clang-14.0.3
export ENVDIR=$PWD/envs/${ENVNAME}
ls -l ${ENVDIR}/install/modulefiles/Core
Expand All @@ -146,7 +177,7 @@ jobs:
module load stack-python/3.10.13
module available
module load jedi-ufs-env/1.0.0
module load ewok-env/1.0.0
module load soca-env/1.0.0
module load jedi-ufs-env
module load ewok-env
module load soca-env
module list
15 changes: 11 additions & 4 deletions .github/workflows/ubuntu-ci-x86_64-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ jobs:
rm -fr *
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

- name: prepare-directories
run: |
mkdir -p /home/ubuntu/spack-stack/build-cache/
mkdir -p /home/ubuntu/spack-stack/source-cache/
- name: create-buildcache
run: |
# Get day of week to decide whether to use build caches or not
Expand All @@ -45,7 +50,7 @@ jobs:
echo "Use existing binary cache for creating buildcache environment"
fi
# spack-stack setup
# Set up spack-stack
source ./setup.sh
export ENVNAME=ue-gcc-11.4.0-buildcache
export ENVDIR=$PWD/envs/${ENVNAME}
Expand All @@ -63,7 +68,7 @@ jobs:
spack external find --scope system texlive
spack external find --scope system mysql
# For GNU
# Find compilers
spack compiler find --scope system
export -n SPACK_SYSTEM_CONFIG_PATH
Expand All @@ -89,8 +94,10 @@ jobs:
# Add binary cache if requested
if [ "$USE_BINARY_CACHE" = true ] ; then
set +e
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
spack buildcache update-index local-binary
spack buildcache update-index local-binary || (echo "No valid binary cache found, proceed without" && spack mirror rm local-binary)
set +e
echo "Packages in spack binary cache:"
spack buildcache list
fi
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ jobs:
rm -fr *
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

- name: prepare-directories
run: |
mkdir -p /home/ubuntu/spack-stack/build-cache/
mkdir -p /home/ubuntu/spack-stack/source-cache/
- name: create-buildcache
run: |
# Get day of week to decide whether to use build caches or not
Expand All @@ -45,7 +50,7 @@ jobs:
echo "Use existing binary cache for creating buildcache environment"
fi
# spack-stack setup
# Set up spack-stack
source ./setup.sh
export ENVNAME=ue-intel-2021.10.0-buildcache
export ENVDIR=$PWD/envs/${ENVNAME}
Expand All @@ -63,7 +68,7 @@ jobs:
spack external find --scope system texlive
spack external find --scope system mysql
# For GNU - need to for bootstrapping
# Find compilers
spack compiler find --scope system
# For Intel
Expand Down Expand Up @@ -131,8 +136,10 @@ jobs:
# Add binary cache if requested
if [ "$USE_BINARY_CACHE" = true ] ; then
set +e
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
spack buildcache update-index local-binary
spack buildcache update-index local-binary || (echo "No valid binary cache found, proceed without" && spack mirror rm local-binary)
set +e
echo "Packages in spack binary cache:"
spack buildcache list
fi
Expand Down

0 comments on commit 196f0c0

Please sign in to comment.