sync

CarloVarni · Oct 26, 2023 · 867ec9c · 867ec9c
2 parents b08dfc2 + 7a2383c
commit 867ec9c
Show file tree

Hide file tree

Showing 712 changed files with 22,628 additions and 6,949 deletions.
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -3,24 +3,16 @@ FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE ISSUE.
 
 ## Checklist
 
-- [ ] Is the issue marked with exactly one of the following labels
+- [ ] Does the issue indicate clearly what kind it is? Examples are
 
     - Bug
     - Feature
     - Improvement
-    - infrastructure
+    - Infrastructure
 
 - [ ] If the issue reports a bug:
 
-    - [ ] Is it also marked with one of the `Impact - {Minor,Major,Critical}` labels?
+    - [ ] Please suggest whether this bug is critical / a blocker. One of the 
+          maintainers will assign a corresponding labels.
     - [ ] Does the description contain all necessary information to reproduce
-        the error?
-
-- [ ] Is the issue assigned to a milestone? This should be `next` unless you
-    target a specific release.
-
-- [ ] If the issue is a question or the start of a discussion, please add the
-    `Needs discussion` label.
-
-- [ ] If the issue tracks a long development or multiple underlying issues
-    please add the `Long Term` label.
+          the error?
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -19,17 +19,23 @@ REQUEST.
 
     - [ ] Does the PR title contain a `!` to indicate a breaking change?
     - [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
-        that explains the breaking change?
+          that explains the breaking change?
 
 - [ ] Is the PR ready to be merged?
 
-    - [ ] If not: is it marked as work-in-progress using the `WIP` label?
-
-- [ ] Is the PR assigned to a milestone? This should be `next` unless you
-    target a specific release.
+    - [ ] If not: is it marked as a draft PR?
 
 - [ ] Does this PR close an existing issue?
 
     - [ ] Is the issue correctly linked so it will be automatically closed
         upon successful merge (See closing keywords link in the sidebar)?
-    - [ ] Does the PR milestone match the issue milestone?
+
+- The CI will initially report a missing milestone. One of the maintainers will
+  handle assigning a milestone for book-keeping.
+
+- An automated workflow will assign labels based on changed files, and whether
+  or not reference files were changed. These do not have to be set manually.
+
+- If you push updates, and you know they will be superceded later on, consider adding
+  `[skip ci]` in the commit message. This will instruct the CI system not to run any
+  jobs on this commit.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -22,115 +22,6 @@ env:
   CCACHE_KEY_SUFFIX: r1
 
 jobs:
-  lcg:
-    runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/${{ matrix.image }}:v41
-    strategy:
-      matrix:
-        image:
-          - centos7-lcg100-gcc10
-          - centos7-lcg101-gcc11
-          - centos8-lcg100-gcc10
-          - centos8-lcg101-gcc11
-    env:
-      SETUP: source /opt/lcg_view/setup.sh
-      INSTALL_DIR: ${{ github.workspace }}/install
-      ACTS_LOG_FAILURE_THRESHOLD: WARNING
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Restore ccache
-        uses: actions/cache/restore@v3
-        id: ccache-restore
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache-${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os  }}-ccache-${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_
-
-      - name: Configure
-        # setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
-        # dd4hep CMake configuration that gets triggered on recent CMake
-        # versions 
-        run: >
-          ${SETUP} &&
-          ccache -z &&
-          cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
-          -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_LOG_FAILURE_THRESHOLD=WARNING
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_EXAMPLES=ON
-          -DACTS_BUILD_PLUGIN_DD4HEP=OFF
-          -DACTS_BUILD_PLUGIN_TGEO=ON
-          -DACTS_BUILD_PLUGIN_IDENTIFICATION=ON
-          -DACTS_BUILD_PLUGIN_JSON=ON
-          -DACTS_BUILD_FATRAS=ON
-          -DACTS_BUILD_PLUGIN_LEGACY=ON
-          -DACTS_BUILD_PLUGIN_AUTODIFF=ON
-          -DACTS_BUILD_BENCHMARKS=ON
-          -DACTS_BUILD_UNITTESTS=ON
-          -DACTS_BUILD_INTEGRATIONTESTS=ON
-          -DACTS_BUILD_EXAMPLES_DD4HEP=OFF
-          -DACTS_BUILD_PLUGIN_EDM4HEP=OFF
-          -DACTS_BUILD_EXAMPLES_GEANT4=ON
-          -DACTS_BUILD_EXAMPLES_HEPMC3=ON
-          -DACTS_BUILD_EXAMPLES_PYTHIA8=ON
-          -DACTS_BUILD_FATRAS_GEANT4=ON
-          -DACTS_BUILD_FATRAS=ON
-          -DACTS_BUILD_ALIGNMENT=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
-
-      - name: Build
-        run: ${SETUP} && cmake --build build
-
-      - name: ccache stats
-        run: ${SETUP} && ccache -s
-
-      - name: Save ccache
-        uses: actions/cache/save@v3
-        if: always()
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
-
-      - name: Unit tests
-        run: ${SETUP} && cmake --build build --target test
-
-      - name: Integration tests
-        run: ${SETUP} && cmake --build build --target integrationtests
-
-      - name: Install
-        run: ${SETUP} && cmake --build build --target install
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: acts-${{ matrix.image }}
-          path: ${{ env.INSTALL_DIR }}
-
-      - name: Downstream configure
-        run: >
-          ${SETUP} &&
-          cmake -B build-downstream -S Tests/DownstreamProject
-          -GNinja
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
-          -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
-          -DDD4HEP=OFF
-
-      - name: Downstream build
-        run: ${SETUP} && cmake --build build-downstream
-
-      - name: Downstream run
-        run: ${SETUP} && ./build-downstream/bin/ShowActsVersion
-
   linux_ubuntu:
     runs-on: ubuntu-latest
     container: ghcr.io/acts-project/ubuntu2204:v41
@@ -575,6 +466,7 @@ jobs:
           && sudo chown $USER /usr/local/acts
           && wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.gz https://acts.web.cern.ch/ACTS/ci/macOS/deps.67dd08d.tar.gz
           && tar -xf deps.tar.gz -C /usr/local/acts
+          && python3 -m pip install pyyaml jinja2
 
       - name: Restore ccache
         uses: actions/cache/restore@v3
@@ -594,6 +486,7 @@ jobs:
           cmake -B build -S .
           -GNinja
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          -DPython_EXECUTABLE=$(command -v python3)
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
           -DCMAKE_CXX_STANDARD=17

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -63,6 +63,14 @@ jobs:
       - name: Check
         run: >
           CI/check_pragma_once.sh
+  end_of_line:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - name: Check
+        run: >
+          CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
   boost_test_macro:
     runs-on: ubuntu-latest
     steps:

diff --git a/.gitignore b/.gitignore
@@ -18,25 +18,19 @@ x86_64-slc6-gcc49-opt
 build*
 .asetup.save
 
-# do not ignore changes in the requirements file
-# as they are actually important
-!cmt/requirements
-
-# doxygen documentation
-# =====================
-!doc/doxygen.config
-
 #json output
 *.json
 #root output
 *.root
+#csv output
+*.csv
 *.pyc
 /cmake_cmd
 /cleanup.sh
 
 # dont ignore hidden configs
 !.clang-format
-!.github/
+!.github/**
 !.gitignore
 !.gitlab-ci.yml
 !.clang-tidy

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ variables:
   CCACHE_DIR: ${CI_PROJECT_DIR}/ccache
   CCACHE_MAXSIZE: 2G
   CCACHE_KEY_SUFFIX: r1
+  CTEST_OUTPUT_ON_FAILURE: 1
 
 clang_tidy:
   stage: build
@@ -49,6 +50,7 @@ clang_tidy:
         clang-tidy/clang-tidy.log 
         clang-tidy/clang-tidy.json 
         --exclude "*thirdparty*"
+        --exclude "*ActsPodioEdm*"
 
     # Check the combined report against the defined limits
     - CI/clang_tidy/check_clang_tidy.py --report clang-tidy/clang-tidy.json --config CI/clang_tidy/limits.yml
@@ -58,7 +60,7 @@ clang_tidy:
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v41
+  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v43
   tags:
     - docker
 
@@ -104,7 +106,7 @@ test_exatrkx_unittests:
   stage: test
   needs:
     - build_exatrkx
-  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v41
+  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v43
   tags:
     - docker-gpu-nvidia
   script:
@@ -114,11 +116,11 @@ test_exatrkx_python:
   stage: test
   needs:
     - build_exatrkx
-  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v41
+  image: ghcr.io/acts-project/ubuntu2004_exatrkx:v43
   tags:
     - docker-gpu-nvidia
   script:
-    - apt-get update -y || true # TODO revert
+    - apt-get update -y
     - apt-get install -y python3 libxxhash0
     - source /usr/local/bin/thisroot.sh
     - source build/python/setup.sh
@@ -358,7 +360,19 @@ linux_ubuntu_2204_clang:
   before_script:
     - 'echo "LCG_VERSION: ${LCG_VERSION}"'
     - 'echo "COMPILER: ${COMPILER}"'
-    - 'if [ "$OS" = "alma9"  ]; then export LCG_PLATFORM="centos9"; else export LCG_PLATFORM="$OS"; fi'
+
+    # Figure out LCG platform name based on version number and OS
+    - >
+      if [ "$OS" = "alma9"  ]; then 
+        if [ "$LCG_VERSION" = "104" ]; then 
+          export LCG_PLATFORM="el9"
+        else
+          export LCG_PLATFORM="centos9"
+        fi
+      else 
+        export LCG_PLATFORM="$OS"
+      fi
+
     - 'echo "LCG_PLATFORM: ${LCG_PLATFORM}"'
     - source /cvmfs/sft.cern.ch/lcg/views/LCG_${LCG_VERSION}/x86_64-${LCG_PLATFORM}-${COMPILER}-opt/setup.sh
 
@@ -383,7 +397,7 @@ linux_ubuntu_2204_clang:
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
       -DACTS_LOG_FAILURE_THRESHOLD=WARNING
       -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-      -DACTS_FORCE_ASSERTIONS=ON
+      -DACTS_FORCE_ASSERTIONS=OFF
       -DACTS_BUILD_UNITTESTS=ON
       -DACTS_BUILD_INTEGRATIONTESTS=ON
       -DACTS_BUILD_BENCHMARKS=ON
@@ -394,7 +408,7 @@ linux_ubuntu_2204_clang:
       -DACTS_BUILD_PLUGIN_JSON=ON
       -DACTS_BUILD_FATRAS=ON
       -DACTS_BUILD_PLUGIN_LEGACY=ON
-      -DACTS_BUILD_PLUGIN_AUTODIFF=ON
+      -DACTS_BUILD_PLUGIN_AUTODIFF=OFF
       -DACTS_BUILD_EXAMPLES_DD4HEP=OFF
       -DACTS_BUILD_PLUGIN_EDM4HEP=OFF
       -DACTS_BUILD_EXAMPLES_GEANT4=ON
@@ -424,31 +438,26 @@ lcg_102b:
       - OS: [centos7]
         COMPILER: [gcc11]
 
-      - OS: [centos8, alma9]
-        COMPILER: [gcc11]
-
-lcg_103:
+lcg_104:
   <<: *lcg_base_job
 
   variables:
-    LCG_VERSION: "103"
+    LCG_VERSION: "104"
 
   parallel:
     matrix:
       - OS: [centos7]
         COMPILER: 
           - gcc11
           - gcc12
-          # currently failing:
-          # - clang12
-          # - clang15
 
       - OS: [alma9]
         COMPILER: 
           - gcc11
           - gcc12
+          - gcc13
+          - clang16
+
+      - OS: [centos8]
+        COMPILER: [gcc11]
 
-  rules:
-    - if: '$COMPILER == "clang12" || $COMPILER == "clang15"'
-      allow_failure: true
-    - when: on_success
diff --git a/Alignment/include/ActsAlignment/Kernel/Alignment.hpp b/Alignment/include/ActsAlignment/Kernel/Alignment.hpp
@@ -74,7 +74,7 @@ struct AlignmentOptions {
   // The detector elements to be aligned
   std::vector<Acts::DetectorElementBase*> alignedDetElements;
 
-  // The alignment tolerance to determine if the alignment is coveraged
+  // The alignment tolerance to determine if the alignment is covered
   double averageChi2ONdfCutOff = 0.5;
 
   // The delta of average chi2/ndf within a couple of iterations to determine if
@@ -101,7 +101,7 @@ struct AlignmentResult {
   // The covariance of alignment parameters
   Acts::ActsDynamicMatrix alignmentCovariance;
 
-  // The avarage chi2/ndf (ndf is the measurement dim)
+  // The average chi2/ndf (ndf is the measurement dim)
   double averageChi2ONdf = std::numeric_limits<double>::max();
 
   // The delta chi2