Merge branch 'main' into telescope-style-seeding

acts-project · Aug 22, 2024 · 133e026 · 133e026
2 parents e258805 + ecad6fd
commit 133e026
Show file tree

Hide file tree

Showing 222 changed files with 4,951 additions and 3,752 deletions.
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/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:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     steps:
 
       - uses: actions/checkout@v4
@@ -86,7 +86,7 @@ jobs:
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4

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:57
+    container: ghcr.io/acts-project/ubuntu2404:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -59,7 +59,6 @@ jobs:
           --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
           -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_GEOMODEL=ON
 
       - name: Build
         run: cmake --build build
@@ -109,7 +108,7 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:57
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -146,7 +145,7 @@ jobs:
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:57
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -233,7 +232,7 @@ jobs:
             std: 20
           - image: ubuntu2204_clang
             std: 20
-    container: ghcr.io/acts-project/${{ matrix.image }}:57
+    container: ghcr.io/acts-project/${{ matrix.image }}:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -349,8 +348,6 @@ jobs:
           -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
           -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-          -DACTS_BUILD_PLUGIN_GEOMODEL=ON
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
       - name: Build
         run: cmake --build build
       - name: ccache stats

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:57
+  image: ghcr.io/acts-project/ubuntu2404:58
   tags:
     - large
   artifacts:
@@ -55,7 +55,7 @@ clang_tidy:
 
 build_exatrkx_cpu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
   tags:
     - large
 
@@ -86,7 +86,7 @@ build_exatrkx_cpu:
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
   tags:
     - large
 
@@ -126,7 +126,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -136,7 +136,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -152,7 +152,7 @@ build_exatrkx:
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:57
+  image: ghcr.io/acts-project/ubuntu2404:58
 
   cache:
     key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
@@ -191,7 +191,7 @@ build_linux_ubuntu:
 
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:57
+  image: ghcr.io/acts-project/ubuntu2404:58
   needs: [build_linux_ubuntu]
 
   script:
@@ -212,7 +212,7 @@ linux_test_examples:
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:57
+  image: ghcr.io/acts-project/ubuntu2404:58
   needs: [build_linux_ubuntu]
 
   artifacts:
@@ -299,21 +299,21 @@ linux_ubuntu_2404:
   <<: *linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2404:57
+  image: ghcr.io/acts-project/ubuntu2404:58
 
 linux_ubuntu_2204_clang:
   <<: *linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2204_clang:52
+  image: ghcr.io/acts-project/ubuntu2204_clang:58
 
 
 ######################
 ### LCG JOB MATRIX ###
 ######################
 
 .lcg: &lcg_base_job
-  image: ghcr.io/acts-project/${OS}-base:57
+  image: ghcr.io/acts-project/${OS}-base:58
   stage: build
   tags:
     - cvmfs
@@ -364,6 +364,7 @@ linux_ubuntu_2204_clang:
       cmake -B build -S src
       --preset=gitlab-ci
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+      -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
     - cmake --build build -- -j2
@@ -372,19 +373,6 @@ linux_ubuntu_2204_clang:
     - ctest --test-dir build -j$(nproc)
 
 
-lcg_104:
-  <<: *lcg_base_job
-
-  variables:
-    LCG_VERSION: "104"
-
-  parallel:
-    matrix:
-      - OS: [alma9]
-        COMPILER:
-          - gcc13
-          - clang16
-
 lcg_105:
   <<: *lcg_base_job
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,9 @@ repos:
     rev: v3.2.0
     hooks:
     - id: trailing-whitespace
+      exclude: \.(diff|patch)$
     - id: end-of-file-fixer
+      exclude: \.(diff|patch)$
     - id: check-yaml
     - id: check-added-large-files
 
@@ -20,3 +22,9 @@ repos:
     rev: 24.4.2
     hooks:
     - id: black-jupyter
+
+  - repo: https://github.com/BlankSpruce/gersemi
+    rev: 0.15.0
+    hooks:
+    - id: gersemi
+      args: ["-i", "--no-warn-about-unknown-commands"]
diff --git a/Alignment/CMakeLists.txt b/Alignment/CMakeLists.txt
@@ -1,21 +1,18 @@
-add_library(ActsAlignment SHARED
-  src/Kernel/detail/AlignmentEngine.cpp)
+add_library(ActsAlignment SHARED src/Kernel/detail/AlignmentEngine.cpp)
 
 target_include_directories(
-  ActsAlignment
-  PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    ActsAlignment
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 
-target_link_libraries(
-  ActsAlignment
-  PUBLIC ActsCore)
+target_link_libraries(ActsAlignment PUBLIC ActsCore)
 
 install(
-  TARGETS ActsAlignment
-  EXPORT ActsAlignmentTargets
+    TARGETS ActsAlignment
+    EXPORT ActsAlignmentTargets
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(
-  DIRECTORY include/ActsAlignment
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+install(DIRECTORY include/ActsAlignment DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root