Skip to content
Snippets Groups Projects
Commit a4783e40 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin
Browse files

Merge branch 'master' into 'acts-37.4.0' 

# Conflicts:
#   spack.sh
parents 3b31280c 0e1840fe
No related branches found
No related tags found
No related merge requests found
Pipeline #121057 passed
Stage: config
Stage: base
Stage: eic
Stage: benchmarks
Stage: finalize
Pipeline: eic_container: Merge branch 'master' into 'acts-37.4.0'

#121097

    Pipeline: eic_container: Merge branch 'master' into 'acts-37.4.0'

    #121096

      Pipeline: reconstruction_benchmarks

      #121065

        +5
        Show whitespace changes
        Inline Side-by-side
        Showing
        with 224 additions and 91 deletions
        .gitlab-ci.yml
        + 57
        − 45
        View file @ a4783e40
        ...@@ -5,6 +5,10 @@ variables: ...@@ -5,6 +5,10 @@ variables:
        DOCKER_IMAGE: docker.io/docker:28.1.1 DOCKER_IMAGE: docker.io/docker:28.1.1
        SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5 SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5
        ## CUDA version and container operating system
        CUDA_VERSION: 12.2.2
        CUDA_OS: ubuntu22.04
        ## Default versions are specified in packages.yaml but can be overridden ## Default versions are specified in packages.yaml but can be overridden
        EDM4EIC_VERSION: "" EDM4EIC_VERSION: ""
        EICRECON_VERSION: "" EICRECON_VERSION: ""
        ...@@ -96,7 +100,7 @@ workflow: ...@@ -96,7 +100,7 @@ workflow:
        nvidia-smi: nvidia-smi:
        stage: config stage: config
        image: nvidia/cuda:11.3.1-base-ubuntu20.04 image: nvidia/cuda:${CUDA_VERSION}-base-${CUDA_OS}
        tags: tags:
        - gpu - gpu
        script: script:
        ...@@ -158,10 +162,11 @@ version: ...@@ -158,10 +162,11 @@ version:
        .status: .status:
        image: curlimages/curl:latest image: curlimages/curl:latest
        rules:
        - if: $GITHUB_SHA !~ /^$/ # when GITHUB_SHA non-empty
        before_script: [] before_script: []
        script: script:
        - | - |
        if [ -n "${GITHUB_SHA}" ] ; then
        curl \ curl \
        -X POST \ -X POST \
        -H "Accept: application/vnd.github+json" \ -H "Accept: application/vnd.github+json" \
        ...@@ -172,7 +177,6 @@ version: ...@@ -172,7 +177,6 @@ version:
        "description":"'"${DESCRIPTION} $(TZ=America/New_York date)"'", "description":"'"${DESCRIPTION} $(TZ=America/New_York date)"'",
        "context":"eicweb/eic_container" "context":"eicweb/eic_container"
        }' ; }' ;
        fi
        status:pending: status:pending:
        stage: status-pending stage: status-pending
        ...@@ -276,10 +280,10 @@ base: ...@@ -276,10 +280,10 @@ base:
        # - BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04 # - BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04
        # BUILD_IMAGE: oneapi_base # BUILD_IMAGE: oneapi_base
        # PLATFORM: linux/amd64 # PLATFORM: linux/amd64
        - BASE_IMAGE: nvidia/cuda:12.3.2-devel-ubuntu22.04 - BASE_IMAGE: nvidia/cuda:${CUDA_VERSION}-devel-${CUDA_OS}
        BUILD_IMAGE: cuda_devel BUILD_IMAGE: cuda_devel
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        - BASE_IMAGE: nvidia/cuda:12.3.2-runtime-ubuntu22.04 - BASE_IMAGE: nvidia/cuda:${CUDA_VERSION}-runtime-${CUDA_OS}
        BUILD_IMAGE: cuda_runtime BUILD_IMAGE: cuda_runtime
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        extends: .build extends: .build
        ...@@ -333,17 +337,19 @@ base: ...@@ -333,17 +337,19 @@ base:
        eic: eic:
        parallel: parallel:
        matrix: matrix:
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - ci
        # - dbg
        # - prod
        - tf
        - xl
        BUILD_TYPE:
        - default - default
        - nightly - nightly
        BUILDER_IMAGE: debian_stable_base BUILDER_IMAGE: debian_stable_base
        RUNTIME_IMAGE: debian_stable_base RUNTIME_IMAGE: debian_stable_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        # - dbg
        # - prod
        - xl
        # - BUILD_TYPE: # - BUILD_TYPE:
        # - default # - default
        # - nightly # - nightly
        ...@@ -353,26 +359,26 @@ eic: ...@@ -353,26 +359,26 @@ eic:
        # PLATFORM: linux/amd64 # PLATFORM: linux/amd64
        # ENV: # ENV:
        # - prod # - prod
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - cuda
        BUILD_TYPE:
        - default - default
        - nightly - nightly
        BUILDER_IMAGE: cuda_devel BUILDER_IMAGE: cuda_devel
        RUNTIME_IMAGE: cuda_runtime RUNTIME_IMAGE: cuda_runtime
        BASE_IMAGE: cuda_base BASE_IMAGE: cuda_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        - BUILD_IMAGE: eic_dev_
        ENV: ENV:
        - cuda - cuda
        - BUILD_TYPE: BUILD_TYPE:
        - default - default
        - nightly - nightly
        BUILDER_IMAGE: cuda_devel BUILDER_IMAGE: cuda_devel
        RUNTIME_IMAGE: cuda_devel RUNTIME_IMAGE: cuda_devel
        BASE_IMAGE: cuda_base BASE_IMAGE: cuda_base
        BUILD_IMAGE: eic_dev_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        - cuda
        extends: .build extends: .build
        stage: eic stage: eic
        needs: needs:
        ...@@ -461,7 +467,7 @@ eic: ...@@ -461,7 +467,7 @@ eic:
        stage: deploy stage: deploy
        interruptible: true interruptible: true
        rules: rules:
        - if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE != "trigger"'
        when: on_success when: on_success
        - when: never - when: never
        artifacts: artifacts:
        ...@@ -482,14 +488,14 @@ eic_xl:singularity:default: ...@@ -482,14 +488,14 @@ eic_xl:singularity:default:
        - job: eic - job: eic
        parallel: parallel:
        matrix: matrix:
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - xl
        BUILD_TYPE:
        - default - default
        BUILDER_IMAGE: debian_stable_base BUILDER_IMAGE: debian_stable_base
        RUNTIME_IMAGE: debian_stable_base RUNTIME_IMAGE: debian_stable_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        - xl
        # eic-shell/install.py expects build/eic_xl.sif from the job with name 'eic_xl:singularity:nightly' # eic-shell/install.py expects build/eic_xl.sif from the job with name 'eic_xl:singularity:nightly'
        eic_xl:singularity:nightly: eic_xl:singularity:nightly:
        ...@@ -502,14 +508,14 @@ eic_xl:singularity:nightly: ...@@ -502,14 +508,14 @@ eic_xl:singularity:nightly:
        - job: eic - job: eic
        parallel: parallel:
        matrix: matrix:
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - xl
        BUILD_TYPE:
        - nightly - nightly
        BUILDER_IMAGE: debian_stable_base BUILDER_IMAGE: debian_stable_base
        RUNTIME_IMAGE: debian_stable_base RUNTIME_IMAGE: debian_stable_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        - xl
        .benchmarks: .benchmarks:
        stage: benchmarks stage: benchmarks
        ...@@ -517,7 +523,6 @@ eic_xl:singularity:nightly: ...@@ -517,7 +523,6 @@ eic_xl:singularity:nightly:
        DETECTOR: "epic" DETECTOR: "epic"
        DETECTOR_CONFIG: epic_craterlake DETECTOR_CONFIG: epic_craterlake
        DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git' DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
        BENCHMARKS_CONTAINER: "eic_xl"
        BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
        PIPELINE_NAME: "eic_container: $CI_PIPELINE_NAME" PIPELINE_NAME: "eic_container: $CI_PIPELINE_NAME"
        GITHUB_REPOSITORY: "$GITHUB_REPOSITORY" GITHUB_REPOSITORY: "$GITHUB_REPOSITORY"
        ...@@ -532,14 +537,14 @@ eic_xl:singularity:nightly: ...@@ -532,14 +537,14 @@ eic_xl:singularity:nightly:
        - job: eic - job: eic
        parallel: parallel:
        matrix: matrix:
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - ci
        BUILD_TYPE:
        - default - default
        BUILDER_IMAGE: debian_stable_base BUILDER_IMAGE: debian_stable_base
        RUNTIME_IMAGE: debian_stable_base RUNTIME_IMAGE: debian_stable_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        - xl
        .benchmarks:nightly: .benchmarks:nightly:
        extends: .benchmarks extends: .benchmarks
        ...@@ -548,20 +553,21 @@ eic_xl:singularity:nightly: ...@@ -548,20 +553,21 @@ eic_xl:singularity:nightly:
        - job: eic - job: eic
        parallel: parallel:
        matrix: matrix:
        - BUILD_TYPE: - BUILD_IMAGE: eic_
        ENV:
        - ci
        BUILD_TYPE:
        - nightly - nightly
        BUILDER_IMAGE: debian_stable_base BUILDER_IMAGE: debian_stable_base
        RUNTIME_IMAGE: debian_stable_base RUNTIME_IMAGE: debian_stable_base
        BUILD_IMAGE: eic_
        PLATFORM: linux/amd64 PLATFORM: linux/amd64
        ENV:
        - xl
        benchmarks:geoviewer:default: benchmarks:geoviewer:default:
        extends: .benchmarks:default extends: .benchmarks:default
        rules: rules:
        - if: '$CI_PIPELINE_SOURCE != "schedule" && $EPIC_VERSION != ""' - if: '$CI_PIPELINE_SOURCE != "schedule" && $EPIC_VERSION != ""'
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
        trigger: trigger:
        project: EIC/benchmarks/geoviewer project: EIC/benchmarks/geoviewer
        ...@@ -572,6 +578,7 @@ benchmarks:detector:default: ...@@ -572,6 +578,7 @@ benchmarks:detector:default:
        rules: rules:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
        trigger: trigger:
        project: EIC/benchmarks/detector_benchmarks project: EIC/benchmarks/detector_benchmarks
        ...@@ -583,6 +590,7 @@ benchmarks:detector:nightly: ...@@ -583,6 +590,7 @@ benchmarks:detector:nightly:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        - !reference ['.nightly', rules] - !reference ['.nightly', rules]
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly" BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
        trigger: trigger:
        project: EIC/benchmarks/detector_benchmarks project: EIC/benchmarks/detector_benchmarks
        ...@@ -593,6 +601,7 @@ benchmarks:phyiscs:default: ...@@ -593,6 +601,7 @@ benchmarks:phyiscs:default:
        rules: rules:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
        trigger: trigger:
        project: EIC/benchmarks/physics_benchmarks project: EIC/benchmarks/physics_benchmarks
        ...@@ -604,6 +613,7 @@ benchmarks:physics:nightly: ...@@ -604,6 +613,7 @@ benchmarks:physics:nightly:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        - !reference ['.nightly', rules] - !reference ['.nightly', rules]
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly" BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
        trigger: trigger:
        project: EIC/benchmarks/physics_benchmarks project: EIC/benchmarks/physics_benchmarks
        ...@@ -614,6 +624,7 @@ benchmarks:reconstruction:default: ...@@ -614,6 +624,7 @@ benchmarks:reconstruction:default:
        rules: rules:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
        trigger: trigger:
        project: EIC/benchmarks/reconstruction_benchmarks project: EIC/benchmarks/reconstruction_benchmarks
        ...@@ -625,6 +636,7 @@ benchmarks:reconstruction:nightly: ...@@ -625,6 +636,7 @@ benchmarks:reconstruction:nightly:
        - if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
        - !reference ['.nightly', rules] - !reference ['.nightly', rules]
        variables: variables:
        BENCHMARKS_CONTAINER: eic_ci
        BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly" BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
        trigger: trigger:
        project: EIC/benchmarks/reconstruction_benchmarks project: EIC/benchmarks/reconstruction_benchmarks
        ......
        containers/debian/Dockerfile
        + 10
        − 8
        View file @ a4783e40
        ...@@ -84,25 +84,25 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ...@@ -84,25 +84,25 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
        --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF --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
        # GCC version and repository # GCC and CLANG version and repository
        case ${ID} in case ${ID} in
        debian) debian)
        case ${VERSION_CODENAME} in case ${VERSION_CODENAME} in
        bookworm) GCC="-12" ;; bookworm) GCC="-12" ; CLANG="-16" ;;
        trixie) GCC="-13" ;; trixie) GCC="-13" ; CLANG="-17" ;;
        *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;; *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
        esac ;; esac ;;
        ubuntu) ubuntu)
        echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
        case ${VERSION_CODENAME} in case ${VERSION_CODENAME} in
        focal) GCC="-10" ;; focal) GCC="-10" ; CLANG="-16" ;;
        jammy) GCC="-12" ;; jammy) GCC="-12" ; CLANG="-16" ;;
        noble) GCC="-13" ; CLANG="-17" ;;
        *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;; *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
        esac ;; esac ;;
        *) echo "Unsupported ID=${ID}" ; exit 1 ;; *) echo "Unsupported ID=${ID}" ; exit 1 ;;
        esac esac
        # Clang version and repository # Clang repository
        CLANG="-16"
        curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
        if [ ${VERSION_CODENAME} = trixie ] ; then if [ ${VERSION_CODENAME} = trixie ] ; then
        echo "deb http://apt.llvm.org/unstable llvm-toolchain${CLANG} main" > /etc/apt/sources.list.d/llvm.list echo "deb http://apt.llvm.org/unstable llvm-toolchain${CLANG} main" > /etc/apt/sources.list.d/llvm.list
        ...@@ -114,6 +114,8 @@ apt-get -yqq update ...@@ -114,6 +114,8 @@ apt-get -yqq update
        apt-get -yqq install cpp${GCC} gcc${GCC} g++${GCC} gfortran${GCC} apt-get -yqq install cpp${GCC} gcc${GCC} g++${GCC} gfortran${GCC}
        apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev
        apt-get -yqq autoremove apt-get -yqq autoremove
        # Remove symlinks loop in nvidia/cuda:12.5.1-devel-ubuntu24.04
        rm -f /usr/bin/cpp /etc/alternatives/cpp
        # Ensure alternatives without version tags # Ensure alternatives without version tags
        update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp${GCC} 100 update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp${GCC} 100
        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc${GCC} 100 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc${GCC} 100
        ...@@ -125,6 +127,7 @@ update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang- ...@@ -125,6 +127,7 @@ update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-
        update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff${CLANG} 100 update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff${CLANG} 100
        update-alternatives --install /usr/bin/clang-tidy-diff clang-tidy-diff /usr/bin/clang-tidy-diff${CLANG}.py 100 update-alternatives --install /usr/bin/clang-tidy-diff clang-tidy-diff /usr/bin/clang-tidy-diff${CLANG}.py 100
        update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/bin/run-clang-tidy${CLANG}.py 100 update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/bin/run-clang-tidy${CLANG}.py 100
        update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config${CLANG} 100
        # Default to gcc # Default to gcc
        update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100
        update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100
        ...@@ -142,7 +145,6 @@ apt-get -yqq install --no-install-recommends \ ...@@ -142,7 +145,6 @@ apt-get -yqq install --no-install-recommends \
        jq \ jq \
        python3 \ python3 \
        python3-dev \ python3-dev \
        python3-distutils \
        python3-boto3 \ python3-boto3 \
        python-is-python3 python-is-python3
        EOF EOF
        ......
        containers/eic/Dockerfile
        + 1
        − 20
        View file @ a4783e40
        ...@@ -154,19 +154,6 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ ...@@ -154,19 +154,6 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
        spack gc --yes-to-all spack gc --yes-to-all
        EOF EOF
        ## Add minio client into /opt/mc/bin/mc
        ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /opt/mc/bin/mc-amd64
        ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /opt/mc/bin/mc-arm64
        RUN <<EOF
        set -e
        declare -A target=(["linux/amd64"]="amd64" ["linux/arm64"]="arm64")
        mv /opt/mc/bin/mc-${target[${TARGETPLATFORM}]} /opt/mc/bin/mc
        unset target[${TARGETPLATFORM}]
        for t in ${target[*]} ; do
        rm /opt/mc/bin/mc-${t}
        done
        EOF
        ## ======================================================================================== ## ========================================================================================
        ## builder_concretization_custom ## builder_concretization_custom
        ...@@ -360,11 +347,6 @@ mv /opt/._detector/${DETECTOR_PREFIX_PATH} /opt/detector ...@@ -360,11 +347,6 @@ mv /opt/._detector/${DETECTOR_PREFIX_PATH} /opt/detector
        ln -s /opt/detector /opt/._detector/${DETECTOR_PREFIX_PATH} ln -s /opt/detector /opt/._detector/${DETECTOR_PREFIX_PATH}
        EOF EOF
        ## Link minio client into /opt/local/bin/mc
        RUN <<EOF
        ln -sf /opt/mc/bin/mc /opt/local/bin/mc
        EOF
        ## Place cvmfs catalogs ## Place cvmfs catalogs
        RUN <<EOF RUN <<EOF
        set -e set -e
        ...@@ -403,8 +385,7 @@ COPY eic-shell /opt/local/bin/eic-shell ...@@ -403,8 +385,7 @@ COPY eic-shell /opt/local/bin/eic-shell
        COPY eic-info /opt/local/bin/eic-info COPY eic-info /opt/local/bin/eic-info
        COPY entrypoint.sh /opt/local/sbin/entrypoint.sh COPY entrypoint.sh /opt/local/sbin/entrypoint.sh
        COPY eic-env.sh /etc/eic-env.sh COPY eic-env.sh /etc/eic-env.sh
        COPY profile.d/a00_cleanup.sh /etc/profile.d COPY profile.d/* /etc/profile.d
        COPY profile.d/z11_jug_env.sh /etc/profile.d
        COPY singularity.d /.singularity.d COPY singularity.d /.singularity.d
        ## set ROOT TFile forward compatibility ## set ROOT TFile forward compatibility
        ......
        containers/eic/profile.d/z11_jug_env.sh → containers/eic/profile.d/z11_eic_shell.sh 100755 → 100644
        + 0
        − 0
        View file @ a4783e40
        File moved
        containers/eic/profile.d/z12_root_exe.sh 0 → 100644
        + 7
        − 0
        View file @ a4783e40
        #!/bin/bash
        # The command `root` is only installed when ROOT has X11 support,
        # so we alias `root` to `root.exe` when no X11 support is included.
        if ! which root > /dev/null && which root.exe > /dev/null ; then
        alias root=root.exe
        fi
        eic-spack.sh
        + 1
        − 1
        View file @ a4783e40
        ...@@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack" ...@@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
        ## EIC spack commit hash or github version, e.g. v0.19.7 ## EIC spack commit hash or github version, e.g. v0.19.7
        ## note: nightly builds could use a branch e.g. releases/v0.19 ## note: nightly builds could use a branch e.g. releases/v0.19
        EICSPACK_VERSION="11608ef2b03a168a461b2279b1bb85b6a05f5fbe" EICSPACK_VERSION="8b6346d8880318084dc6335996d0f389880a8b4e"
        \ No newline at end of file
        spack-environment/ci/spack.yaml 0 → 100644
        + 74
        − 0
        View file @ a4783e40
        spack:
        include:
        - ../concretizer.yaml
        - ../packages.yaml
        concretizer:
        unify: true
        specs:
        - acts
        - actsvg
        - afterburner
        - algorithms
        - cmake
        - dd4hep -ddeve
        - edm4eic
        - edm4hep
        - eicrecon
        - eigen
        - epic@main # EPIC_VERSION
        - fastjet
        - fjcontrib
        - fmt
        - gaudi
        - geant4 -opengl
        - gfal2
        - gfal2-util
        - graphviz
        - hepmc3
        - hepmcmerger
        - heppdt
        - imagemagick
        - irt
        - iwyu
        - jana2
        - juggler
        - nopayloadclient
        - npsim -geocad
        - onnx
        - osg-ca-certs
        - podio
        - pythia8
        - py-awkward
        - py-bokeh
        - py-boost-histogram
        - py-dask
        - py-deepdiff
        - py-eic-rucio-policy-package
        - py-epic-capybara
        - py-graphviz
        - py-hepunits
        - py-hist
        - py-histoprint
        - py-jinja2
        - py-jinja2-cli
        - py-lmfit
        - py-lxml
        - py-matplotlib
        - py-mplhep
        - py-htgettoken
        - py-numpy
        - py-onnx
        - py-onnxruntime
        - py-pandas
        - py-particle
        - py-pip
        - py-rucio-clients
        - py-scipy
        - py-seaborn
        - py-toml
        - py-uproot
        - py-vector
        - root -opengl -webgui
        - snakemake
        - spdlog
        - xrootd
        \ No newline at end of file
        spack-environment/cuda/spack.yaml
        + 1
        − 1
        View file @ a4783e40
        ...@@ -27,12 +27,12 @@ spack: ...@@ -27,12 +27,12 @@ spack:
        - eigen - eigen
        - emacs - emacs
        - epic@main # EPIC_VERSION - epic@main # EPIC_VERSION
        - epic@25.02.0
        - epic@25.03.0 - epic@25.03.0
        - epic@25.03.1 - epic@25.03.1
        - epic@25.04.0 - epic@25.04.0
        - epic@25.04.1 - epic@25.04.1
        - epic@25.05.0 - epic@25.05.0
        - epic@25.06.0
        - fastjet - fastjet
        - fjcontrib - fjcontrib
        - fmt - fmt
        ......
        spack-environment/packages.yaml
        + 20
        − 15
        View file @ a4783e40
        ...@@ -87,9 +87,9 @@ packages: ...@@ -87,9 +87,9 @@ packages:
        - '@1.14.10' - '@1.14.10'
        dd4hep: dd4hep:
        require: require:
        - '@1.31' - '@1.32'
        - +ddg4 +ddcad +hepmc3 +utilityapps +xercesc - +ddg4 +ddcad +hepmc3 +xercesc
        - any_of: [+ddeve, -ddeve] - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps
        dpmjet: dpmjet:
        require: require:
        - '@19.3.5' - '@19.3.5'
        ...@@ -115,7 +115,7 @@ packages: ...@@ -115,7 +115,7 @@ packages:
        eicrecon: eicrecon:
        require: require:
        - '%clang' - '%clang'
        - '@1.25.0' # EICRECON_VERSION - '@1.26.0' # EICRECON_VERSION
        eigen: eigen:
        require: require:
        - '@3.4.0' - '@3.4.0'
        ...@@ -176,6 +176,9 @@ packages: ...@@ -176,6 +176,9 @@ packages:
        require: require:
        - '@12.1.0' - '@12.1.0'
        - +expat +pangocairo - +expat +pangocairo
        hdf5:
        require:
        - ~cxx ~fortran +hl +ipo ~java ~map +mpi +shared ~subfiling ~szip ~threadsafe +tools
        hepmc3: hepmc3:
        require: require:
        - '@3.3.0' - '@3.3.0'
        ...@@ -186,6 +189,9 @@ packages: ...@@ -186,6 +189,9 @@ packages:
        heppdt: heppdt:
        require: require:
        - '@2.06.01' - '@2.06.01'
        highfive:
        require:
        - +mpi
        imagemagick: imagemagick:
        require: require:
        - '@7.1.1-11' - '@7.1.1-11'
        ...@@ -328,21 +334,16 @@ packages: ...@@ -328,21 +334,16 @@ packages:
        py-histoprint: py-histoprint:
        require: require:
        - '@2.4.0' - '@2.4.0'
        py-ipython:
        require:
        - '@8.28.0'
        py-jinja2: py-jinja2:
        require: require:
        - '@3.1.4' - '@3.1.4'
        py-jinja2-cli: py-jinja2-cli:
        require: require:
        - '@0.8.2' - '@0.8.2'
        py-jupyter-console: py-keras:
        require: require:
        - '@6.4.4' - '@3.7.0'
        py-jupyterlab: - backend=tensorflow
        require:
        - '@4.0.1'
        py-lmfit: py-lmfit:
        require: require:
        - '@1.0.2' - '@1.0.2'
        ...@@ -394,6 +395,10 @@ packages: ...@@ -394,6 +395,10 @@ packages:
        py-seaborn: py-seaborn:
        require: require:
        - '@0.13.2' - '@0.13.2'
        py-tensorflow:
        require:
        - '%clang'
        - '@2.18'
        py-toml: py-toml:
        require: require:
        - '@0.10.2' - '@0.10.2'
        ...@@ -430,9 +435,9 @@ packages: ...@@ -430,9 +435,9 @@ packages:
        - hepmc=3 - hepmc=3
        root: root:
        require: require:
        - '@6.32.08' - '@6.32.14'
        - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +vc +xrootd +ssl - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +vc +x +xrootd +ssl
        - any_of: [+opengl +webgui +x, -opengl -webgui -x] - any_of: [+opengl +webgui, -opengl -webgui]
        sherpa: sherpa:
        require: require:
        - '@3.0.1' - '@3.0.1'
        ......
        spack-environment/tf/spack.yaml 0 → 100644
        + 46
        − 0
        View file @ a4783e40
        spack:
        include:
        - ../concretizer.yaml
        - ../packages.yaml
        specs:
        - edm4eic
        - edm4hep
        - onnx
        - osg-ca-certs
        - podio
        - py-awkward
        - py-bokeh
        - py-boost-histogram
        - py-dask
        - py-eic-rucio-policy-package
        - py-epic-capybara
        - py-graphviz
        - py-hepunits
        - py-hist
        - py-histoprint
        - py-ipython
        - py-jinja2
        - py-jinja2-cli
        - py-jupyter-console
        - py-jupyterlab
        - py-keras
        - py-lmfit
        - py-lxml
        - py-matplotlib
        - py-mplhep
        - py-htgettoken
        - py-numpy
        - py-onnx
        - py-onnxruntime
        - py-pandas
        - py-particle
        - py-pip
        - py-pre-commit
        - py-rucio-clients
        - py-scipy
        - py-seaborn
        - py-tensorflow
        - py-toml
        - py-uproot
        - py-vector
        - xrootd
        spack-environment/xl/spack.yaml
        + 1
        − 1
        View file @ a4783e40
        ...@@ -29,12 +29,12 @@ spack: ...@@ -29,12 +29,12 @@ spack:
        - eigen - eigen
        - emacs - emacs
        - epic@main # EPIC_VERSION - epic@main # EPIC_VERSION
        - epic@25.02.0
        - epic@25.03.0 - epic@25.03.0
        - epic@25.03.1 - epic@25.03.1
        - epic@25.04.0 - epic@25.04.0
        - epic@25.04.1 - epic@25.04.1
        - epic@25.05.0 - epic@25.05.0
        - epic@25.06.0
        - fastjet - fastjet
        - fjcontrib - fjcontrib
        - fmt - fmt
        ......
        spack.sh
        + 6
        − 0
        View file @ a4783e40
        ...@@ -43,6 +43,9 @@ a14f10e8825fd25e0615095feaa548b1938fffac ...@@ -43,6 +43,9 @@ a14f10e8825fd25e0615095feaa548b1938fffac
        e76f8fda2d959fdf7a262eb539a4002a6a0c900f e76f8fda2d959fdf7a262eb539a4002a6a0c900f
        7e89b3521ae8c9fb4ef3e94748d170ba1b799bf2 7e89b3521ae8c9fb4ef3e94748d170ba1b799bf2
        c0c1a4aea1aa38bd7054cbac2e3fa1606f6939e9 c0c1a4aea1aa38bd7054cbac2e3fa1606f6939e9
        71b65bb424c6294badc4825ac4714ec7f89ad0b7
        a7e57c9a14ce36d6a3b03d7cd3b3357754b89019
        6b9c099af871e7cfc48d831aaefd542064f8dafa
        a86953fcb14a1e6ab760cba6957850ecfd40cca7 a86953fcb14a1e6ab760cba6957850ecfd40cca7
        --- ---
        ## Optional hash table with comma-separated file list ## Optional hash table with comma-separated file list
        ...@@ -88,4 +91,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -88,4 +91,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ## e76f8fda2d959fdf7a262eb539a4002a6a0c900f: openloops: use cmodel small on aarch64 instead of large ## e76f8fda2d959fdf7a262eb539a4002a6a0c900f: openloops: use cmodel small on aarch64 instead of large
        ## 7e89b3521ae8c9fb4ef3e94748d170ba1b799bf2: openloops: add v2.1.3, v2.1.4 ## 7e89b3521ae8c9fb4ef3e94748d170ba1b799bf2: openloops: add v2.1.3, v2.1.4
        ## c0c1a4aea1aa38bd7054cbac2e3fa1606f6939e9: podio: add v1.2; conflicts +rntuple ^root@6.32: when @:0.99 ## c0c1a4aea1aa38bd7054cbac2e3fa1606f6939e9: podio: add v1.2; conflicts +rntuple ^root@6.32: when @:0.99
        ## 71b65bb424c6294badc4825ac4714ec7f89ad0b7: py-opt-einsum: missing forward compat bound for python
        ## a7e57c9a14ce36d6a3b03d7cd3b3357754b89019: py-opt-einsum: add v3.4.0
        ## 6b9c099af871e7cfc48d831aaefd542064f8dafa: py-keras: add v3.7.0
        ## a86953fcb14a1e6ab760cba6957850ecfd40cca7: acts: add version 37.4.0 ## a86953fcb14a1e6ab760cba6957850ecfd40cca7: acts: add version 37.4.0
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment