Merge remote-tracking branch 'upstream/main'

CarloVarni · Sep 10, 2024 · 21ae7f0 · 21ae7f0
2 parents d5ea52b + eebeb36
commit 21ae7f0
Show file tree

Hide file tree

Showing 1,063 changed files with 37,285 additions and 19,068 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,10 +1,9 @@
----
 BasedOnStyle: Google
 Language: Cpp
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 PointerAlignment: Left
 ColumnLimit: 80
@@ -28,4 +27,3 @@ IncludeCategories:
   - Regex:    '^<.*>'
     Priority: 3
   # all headers not explicitly listed will be assigned to the last group
----
diff --git a/.clang-tidy b/.clang-tidy
@@ -21,7 +21,6 @@ Checks: '-*, \
   readability-named-parameter, \
   readability-operators-representation'
 HeaderFilterRegex: '.*(?<!nlohmann\/json)\.(hpp|cpp|ipp)$'
-AnalyzeTemporaryDtors: true
 CheckOptions:
   readability-operators-representation.BinaryOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='
   readability-operators-representation.OverloadedOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -12,7 +12,7 @@ FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE ISSUE.
 
 - [ ] If the issue reports a bug:
 
-    - [ ] Please suggest whether this bug is critical / a blocker. One of the 
+    - [ ] 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?
+          the error?
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -28,6 +28,7 @@
   - changed-files:
     - any-glob-to-any-file:
       - docs/**
+      - '**/*.rst'
 'Changes Performance':
   - changed-files:
     - any-glob-to-any-file:

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -8,26 +8,26 @@ REQUEST.
 
     The prefix must be one of:
 
-    - `fix`: for a bugfix
-    - `feat`: for a new feature
-    - `refactor`: for an improvement of an existing feature
-    - `perf`, `test`: for performance- or test-related changes
-    - `docs`: for documentation-related changes
-    - `build`, `ci`, `chore`: as appropriated for infrastructure changes
+  - `fix`: for a bugfix
+  - `feat`: for a new feature
+  - `refactor`: for an improvement of an existing feature
+  - `perf`, `test`: for performance- or test-related changes
+  - `docs`: for documentation-related changes
+  - `build`, `ci`, `chore`: as appropriated for infrastructure changes
 
 - [ ] Does this modify the public API as defined in `docs/versioning.rst`?
 
-    - [ ] Does the PR title contain a `!` to indicate a breaking change?
-    - [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
+  - [ ] 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?
 
 - [ ] Is the PR ready to be merged?
 
-    - [ ] If not: is it marked as a draft PR?
+  - [ ] 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
+  - [ ] Is the issue correctly linked so it will be automatically closed
         upon successful merge (See closing keywords link in the sidebar)?
 
 - The CI will initially report a missing milestone. One of the maintainers will
@@ -36,6 +36,6 @@ REQUEST.
 - 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
+- If you push updates, and you know they will be superseded later on, consider adding
   `[skip ci]` in the commit message. This will instruct the CI system not to run any
-  jobs on this commit.
+  jobs on this commit.
diff --git a/.github/wip.yml b/.github/wip.yml
@@ -1,6 +1,5 @@
-- locations: 
+- locations:
     - title
     - label_name
   terms:
     - WIP
-
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -29,7 +29,7 @@ env:
 jobs:
   build_debug:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:51
+    container: ghcr.io/acts-project/ubuntu2404:58
     steps:
 
       - uses: actions/checkout@v4
@@ -46,22 +46,10 @@ jobs:
         run: >
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          --preset=github-ci
           -DCMAKE_BUILD_TYPE=Debug
           -DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
-          -DACTS_BUILD_UNITTESTS=on
-          -DACTS_BUILD_EXAMPLES_UNITTESTS=off
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
           -DACTS_BUILD_ODD=OFF
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       - name: Build
         run: cmake --build build
       - name: ccache stats
@@ -98,7 +86,7 @@ jobs:
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:51
+    container: ghcr.io/acts-project/ubuntu2404:58
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
@@ -107,11 +95,10 @@ jobs:
       - name: Configure
         run: >
           cmake -B build -S .
-          -GNinja
+          --preset=github-ci
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
           -DCMAKE_CXX_FLAGS="-Werror"
-          -DACTS_BUILD_EVERYTHING=ON
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+          -DACTS_BUILD_ODD=OFF
       - name: Measure
         run: cmakeperf collect build/compile_commands.json -o perf.csv
       - name: Results

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -6,7 +6,7 @@ on:
       - closed
       - labeled
 
-concurrency: 
+concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -24,7 +24,7 @@ env:
 jobs:
   linux_ubuntu:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:51
+    container: ghcr.io/acts-project/ubuntu2404:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -47,32 +47,18 @@ jobs:
             ${{ runner.os  }}-ccache-linux_ubuntu_${{ env.CCACHE_KEY_SUFFIX }}_
 
       - name: Configure
-        # setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
+        # setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
         # dd4hep CMake configuration that gets triggered on recent CMake
         # versions
         # Need to set git user & email for patching to work (GeoModel plugin)
         run: >
-          git config --global user.name 'CI' && 
+          git config --global user.name 'CI' &&
           git config --global user.email '<>' &&
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
+          --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
           -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
-          -DACTS_BUILD_PLUGIN_GEOMODEL=ON
 
       - name: Build
         run: cmake --build build
@@ -111,7 +97,7 @@ jobs:
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
+          -DCMAKE_CXX_STANDARD=20
           -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
 
       - name: Downstream build
@@ -122,7 +108,7 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:51
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -159,7 +145,7 @@ jobs:
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:51
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -192,13 +178,16 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.6 matplotlib
+          && pip3 install histcmp==0.6.7 matplotlib
           && pip3 install -r Examples/Scripts/requirements.txt
           && /usr/local/bin/geant4-config --install-datasets
           && source build/this_acts_withdeps.sh
           && echo "::endgroup::"
           && CI/physmon/phys_perf_mon.sh all physmon
-          && cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Post step summary
+        if: always()
+        run: cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
 
       - uses: actions/upload-artifact@v4
         if: always()
@@ -239,13 +228,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - image: ubuntu2404
-            std: 17
-          - image: ubuntu2204_cpp20
+          - image: ubuntu2204
             std: 20
           - image: ubuntu2204_clang
-            std: 17
-    container: ghcr.io/acts-project/${{ matrix.image }}:51
+            std: 20
+    container: ghcr.io/acts-project/${{ matrix.image }}:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -269,27 +256,15 @@ jobs:
 
 
       - name: Configure
-        # setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
+        # setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
         # dd4hep CMake configuration that gets triggered on recent CMake
         # versions
         run: >
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
+          --preset=github-ci
           -DCMAKE_CXX_STANDARD=${{ matrix.std }}
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_FORCE_ASSERTIONS=OFF
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
 
       - name: Build
         run: cmake --build build
@@ -319,7 +294,7 @@ jobs:
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
+          -DCMAKE_CXX_STANDARD=${{ matrix.std }}
           -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
 
       - name: Downstream build
@@ -334,7 +309,7 @@ jobs:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8e12bbf.tar.zst
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v2.tar.zst
       # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
       DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
     steps:
@@ -351,11 +326,9 @@ jobs:
           brew install cmake ninja ccache xerces-c
           && wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.zst ${{ env.DEPENDENCY_URL }}
           && mkdir ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}
           && tar -xf deps.tar.zst -C ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}/python
-          && ${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3 -m pip install pyyaml jinja2
+          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
+          && python3 -m pip install pyyaml jinja2
 
       - name: Restore ccache
         uses: actions/cache/restore@v4
@@ -367,29 +340,14 @@ jobs:
             ${{ runner.os  }}-ccache_${{ 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 such as the one installed via homebrew
         run: >
           ccache -z
-          && source ${{ env.DEPENDENCY_DIR }}/setup.sh
+          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3
-          -DDD4HEP_DEBUG_CMAKE=ON
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
+          --preset=github-ci
+          -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
+          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-          -DCMAKE_PREFIX_PATH=/usr/local/acts
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
       - name: Build
         run: cmake --build build
       - name: ccache stats
@@ -412,17 +370,16 @@ jobs:
           path: ${{ env.INSTALL_DIR }}
       - name: Downstream configure
         run: >
-          source ${{ env.DEPENDENCY_DIR }}/setup.sh
+          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build-downstream -S Tests/DownstreamProject
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
+          -DCMAKE_CXX_STANDARD=20
           -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
       - name: Downstream build
         run: cmake --build build-downstream
       - name: Downstream run
-        run: |
-          source ${{ env.DEPENDENCY_DIR }}/setup.sh
-          source ${{ env.DEPENDENCY_DIR}}/dd4hep/*/bin/thisdd4hep.sh
-          ./build-downstream/bin/ShowActsVersion
+        run: >
+          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
+          && ./build-downstream/bin/ShowActsVersion