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

chore: spack-v0.22.1

parent 72b7d5c9
No related branches found
No related tags found
1 merge request!956chore: spack-v0.22.1
Pipeline #99814 passed
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: deploy
Stage: benchmarks
Stage: finalize
Stage: status-report
Pipeline: reconstruction_benchmarks

#99826

    Pipeline: reconstruction_benchmarks

    #99825

      Pipeline: eic/EICrecon: Add Track-Based Cluster Merging Algorithm

      #99824

        +3
        Hide whitespace changes
        Inline Side-by-side
        containers/jug/dev.Dockerfile
        + 6
        − 6
        View file @ 1cf6bfa1
        ...@@ -157,11 +157,11 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ ...@@ -157,11 +157,11 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
        SPACK_ENV=${SPACK_ENV} \ SPACK_ENV=${SPACK_ENV} \
        BUILDCACHE_OCI_PROMPT="eicweb" \ BUILDCACHE_OCI_PROMPT="eicweb" \
        BUILDCACHE_OCI_FINAL="ghcr" BUILDCACHE_OCI_FINAL="ghcr"
        spack find --implicit --no-groups \ spack find --long --no-groups \
        | sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \ | sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
        | uniq -d | grep -v py-pip | grep -v py-cython \ | uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
        | tee /tmp/duplicates.txt | tee /tmp/duplicates.txt
        test -s /tmp/duplicates.txt && exit 1 test -s /tmp/duplicates.txt && ( cat /tmp/duplicates.txt | while read hash spec ; do spack spec --long /${hash} ; done ) && exit 1
        ccache --show-stats ccache --show-stats
        ccache --zero-stats ccache --zero-stats
        EOF EOF
        ...@@ -208,11 +208,11 @@ spack concretize --fresh --force ...@@ -208,11 +208,11 @@ spack concretize --fresh --force
        make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
        SPACK_ENV=${SPACK_ENV} \ SPACK_ENV=${SPACK_ENV} \
        BUILDCACHE_OCI_FINAL="eicweb" BUILDCACHE_OCI_FINAL="eicweb"
        spack find --implicit --no-groups \ spack find --long --no-groups \
        | sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \ | sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
        | uniq -d | grep -v py-pip | grep -v py-cython \ | uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
        | tee /tmp/duplicates.txt | tee /tmp/duplicates.txt
        test -s /tmp/duplicates.txt && exit 1 test -s /tmp/duplicates.txt && ( cat /tmp/duplicates.txt | while read hash spec ; do spack spec --long /${hash} ; done ) && exit 1
        ccache --show-stats ccache --show-stats
        ccache --zero-stats ccache --zero-stats
        EOF EOF
        ......
        spack-environment/Makefile
        + 5
        − 5
        View file @ 1cf6bfa1
        MAKEFLAGS += -Orecurse MAKEFLAGS += -Orecurse
        SPACK ?= spack SPACK ?= spack --backtrace
        SPACK_INSTALL_FLAGS += --no-check-signature --show-log-on-error SPACK_INSTALL_FLAGS += --no-check-signature --show-log-on-error
        export SPACK_COLOR = always export SPACK_COLOR = always
        ...@@ -22,15 +22,15 @@ include $(SPACK_ENV)/spack.mk ...@@ -22,15 +22,15 @@ include $(SPACK_ENV)/spack.mk
        endif endif
        $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_IDS)) $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_IDS))
        $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache push --unsigned $(buildcache) ;) $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache push --private --unsigned $(buildcache) ;)
        $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache update-index $(buildcache) ;) $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache update-index $(buildcache) ;)
        $(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache update-index $(buildcache) ;) $(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache update-index $(buildcache) ;)
        $(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) | grep -v "Using cached archive" ;) $(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --private --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) | grep -v "Using cached archive" ;)
        $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/% $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/%
        @mkdir -p $(dir $@) @mkdir -p $(dir $@)
        $(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache push --unsigned --only=package $(buildcache) /$(HASH) ;) # push $(SPEC) $(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache push --private --unsigned --only=package $(buildcache) /$(HASH) ;) # push $(SPEC)
        $(foreach buildcache, $(BUILDCACHE_OCI_PROMPT), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) /$(HASH) | grep -v "Using cached archive" ;) # push $(SPEC) $(foreach buildcache, $(BUILDCACHE_OCI_PROMPT), $(SPACK) buildcache push --private --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) /$(HASH) | grep -v "Using cached archive" ;) # push $(SPEC)
        @touch $@ @touch $@
        $(SPACK_ENV)/spack.lock: $(SPACK_ENV)/spack.yaml Makefile $(SPACK_ENV)/spack.lock: $(SPACK_ENV)/spack.yaml Makefile
        ......
        spack-environment/packages.yaml
        + 15
        − 3
        View file @ 1cf6bfa1
        ...@@ -14,8 +14,8 @@ packages: ...@@ -14,8 +14,8 @@ packages:
        require: require:
        - '%gcc' - '%gcc'
        - any_of: [+ipo, '@:'] - any_of: [+ipo, '@:']
        - any_of: [build_system=cmake, '@:']
        - any_of: [build_type=Release, '@:'] - any_of: [build_type=Release, '@:']
        - any_of: [^py-pip@23.1.2, '@:']
        acts: acts:
        require: require:
        - '@31.2.0' - '@31.2.0'
        ...@@ -127,6 +127,9 @@ packages: ...@@ -127,6 +127,9 @@ packages:
        require: require:
        - '@9.1.0' - '@9.1.0'
        - +shared cxxstd=17 - +shared cxxstd=17
        freetype:
        require:
        - build_system=autotools
        gaudi: gaudi:
        require: require:
        - '@38.1' - '@38.1'
        ...@@ -144,9 +147,12 @@ packages: ...@@ -144,9 +147,12 @@ packages:
        - '@11.2.2.east' - '@11.2.2.east'
        - cxxstd=20 -vecgeom +threads -vtk - cxxstd=20 -vecgeom +threads -vtk
        - any_of: [+opengl +qt +x11, -opengl -qt -x11] - any_of: [+opengl +qt +x11, -opengl -qt -x11]
        glew: gettext:
        require:
        - +libxml2
        gl:
        require: require:
        - gl=glx - glx
        gloo: gloo:
        require: require:
        - '@2023-05-19' - '@2023-05-19'
        ...@@ -251,6 +257,9 @@ packages: ...@@ -251,6 +257,9 @@ packages:
        require: require:
        - '@3.0.2' - '@3.0.2'
        - +plot - +plot
        protobuf:
        require:
        - '@3.21.12'
        pythia8: pythia8:
        require: require:
        - '@8.311' - '@8.311'
        ...@@ -333,6 +342,9 @@ packages: ...@@ -333,6 +342,9 @@ packages:
        py-pre-commit: py-pre-commit:
        require: require:
        - '@3.3.3' - '@3.3.3'
        py-protobuf:
        require:
        - '@4.21.9'
        py-pygithub: py-pygithub:
        require: require:
        - '@2.1.1' - '@2.1.1'
        ......
        spack-environment/view.yaml
        + 5
        − 2
        View file @ 1cf6bfa1
        view: view:
        default: default:
        root: /opt/local root: /opt/local
        exclude: [epic] exclude:
        - epic
        - py-pip@23.0
        link_type: symlink link_type: symlink
        detectors: detectors:
        root: /opt/detector root: /opt/detector
        select: [epic] select:
        - epic
        projections: projections:
        all: '{name}-{version}' all: '{name}-{version}'
        link: roots link: roots
        ......
        spack.sh
        + 1
        − 3
        View file @ 1cf6bfa1
        ...@@ -3,7 +3,7 @@ SPACK_ORGREPO="spack/spack" ...@@ -3,7 +3,7 @@ SPACK_ORGREPO="spack/spack"
        ## Spack github version, e.g. v0.18.1 or commit hash ## Spack github version, e.g. v0.18.1 or commit hash
        ## note: nightly builds will use e.g. releases/v0.19 ## note: nightly builds will use e.g. releases/v0.19
        SPACK_VERSION="v0.22.0" SPACK_VERSION="v0.22.1"
        ## Space-separated list of spack cherry-picks ## Space-separated list of spack cherry-picks
        read -r -d '' SPACK_CHERRYPICKS <<- \ read -r -d '' SPACK_CHERRYPICKS <<- \
        ...@@ -11,7 +11,6 @@ read -r -d '' SPACK_CHERRYPICKS <<- \ ...@@ -11,7 +11,6 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
        09f75ee426a2e05e0543570821582480ff823ba5 09f75ee426a2e05e0543570821582480ff823ba5
        f6d50f790ee8b123f7775429f6ca6394170e6de9 f6d50f790ee8b123f7775429f6ca6394170e6de9
        63f6e6079aacc99078386e5c8ff06173841b9595 63f6e6079aacc99078386e5c8ff06173841b9595
        9bcc43c4c158639fa6cb575c6106595a34682081
        9f3e45ddbee24aaa7993e575297827e0aed2e6fe 9f3e45ddbee24aaa7993e575297827e0aed2e6fe
        85f13442d2a7486daba81fdd9a3b6a1182ba11f6 85f13442d2a7486daba81fdd9a3b6a1182ba11f6
        f73d7d2dce226857cbc774e942454bad2992969e f73d7d2dce226857cbc774e942454bad2992969e
        ...@@ -34,7 +33,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -34,7 +33,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
        ## f6d50f790ee8b123f7775429f6ca6394170e6de9: gaudi: Add version 38.1 ## f6d50f790ee8b123f7775429f6ca6394170e6de9: gaudi: Add version 38.1
        ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list> ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list>
        ## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21"
        ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES
        ## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments ## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments
        ## f73d7d2dce226857cbc774e942454bad2992969e: dd4hep: cleanup recipe, remove deprecated versions and patches ## f73d7d2dce226857cbc774e942454bad2992969e: dd4hep: cleanup recipe, remove deprecated versions and patches
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment