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

chore: spack v0.19

parent 65514be9
No related branches found
No related tags found
1 merge request!392chore: spack v0.19
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 11
− 8
View file @ 567c68ed
...@@ -4,20 +4,17 @@ variables: ...@@ -4,20 +4,17 @@ 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: "v9.0.0" JUGGLER_VERSION: "v9.0.0"
NPDET_VERSION: "v1.3.2" NPDET_VERSION: "v1.4.1"
## Spack github version, e.g. v0.18.1 or commit hash ## Spack github version, e.g. v0.18.1 or commit hash
SPACK_VERSION: "v0.18.1" SPACK_VERSION: "v0.19.0"
## Space-separated list of spack cherry-picks ## Space-separated list of spack cherry-picks
SPACK_CHERRYPICKS: "adc9f887eac78a81bb8189d603f4dc45ed3509c1 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0 afc044cbad5eb8c5ffd6efe364fb740a08623842 8bdc5065792c185be9934ab0c2a5b087b8845bd1" SPACK_CHERRYPICKS: ""
## Ref: https://github.com/spack/spack/commit/[hash] ## Ref: https://github.com/spack/spack/commit/[hash]
## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version ## [hash]: [description]
## 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0: lcio, podio, edm4hep: add latest versions
## afc044cbad5eb8c5ffd6efe364fb740a08623842: dd4hep: add v1.21
## 8bdc5065792c185be9934ab0c2a5b087b8845bd1: emacs: Add option to install version 28.1
## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash ## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
EICSPACK_VERSION: "v0.18" EICSPACK_VERSION: "v0.19"
## Space-separated list of eic-spack cherry-picks ## Space-separated list of eic-spack cherry-picks
EICSPACK_CHERRYPICKS: "" EICSPACK_CHERRYPICKS: ""
...@@ -281,6 +278,9 @@ oneapi_jug_xl:default: ...@@ -281,6 +278,9 @@ oneapi_jug_xl:default:
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/oneapi containers/oneapi
- !reference [.build, script] - !reference [.build, script]
rules:
- when: manual
allow_failure: true
oneapi_jug_xl:nightly: oneapi_jug_xl:nightly:
extends: .build extends: .build
...@@ -319,6 +319,9 @@ oneapi_jug_xl:nightly: ...@@ -319,6 +319,9 @@ oneapi_jug_xl:nightly:
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub ; ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub ;
fi fi
rules:
- when: manual
allow_failure: true
cuda_base:default: cuda_base:default:
extends: .build extends: .build
......
containers/debian/base.Dockerfile
+ 2
− 1
View file @ 567c68ed
#syntax=docker/dockerfile:1.2 #syntax=docker/dockerfile:1.2
ARG BASEIMAGE="amd64/debian:testing-20220822-slim"
# Minimal container based on Debian Testing for up-to-date packages. # Minimal container based on Debian Testing for up-to-date packages.
# Very lightweight container with a minimal build environment # Very lightweight container with a minimal build environment
FROM amd64/debian:testing-20220822-slim FROM ${BASEIMAGE}
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="debian_base" \ name="debian_base" \
march="amd64" march="amd64"
......
containers/jug/dev.Dockerfile
+ 0
− 9
View file @ 567c68ed
...@@ -205,15 +205,6 @@ RUN du -sh /opt/software/linux-*/gcc-*/* | sort -h \ ...@@ -205,15 +205,6 @@ RUN du -sh /opt/software/linux-*/gcc-*/* | sort -h \
## and links therin for more info ## and links therin for more info
RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
## Address Issue #72
## missing precompiled headers for cppyy due to missing symlink in root
## install (should really be addressed by ROOT spack package)
RUN cd /opt/spack-environment && spack env activate . \
&& if [ ! -e $(spack location -i root)/lib/cppyy_backend/etc ]; then \
ln -sf $(spack location -i root)/etc \
$(spack location -i root)/lib/cppyy_backend/etc; \
fi
RUN spack debug report \ RUN spack debug report \
| sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \ | sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \
>> /etc/jug_info \ >> /etc/jug_info \
......
containers/oneapi/base.Dockerfile
+ 2
− 4
View file @ 567c68ed
#syntax=docker/dockerfile:1.2 #syntax=docker/dockerfile:1.2
ARG BASEIMAGE="intel/oneapi-hpckit:2022.2-devel-ubuntu20.04"
# Minimal container based on Intel oneAPI for up-to-date packages. # Minimal container based on Intel oneAPI for up-to-date packages.
# Very lightweight container with a minimal build environment (LOL) # Very lightweight container with a minimal build environment (LOL)
FROM intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04 FROM ${BASEIMAGE}
LABEL maintainer="Wouter Deconinck <wouter.deconinck@umanitoba.ca" \ LABEL maintainer="Wouter Deconinck <wouter.deconinck@umanitoba.ca" \
name="oneapi_base" \ name="oneapi_base" \
march="amd64" march="amd64"
...@@ -18,8 +19,6 @@ ENV CLICOLOR_FORCE=1 \ ...@@ -18,8 +19,6 @@ 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.
## We also install gitlab-runner, from the buster package (as bullseye is not available atm) ## We also install gitlab-runner, from the buster package (as bullseye is not available atm)
## TODO: libyaml-cpp-dev is a dependency for afterburner. We can probably remove
## this once afterburner is added to spack
RUN --mount=type=cache,target=/var/cache/apt \ RUN --mount=type=cache,target=/var/cache/apt \
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 \
...@@ -45,7 +44,6 @@ RUN --mount=type=cache,target=/var/cache/apt \ ...@@ -45,7 +44,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
less \ less \
libcbor-xs-perl \ libcbor-xs-perl \
libjson-xs-perl \ libjson-xs-perl \
libyaml-cpp-dev \
locales \ locales \
lua-posix \ lua-posix \
make \ make \
......
containers/oneapi/onedev.Dockerfile
+ 2
− 10
View file @ 567c68ed
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
## ======================================================================================== ## ========================================================================================
ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/" ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG BASEIMAGE="debian_base"
# Internal Tag will be set by GitLab CI # Internal Tag will be set by GitLab CI
ARG INTERNAL_TAG="testing" ARG INTERNAL_TAG="testing"
FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder FROM ${DOCKER_REGISTRY}${BASEIMAGE}:${INTERNAL_TAG} as builder
## Install some extra spack dependencies ## Install some extra spack dependencies
## Do not use Cache mount as it conflicts with oneapi stage ## Do not use Cache mount as it conflicts with oneapi stage
...@@ -206,15 +207,6 @@ RUN find -L /usr/local/* \ ...@@ -206,15 +207,6 @@ RUN find -L /usr/local/* \
## and links therin for more info ## and links therin for more info
RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
## Address Issue #72
## missing precompiled headers for cppyy due to missing symlink in root
## install (should really be addressed by ROOT spack package)
RUN cd /opt/spack-environment && spack env activate . \
&& if [ ! -e $(spack location -i root)/lib/cppyy_backend/etc ]; then \
ln -sf $(spack location -i root)/etc \
$(spack location -i root)/lib/cppyy_backend/etc; \
fi
RUN spack debug report \ RUN spack debug report \
| sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \ | sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \
>> /etc/jug_info \ >> /etc/jug_info \
......
spack.yaml
+ 17
− 16
View file @ 567c68ed
spack: spack:
specs: specs:
- acts@19.9.0 +dd4hep +identification +json +tgeo +ipo +examples +fatras +geant4 +python - acts@19.10.0 +dd4hep +identification +json +tgeo +ipo +examples +fatras +geant4 +python
- afterburner@0.1.2 +root +zlib - afterburner@0.1.2 +root +zlib
- cairo@1.16.0 +fc+ft+X+pdf+gobject - cairo@1.16.0 +fc+ft+X+pdf+gobject
- clhep@2.4.5.1 cxxstd=17 - clhep@2.4.6.0 cxxstd=17
- cli11@2.1.1 - cli11@2.1.1
- cmake@3.23.1 - cmake@3.24.3
- cnpy@master - cnpy@master
- dawn@3_91a - dawn@3_91a
- dawncut@1_54a - dawncut@1_54a
- dd4hep@1.23 +ddg4 +ddcad +hepmc3 +ipo +lcio - dd4hep@1.23 +ddg4 +ddcad +hepmc3 +ipo +lcio
- edm4eic@1.2.1 cxxstd=17 -ipo - edm4eic@1.2.1 cxxstd=17 -ipo
- edm4hep@0.6 cxxstd=17 -ipo - edm4hep@0.7 cxxstd=17 -ipo
- eicrecon@0.3.5 - eicrecon@0.3.5
- eigen@3.4.0 - eigen@3.4.0
- emacs@28.1 - emacs
- fastjet@3.3.4 - fastjet@3.4.0
- fmt@8.1.1 +shared cxxstd=17 - fmt@8.1.1 +shared cxxstd=17
- gaudi@36.7 +optional - gaudi@36.7 +aida
- geant4@11.0.3 cxxstd=17 +opengl +vecgeom +x11 +qt +threads - geant4@11.0.3 cxxstd=17 +opengl +vecgeom +x11 +qt +threads
- hepmc3@3.2.5 +python +rootio - hepmc3@3.2.5 +python +rootio
- heppdt@2.06.01 - heppdt@2.06.01
- igprof@5.9.16 - igprof@5.9.16
#- imagemagick@7.0.8-7 - imagemagick@7.0.8-7
- intel-tbb@2020.3
- irt@1.0.0 - irt@1.0.0
- jana2@2.0.7 +root +zmq - jana2@2.0.7 +root +zmq
- madx@5.08.01 - madx@5.08.01
- mesa@22.0.2 +glx -llvm +opengl +opengles +osmesa - mesa@22.1.2 +glx -llvm +opengl +opengles +osmesa
- nlohmann-json@3.10.5 - nlohmann-json@3.11.2
- opencascade@7.6.0 - opencascade@7.6.3
- pkg-config@0.29.2 - pkg-config@0.29.2
- podio@0.15 - podio@0.15
- pythia8@8.306 +fastjet - pythia8@8.306 +fastjet
- python@3.10.4 - python@3.10.8
- py-numpy@1.22.3 - py-numpy@1.23.4
- py-pip@21.3.1 - py-pip@22.2.2
- qt@5.15.4 +opengl - qt@5.15.5 +opengl
- root@6.26.06 cxxstd=17 - root@6.26.06 cxxstd=17
+fftw +fortran +gdml +http +mlp +pythia8 +fftw +fortran +gdml +http +mlp +pythia8
+root7 +tmva +vc +xrootd +ssl +root7 +tmva +vc +xrootd +ssl
- spdlog@1.9.2 - spdlog@1.10.0
- stow@2.3.1 - stow@2.3.1
- tensorflow-lite@2.8.0 -xnnpack - tensorflow-lite@2.8.0 -xnnpack
- xrootd@5.3.2 cxxstd=17 +python - xrootd@5.3.2 cxxstd=17 +python
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment