Skip to content
Snippets Groups Projects
Commit f36f6adf authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Merge branch 'master' into 'root-6.28.06'

# Conflicts:
#   spack.sh
parents e660d4a8 0bf94018
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ variables: ...@@ -8,7 +8,7 @@ variables:
## Application versions used for the main release ## Application versions used for the main release
## note: nightly builds will always use the master/main branch ## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v10.1.0" JUGGLER_VERSION: "v10.1.0"
EICRECON_VERSION: "v1.5.1" EICRECON_VERSION: "v1.7.0"
## Local registry ## Local registry
CI_PUSH: 1 CI_PUSH: 1
...@@ -44,6 +44,7 @@ variables: ...@@ -44,6 +44,7 @@ variables:
INTERNAL_TAG: "pipeline-${CI_PIPELINE_ID}" INTERNAL_TAG: "pipeline-${CI_PIPELINE_ID}"
stages: stages:
- status-pending
- config - config
- base ## base OS image - base ## base OS image
- jug ## jug container images - jug ## jug container images
...@@ -51,6 +52,7 @@ stages: ...@@ -51,6 +52,7 @@ stages:
- benchmarks - benchmarks
- test - test
- finalize - finalize
- status-report
## only run CI for in the following cases: ## only run CI for in the following cases:
## master, stable branch, release tag, MR event and nightly builds ## master, stable branch, release tag, MR event and nightly builds
...@@ -61,8 +63,8 @@ workflow: ...@@ -61,8 +63,8 @@ workflow:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "web"' - if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-stable/' ## main stable branch: vX.Y-stable - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-(alpha|beta|stable)/' ## main stable branch: vX.Y-stable
- if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-[a-z]+-stable/' ## special stable branch: vX.Y-acadia-stable (etc) - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-[a-z]+-(alpha|beta|stable)/' ## special stable branch: vX.Y-acadia-stable (etc)
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/' ## commit tags start with vX.Y.Z with optional suffix - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/' ## commit tags start with vX.Y.Z with optional suffix
## plan: ## plan:
...@@ -105,10 +107,10 @@ version: ...@@ -105,10 +107,10 @@ version:
elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
VERSION="${CI_COMMIT_TAG:1}" VERSION="${CI_COMMIT_TAG:1}"
EXPORT_TAG="${VERSION}" EXPORT_TAG="${VERSION}"
elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-stable ]]; then elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-\(alpha\|beta\|stable\) ]]; then
VERSION="${CI_COMMIT_BRANCH:1}" VERSION="${CI_COMMIT_BRANCH:1}"
EXPORT_TAG="${VERSION}" EXPORT_TAG="${VERSION}"
elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-[a-z]+-stable ]]; then elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-[a-z]+-\(alpha\|beta\|stable\) ]]; then
VERSION="${CI_COMMIT_BRANCH:1}" VERSION="${CI_COMMIT_BRANCH:1}"
EXPORT_TAG="${VERSION}" EXPORT_TAG="${VERSION}"
elif [[ "$CI_COMMIT_BRANCH" =~ ^master$ ]]; then elif [[ "$CI_COMMIT_BRANCH" =~ ^master$ ]]; then
...@@ -128,6 +130,32 @@ version: ...@@ -128,6 +130,32 @@ version:
reports: reports:
dotenv: build.env dotenv: build.env
.status:
image: curlimages/curl:latest
before_script: []
script:
- |
if [ -n "${GITHUB_SHA}" ] ; then
curl \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: token ${GITHUB_REPO_STATUS_TOKEN}" \
"https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" \
-d '{"state":"'"${STATE}"'",
"target_url":"'"${CI_PIPELINE_URL}"'",
"description":"'"${DESCRIPTION} $(TZ=America/New_York date)"'",
"context":"eicweb/eic_container"
}' ;
fi
status:pending:
stage: status-pending
extends: .status
variables:
STATE: "pending"
DESCRIPTION: "Started..."
when: always
## base job settings for all docker interactions ## base job settings for all docker interactions
.docker: .docker:
image: ${DOCKER_IMAGE} image: ${DOCKER_IMAGE}
...@@ -244,21 +272,25 @@ jug_dev: ...@@ -244,21 +272,25 @@ jug_dev:
BASE_IMAGE: debian_stable_base BASE_IMAGE: debian_stable_base
BUILD_IMAGE: jug_ BUILD_IMAGE: jug_
PLATFORM: linux/amd64,linux/arm64/v8 PLATFORM: linux/amd64,linux/arm64/v8
ENV: [dev, prod] ENV:
- dev
- prod
# - BUILD_TYPE: # - BUILD_TYPE:
# - default # - default
# - nightly # - nightly
# BASE_IMAGE: oneapi_base # BASE_IMAGE: oneapi_base
# BUILD_IMAGE: oneapi_ # BUILD_IMAGE: oneapi_
# PLATFORM: linux/amd64 # PLATFORM: linux/amd64
# ENV: [prod] # ENV:
# - prod
# - BUILD_TYPE: # - BUILD_TYPE:
# - default # - default
# - nightly # - nightly
# BASE_IMAGE: cuda_base_new # BASE_IMAGE: cuda_base_new
# BUILD_IMAGE: cuda_ # BUILD_IMAGE: cuda_
# PLATFORM: linux/amd64 # PLATFORM: linux/amd64
# ENV: [prod] # ENV:
# - prod
extends: .build extends: .build
stage: jug stage: jug
needs: needs:
...@@ -329,7 +361,16 @@ jug_xl:default: ...@@ -329,7 +361,16 @@ jug_xl:default:
stage: jug stage: jug
needs: needs:
- version - version
- jug_dev - job: jug_dev
parallel:
matrix:
- BUILD_TYPE:
- default
BASE_IMAGE: debian_stable_base
BUILD_IMAGE: jug_
PLATFORM: linux/amd64,linux/arm64/v8
ENV:
- dev
script: script:
- apk add git - apk add git
- docker buildx build --push ${BUILD_OPTIONS} - docker buildx build --push ${BUILD_OPTIONS}
...@@ -369,7 +410,16 @@ jug_xl:nightly: ...@@ -369,7 +410,16 @@ jug_xl:nightly:
- when: never - when: never
needs: needs:
- version - version
- jug_dev - job: jug_dev
parallel:
matrix:
- BUILD_TYPE:
- nightly
BASE_IMAGE: debian_stable_base
BUILD_IMAGE: jug_
PLATFORM: linux/amd64,linux/arm64/v8
ENV:
- dev
script: script:
- | - |
PUSH_NIGHTLY_WITH_DATE="" PUSH_NIGHTLY_WITH_DATE=""
...@@ -442,36 +492,24 @@ jug_xl:singularity:nightly: ...@@ -442,36 +492,24 @@ jug_xl:singularity:nightly:
- version - version
- jug_xl:nightly - jug_xl:nightly
benchmarks:reconstruction:default: benchmarks:detector:default:
stage: benchmarks stage: benchmarks
needs: needs:
- version - version
- jug_xl:default - jug_xl:default
variables: variables:
DETECTOR: "epic"
DETECTOR_CONFIG: epic_craterlake
DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_CONTAINER: "jug_xl"
BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
trigger: trigger:
project: EIC/benchmarks/reconstruction_benchmarks project: EIC/benchmarks/detector_benchmarks
strategy: depend strategy: depend
allow_failure: true allow_failure: true
benchmarks:physics:default: benchmarks:detector:nightly:
stage: benchmarks
needs:
- version
- jug_xl:default
variables:
RECO: "eicrecon"
BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
BENCHMARKS_CONTAINER: "jug_xl"
BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
trigger:
project: EIC/benchmarks/physics_benchmarks
strategy: depend
allow_failure: false
benchmarks:reconstruction:nightly:
stage: benchmarks stage: benchmarks
rules: rules:
- !reference ['.nightly', rules] - !reference ['.nightly', rules]
...@@ -479,36 +517,20 @@ benchmarks:reconstruction:nightly: ...@@ -479,36 +517,20 @@ benchmarks:reconstruction:nightly:
- version - version
- jug_xl:nightly - jug_xl:nightly
variables: variables:
DETECTOR: "epic"
DETECTOR_CONFIG: epic_craterlake
DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly" BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_CONTAINER: "jug_xl"
BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
trigger: trigger:
project: EIC/benchmarks/reconstruction_benchmarks project: EIC/benchmarks/detector_benchmarks
strategy: depend strategy: depend
allow_failure: true allow_failure: true
benchmarks:physics:nightly:
stage: benchmarks
rules:
- !reference ['.nightly', rules]
needs:
- version
- jug_xl:nightly
variables:
RECO: "eicrecon"
BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
BENCHMARKS_CONTAINER: "jug_xl"
BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
trigger:
project: EIC/benchmarks/physics_benchmarks
strategy: depend
allow_failure: false
clean_internal_tag: clean_internal_tag:
image: alpine/curl image: alpine/curl
stage: finalize stage: finalize
dependencies:
- version
when: always when: always
script: script:
- | - |
...@@ -521,8 +543,6 @@ clean_internal_tag: ...@@ -521,8 +543,6 @@ clean_internal_tag:
clean_unstable_mr: clean_unstable_mr:
extends: .docker extends: .docker
stage: finalize stage: finalize
dependencies:
- version
tags: tags:
- docker-new - docker-new
when: always when: always
...@@ -554,7 +574,7 @@ clean_unstable_mr: ...@@ -554,7 +574,7 @@ clean_unstable_mr:
clean_pipeline: clean_pipeline:
extends: .docker extends: .docker
stage: finalize stage: finalize
dependencies: needs:
- version - version
- clean_internal_tag - clean_internal_tag
tags: tags:
...@@ -583,3 +603,20 @@ clean_pipeline: ...@@ -583,3 +603,20 @@ clean_pipeline:
- docker system prune --filter until=24h --force - docker system prune --filter until=24h --force
- docker system df - docker system df
- docker images - docker images
status:success:
stage: status-report
extends: .status
variables:
STATE: "success"
DESCRIPTION: "Succeeded!"
when: on_success
status:failure:
stage: status-report
extends: .status
variables:
STATE: "failure"
DESCRIPTION: "Failed!"
when: on_failure
...@@ -10,6 +10,10 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ ...@@ -10,6 +10,10 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
COPY bashrc /root/.bashrc COPY bashrc /root/.bashrc
## With heredocs for multi-line scripts, we want to fail on error and the print failing line.
## Ref: https://docs.docker.com/engine/reference/builder/#example-running-a-multi-line-script
SHELL ["bash", "-ex", "-c"]
ENV CLICOLOR_FORCE=1 \ ENV CLICOLOR_FORCE=1 \
LANGUAGE=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
...@@ -18,12 +22,12 @@ ENV CLICOLOR_FORCE=1 \ ...@@ -18,12 +22,12 @@ ENV CLICOLOR_FORCE=1 \
## Install additional packages. Remove the auto-cleanup functionality ## Install additional packages. Remove the auto-cleanup functionality
## for docker, as we're using the new buildkit cache instead. ## for docker, as we're using the new buildkit cache instead.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
rm -f /etc/apt/apt.conf.d/docker-clean \ rm -f /etc/apt/apt.conf.d/docker-clean
&& ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \ ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
&& echo "US/Eastern" > /etc/timezone \ echo "US/Eastern" > /etc/timezone
&& apt-get -yqq update \ apt-get -yqq update
&& apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
bc \ bc \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
...@@ -52,52 +56,41 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ...@@ -52,52 +56,41 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
poppler-utils \ poppler-utils \
time \ time \
unzip \ unzip \
valgrind \
vim-nox \ vim-nox \
wget \ wget
&& apt-get -yqq autoremove \ apt-get -yqq autoremove
&& localedef -i en_US -f UTF-8 en_US.UTF-8 localedef -i en_US -f UTF-8 en_US.UTF-8
EOF
# Install updated compilers, with support for multiple base images # Install updated compilers, with support for multiple base images
## Ubuntu: latest gcc from toolchain ppa, latest stable clang ## Ubuntu: latest gcc from toolchain ppa, latest stable clang
## Debian: default gcc with distribution, latest stable clang ## Debian: default gcc with distribution, latest stable clang
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
. /etc/os-release \ . /etc/os-release
&& mkdir -p /etc/apt/source.list.d \ mkdir -p /etc/apt/source.list.d
&& if [ "${ID}" = "ubuntu" ] ; then \ if [ "${ID}" = "ubuntu" ] ; then
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/ \ echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
${VERSION_CODENAME} main" \ if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi
> /etc/apt/source.list.d/ubuntu-toolchain.list \ if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi
&& if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi\ curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
&& if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi\ echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME}${CLANG} main" > /etc/apt/source.list.d/llvm.list
&& curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -\ apt-get -yqq update
&& echo "deb http://apt.llvm.org/${VERSION_CODENAME} \ apt-get -yqq install gcc${GCC} g++${GCC} gfortran${GCC}
llvm-toolchain-${VERSION_CODENAME}${CLANG} main" \ apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG}
> /etc/apt/source.list.d/llvm.list \ apt-get -yqq install iwyu
&& apt-get -yqq update \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++${GCC} 100
gcc${GCC} g++${GCC} gfortran${GCC} \ update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/clang clang /usr/bin/clang${CLANG} 100
clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} \ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++${CLANG} 100
iwyu \ else
&& update-alternatives --install /usr/bin/gcc gcc \ apt-get -yqq update
/usr/bin/gcc${GCC} 100 \ apt-get -yqq install gcc g++ gfortran
&& update-alternatives --install /usr/bin/g++ g++ \ apt-get -yqq install clang clang-tidy clang-format
/usr/bin/g++${GCC} 100 \ apt-get -yqq install iwyu
&& update-alternatives --install /usr/bin/gfortran gfortran \ fi
/usr/bin/gfortran${GCC} 100 \ apt-get -yqq autoremove
&& update-alternatives --install /usr/bin/clang clang \ gcc --version
/usr/bin/clang${CLANG} 100 \ clang --version
&& update-alternatives --install /usr/bin/clang++ clang++ \ EOF
/usr/bin/clang++${CLANG} 100 \
; else \
apt-get -yqq update \
&& apt-get -yqq install \
gcc g++ gfortran \
clang clang-tidy clang-format \
iwyu \
; fi \
&& apt-get -yqq autoremove \
&& gcc --version \
&& clang --version
This diff is collapsed.
...@@ -17,8 +17,7 @@ ARG jobs=8 ...@@ -17,8 +17,7 @@ ARG jobs=8
## the date ## the date
ARG JUG_VERSION=1 ARG JUG_VERSION=1
RUN cd /tmp \ RUN echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
&& echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
## also install detector/ip geometries into opt ## also install detector/ip geometries into opt
ARG NIGHTLY='' ARG NIGHTLY=''
...@@ -31,11 +30,11 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json ...@@ -31,11 +30,11 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json
ADD https://api.github.com/repos/eic/epic /tmp/epic.json ADD https://api.github.com/repos/eic/epic /tmp/epic.json
COPY setup_detectors.py /tmp COPY setup_detectors.py /tmp
COPY --from=detectors detectors.yaml /tmp COPY --from=detectors detectors.yaml /tmp
RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} <<EOF
cd /tmp \ cd /tmp
&& export CCACHE_DIR=/ccache \ export CCACHE_DIR=/ccache
&& [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG="" \ [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG=""
&& /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml \ /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml $NIGHTLY_FLAG
$NIGHTLY_FLAG \ ccache --show-stats
&& ccache --show-stats \ rm /tmp/setup_detectors.py
&& rm /tmp/setup_detectors.py EOF
...@@ -5,18 +5,6 @@ detectors: ...@@ -5,18 +5,6 @@ detectors:
version: main version: main
main: main:
version: main version: main
23.05.0:
version: 23.05.0
patches:
- https://github.com/eic/epic/pull/449.patch
23.05.1:
version: 23.05.1
patches:
- https://github.com/eic/epic/pull/449.patch
23.05.2:
version: 23.05.2
patches:
- https://github.com/eic/epic/pull/449.patch
23.06.0: 23.06.0:
version: 23.06.0 version: 23.06.0
patches: patches:
...@@ -37,3 +25,7 @@ detectors: ...@@ -37,3 +25,7 @@ detectors:
version: 23.09.0 version: 23.09.0
23.09.1: 23.09.1:
version: 23.09.1 version: 23.09.1
23.10.0:
version: 23.10.0
23.11.0:
version: 23.11.0
## EIC spack organization and repository, e.g. eic/eic-spack ## EIC spack organization and repository, e.g. eic/eic-spack
EICSPACK_ORGREPO="eic/eic-spack" EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack github version, e.g. v0.19.7 or commit hash ## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds will use e.g. releases/v0.19 ## note: nightly builds could use a branch e.g. releases/v0.19
EICSPACK_VERSION="v0.20.20" EICSPACK_VERSION="1d2956a5f87ada2bf04ed1bdee761baf81b85feb"
## Space-separated list of eic-spack cherry-picks ## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \ read -r -d '' EICSPACK_CHERRYPICKS <<- \
......
...@@ -48,9 +48,11 @@ spack: ...@@ -48,9 +48,11 @@ spack:
- prmon - prmon
- pythia8 - pythia8
- py-awkward - py-awkward
- py-bokeh
- py-boto3 - py-boto3
- py-dask - py-dask
- py-deepdiff - py-deepdiff
- py-epic-capybara
- py-ipython - py-ipython
- py-jinja2 - py-jinja2
- py-jinja2-cli - py-jinja2-cli
...@@ -74,8 +76,10 @@ spack: ...@@ -74,8 +76,10 @@ spack:
- py-wurlitzer - py-wurlitzer
- py-yapf - py-yapf
- root - root
- snakemake
- spdlog - spdlog
- stow - stow
- tensorflow-lite - tensorflow-lite
- valgrind
- xrootd - xrootd
view: false view: false
...@@ -32,7 +32,7 @@ packages: ...@@ -32,7 +32,7 @@ packages:
- +root +zlib - +root +zlib
algorithms: algorithms:
require: require:
- '@main' - '@git.ebc8f85709bc7233574843b843ee0191a5bf3c1d'
cairo: cairo:
require: require:
- '@1.16.0' - '@1.16.0'
...@@ -80,7 +80,7 @@ packages: ...@@ -80,7 +80,7 @@ packages:
- '@656aa3192b097a631ddd1e0380e80c26fd6644a7' - '@656aa3192b097a631ddd1e0380e80c26fd6644a7'
edm4eic: edm4eic:
require: require:
- '@3.0.1' - '@4.0.0'
- cxxstd=17 - cxxstd=17
edm4hep: edm4hep:
require: require:
...@@ -88,7 +88,7 @@ packages: ...@@ -88,7 +88,7 @@ packages:
- cxxstd=17 - cxxstd=17
eic-smear: eic-smear:
require: require:
- '@1.1.10' - '@1.1.12'
eigen: eigen:
require: require:
- '@3.4.0' - '@3.4.0'
...@@ -141,7 +141,7 @@ packages: ...@@ -141,7 +141,7 @@ packages:
- '@2020.3' - '@2020.3'
irt: irt:
require: require:
- '@1.0.6' - '@1.0.7'
jana2: jana2:
require: require:
- '@2.1.1' - '@2.1.1'
...@@ -198,6 +198,9 @@ packages: ...@@ -198,6 +198,9 @@ packages:
py-awkward: py-awkward:
require: require:
- '@2.1.1' - '@2.1.1'
py-bokeh:
require:
- '@2.4.3'
py-boto3: py-boto3:
require: require:
- '@1.26.26' - '@1.26.26'
...@@ -207,6 +210,9 @@ packages: ...@@ -207,6 +210,9 @@ packages:
py-deepdiff: py-deepdiff:
require: require:
- '@6.3.0' - '@6.3.0'
py-epic-capybara:
require:
- '@main'
py-ipython: py-ipython:
require: require:
- '@8.11.0' - '@8.11.0'
...@@ -282,6 +288,10 @@ packages: ...@@ -282,6 +288,10 @@ packages:
- '@6.28.06' - '@6.28.06'
- cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl
- any_of: [+opengl +x, -opengl -x] - any_of: [+opengl +x, -opengl -x]
snakemake:
require:
- '@7.22.0'
- +http +s3
spdlog: spdlog:
require: require:
- '@1.11.0' - '@1.11.0'
...@@ -293,6 +303,9 @@ packages: ...@@ -293,6 +303,9 @@ packages:
require: require:
- '@2.8.0' - '@2.8.0'
- -xnnpack - -xnnpack
valgrind:
require:
- '@3.20.0'
xrootd: xrootd:
require: require:
- '@5.5.5' - '@5.5.5'
......
...@@ -28,6 +28,7 @@ ed76eab6943221f17776fd8d128ade6ba69e492c ...@@ -28,6 +28,7 @@ ed76eab6943221f17776fd8d128ade6ba69e492c
e3e7609af4903be7df42b6ae5ccf9a20293503d2 e3e7609af4903be7df42b6ae5ccf9a20293503d2
df4a2457a41e7ab634e86d3148d8b22a9f433a6a df4a2457a41e7ab634e86d3148d8b22a9f433a6a
a65f13f79f617b6aa0b235aa5db612473b6d8c0e a65f13f79f617b6aa0b235aa5db612473b6d8c0e
53a45c820c983867e8b05cab3df34e98b468f932
--- ---
## Ref: https://github.com/spack/spack/commit/[hash] ## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description] ## [hash]: [description]
...@@ -51,3 +52,4 @@ a65f13f79f617b6aa0b235aa5db612473b6d8c0e ...@@ -51,3 +52,4 @@ a65f13f79f617b6aa0b235aa5db612473b6d8c0e
## e3e7609af4903be7df42b6ae5ccf9a20293503d2: edm4hep: Add version 0.9 ## e3e7609af4903be7df42b6ae5ccf9a20293503d2: edm4hep: Add version 0.9
## df4a2457a41e7ab634e86d3148d8b22a9f433a6a: Fix broken semver regex ## df4a2457a41e7ab634e86d3148d8b22a9f433a6a: Fix broken semver regex
## a65f13f79f617b6aa0b235aa5db612473b6d8c0e: root: add latest available tag ## a65f13f79f617b6aa0b235aa5db612473b6d8c0e: root: add latest available tag
## 53a45c820c983867e8b05cab3df34e98b468f932: docker entrypoint.sh: fail multi-line RUN on first error with set -e
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment