Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
PLATFORM: linux/arm64
runner: ubuntu-24.04-arm
arch: arm64
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -297,6 +298,7 @@ jobs:
- arch: arm64
runner: ubuntu-24.04-arm
PLATFORM: linux/arm64
fail-fast: false
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@v1.3.1
Expand Down
1 change: 1 addition & 0 deletions containers/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ target=${target[${TARGETPLATFORM}]}
spack config --scope site add "packages:all:require:[target=${target}]"
spack config --scope site add "packages:all:target:[${target}]"
spack config blame packages
mkdir -p $HOME/.spack/ # https://github.com/spack/spack/issues/51564
spack config --scope user add "config:suppress_gpg_warnings:true"
spack config --scope user add "config:build_jobs:${jobs}"
spack config --scope user add "config:db_lock_timeout:${jobs}00"
Expand Down
5 changes: 3 additions & 2 deletions containers/eic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ARG ENV=xl
ENV SPACK_ENV=/opt/spack-environment/${ENV}
ARG SPACK_FLAGS="--backtrace"
ARG SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
ARG SPACK_DUPLICATE_ALLOWLIST="epic|llvm|py-setuptools|py-urllib3|py-dask|py-dask-awkward|py-dask-histogram|py-distributed|py-requests"
ENV SPACK_COLOR="always"
ENV GIT_TERMINAL_PROMPT=0

Expand All @@ -57,7 +58,7 @@ spack external find --not-buildable --scope env:${SPACK_ENV} --path /usr/local/c
spack external find --scope env:${SPACK_ENV} llvm
spack concretize --force
spack --color=never find --long --no-groups --show-concretized --format "{name}" \
| uniq -D -f2 | grep -v -w -e "\(epic\|llvm\|py-setuptools\|py-urllib3\)" \
| uniq -D -f2 | grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" \
| tee /tmp/duplicates.txt
if [ -s /tmp/duplicates.txt ] ; then
echo "Duplicate packages found"
Expand Down Expand Up @@ -193,7 +194,7 @@ if [ -n "${JUGGLER_SHA}" ] ; then
fi
spack concretize --force
spack --color=never find --long --no-groups --show-concretized --format "{name}" \
| uniq -D -f2 | grep -v -w -e "\(epic\|llvm\|py-setuptools\|py-urllib3\)" \
| uniq -D -f2 | grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" \
| tee /tmp/duplicates.txt
if [ -s /tmp/duplicates.txt ] ; then
echo "Duplicate packages found"
Expand Down
7 changes: 5 additions & 2 deletions spack-environment/ci/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ spack:
include:
- ../concretizer.yaml
- ../packages.yaml
- ../packages_root_without_opengl.yaml
- ../view.yaml
concretizer:
unify: when_possible # FIXME Using mixture of gcc and clang
specs:
- acts
- actsvg
- afterburner
- cmake
- covfie
- dd4hep -ddeve
- dd4hep
- edm4hep
- eigen
- fastjet
Expand Down Expand Up @@ -66,7 +69,7 @@ spack:
- py-toml
- py-uproot
- py-vector
- root -opengl -webgui
- root
- snakemake
- spdlog
- xrootd
6 changes: 5 additions & 1 deletion spack-environment/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ packages:
pyrobird:
require:
- '@0.1.23:'
- +batch +xrootd
- +xrootd
- ~batch # until 0.2.6, +batch requires py-pyppeteer which requires py-urllib3@1
pythia8:
require:
- '@8.315'
Expand All @@ -356,6 +357,9 @@ packages:
py-epic-capybara:
require:
- '@git.ef2a8790312b9b697655b28a07b353e601bfa3b8'
py-flatbuffers:
require:
- '@25.9.23:'
py-hepunits:
require:
- '@2.3.2:'
Expand Down
4 changes: 4 additions & 0 deletions spack-environment/packages_root_with_opengl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
packages:
root:
require:
- +opengl +webgui
4 changes: 4 additions & 0 deletions spack-environment/packages_root_without_opengl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
packages:
root:
require:
- ~opengl ~webgui
7 changes: 4 additions & 3 deletions spack-environment/xl/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ spack:
include:
- ../concretizer.yaml
- ../packages.yaml
- ../packages_root_with_opengl.yaml
- ../view.yaml
concretizer:
unify: when_possible # multiple epic versions
unify: when_possible # FIXME Using mixture of gcc and clang
specs:
- acts
- actsvg
Expand All @@ -23,7 +24,7 @@ spack:
- cppcoro
- dawn
- dawncut
- dd4hep +ddeve
- dd4hep
- east
- edm4hep
- eic-smear
Expand Down Expand Up @@ -116,7 +117,7 @@ spack:
- py-wurlitzer
- py-yapf
- rivet
- root +opengl +webgui +x
- root
- sherpa
- simsipm
- slurm sysconfdir=/etc/slurm
Expand Down
2 changes: 2 additions & 0 deletions spack-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa
c4d983b764d7b1ee2b63da79f5f25365ac61ce7a
44da889cc86bb8a5315c729a7c79f2c002c9c951
5c37f836753e8f9683fdc547f3661c5045abcbd1
4f8d5f08c5b74e3be124f6180515cd78080d3b9f
---
## Optional hash table with comma-separated file list
read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
Expand Down Expand Up @@ -89,3 +90,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
## c4d983b764d7b1ee2b63da79f5f25365ac61ce7a: Julia: add v1.11.6
## 44da889cc86bb8a5315c729a7c79f2c002c9c951: Julia: add v1.11.7
## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas
## 4f8d5f08c5b74e3be124f6180515cd78080d3b9f: py-flatbuffers: add v25.9.23
2 changes: 1 addition & 1 deletion spack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SPACK_ORGREPO="spack/spack"

## Spack github version, e.g. v0.18.1 or commit hash
## note: nightly builds will use e.g. releases/v1.0
SPACK_VERSION="v1.0.2"
SPACK_VERSION="v1.1.0"

## Space-separated list of spack cherry-picks
read -r -d '' SPACK_CHERRYPICKS <<- \
Expand Down
Loading