Merge remote-tracking branch 'acts-project/main' into 240916-trackjets

Author: gagnonlg

.clang-format

@@ -27,3 +27,4 @@ IncludeCategories:
   - Regex:    '^<.*>'
     Priority: 3
   # all headers not explicitly listed will be assigned to the last group
+IncludeIsMainSourceRegex: '(\.cpp)|(\.ipp)$'

.github/actions/dependencies/action.yml

@@ -13,7 +13,7 @@ inputs:
   spack_version:
     description: 'Version of Spack to use'
     required: false
-    default: 'develop-2025-04-20'
+    default: 'develop-2025-06-08'
 
 runs:
   using: 'composite'

.github/workflows/analysis.yml

@@ -22,7 +22,7 @@ env:
   CCACHE_MAXSIZE: 1.25G
   CCACHE_KEY_SUFFIX: r2
   ACTS_LOG_FAILURE_THRESHOLD: WARNING
-  DEPENDENCY_TAG: v9.0.0
+  DEPENDENCY_TAG: v11.1.0
 
 # NOTE this only builds core unittests to reduce the output size. if we
 #      found a way to have Github actions not fail regularly with this job

.github/workflows/builds.yml

@@ -20,7 +20,7 @@ env:
   CCACHE_DIR: ${{ github.workspace }}/ccache
   CCACHE_MAXSIZE: 500M
   CCACHE_KEY_SUFFIX: r2
-  DEPENDENCY_TAG: v9.0.0
+  DEPENDENCY_TAG: v11.1.0
 
 jobs:
   linux_ubuntu:
@@ -339,7 +339,7 @@ jobs:
         run: ./build-downstream/bin/ShowActsVersion
 
   macos:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -350,6 +350,11 @@ jobs:
           submodules: true
           lfs: true
 
+      - name: Setup Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "16.3.0"
+
       - name: Install dependencies
         uses: ./.github/actions/dependencies
         with:

.gitlab-ci.yml

@@ -4,10 +4,10 @@ variables:
   CCACHE_KEY_SUFFIX: r2
   CTEST_OUTPUT_ON_FAILURE: 1
 
-  SPACK_VERSION: develop-2025-04-20
+  SPACK_VERSION: develop-2025-06-08
   LOCKFILE_CACHE_DIR: ${CI_PROJECT_DIR}/spack_lockfile_cache
 
-  DEPENDENCY_TAG: v9.0.0
+  DEPENDENCY_TAG: v11.1.0
 
 .ccache_base:
   cache:
@@ -155,14 +155,6 @@ build_exatrkx:
     expire_in: 6 hours
 
   script:
-    # For now, we need to build boost to get the dependencies for the libraries
-    - curl --silent https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 --output boost_1_87_0.tar.bz2
-    - tar --bzip2 -xf boost_1_87_0.tar.bz2
-    - cd boost_1_87_0
-    - ./bootstrap.sh --prefix=${CI_PROJECT_DIR}/boost-install --with-libraries=regex,graph,program_options,test
-    - ./b2 install
-    - cd ..
-    - rm -rf boost_1_87_0*
     - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
     - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH
     - echo $PATH
@@ -177,7 +169,6 @@ build_exatrkx:
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
-      -DBoost_DIR=${CI_PROJECT_DIR}/boost-install/lib/cmake/Boost-1.87.0
 
     - ccache -z
     - cmake --build build -- -j6
@@ -545,18 +536,6 @@ linux_ubuntu_2404_clang19:
     - ctest --test-dir build -j$(nproc)
 
 
-lcg_105:
-  extends: .lcg_base_job
-
-  variables:
-    LCG_VERSION: "105"
-
-  parallel:
-    matrix:
-      - OS: [alma9]
-        COMPILER:
-          - gcc13
-          - clang16
 
 lcg_106a:
   extends: .lcg_base_job

.pre-commit-config.yaml

@@ -63,7 +63,7 @@ repos:
       name: pragma_once
       language: system
       entry: CI/check_pragma_once.sh
-      files: \.hpp$
+      files: \.(hpp|ipp)$
 
   - repo: local
     hooks:

Alignment/include/ActsAlignment/Kernel/Alignment.ipp

@@ -6,6 +6,10 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#pragma once
+
+#include "ActsAlignment/Kernel/Alignment.hpp"
+
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
 

CI/check_pragma_once.sh

@@ -5,7 +5,7 @@ ec=0
 files="$@"
 
 if [ -z "$files" ]; then
-    files=$(find Core Examples Tests Plugins -name "*.hpp")
+    files=$(find Core Examples Tests Plugins -name "*.hpp" -o -name "*.ipp")
 fi
 
 for file in $files; do

CI/dependencies/select_lockfile.py

@@ -10,12 +10,42 @@
 import hashlib
 import tempfile
 from pathlib import Path
-from typing import Tuple, Dict, Optional
+from typing import Tuple, Dict, Optional, Callable, TypeVar, Any
 import contextlib
+import time
+import functools
+from contextvars import ContextVar
 
 # Modify the default cache dir to use a temporary directory
 DEFAULT_CACHE_SIZE_LIMIT = 1 * 1024 * 1024  # 1MB
 
+T = TypeVar("T")
+remaining_retries: ContextVar[int] = ContextVar("remaining_retries", default=0)
+
+
+def retry_on_http_error(max_retries: int = 3, base_delay: float = 1.0):
+    def decorator(func: Callable[..., T]) -> Callable[..., T]:
+        @functools.wraps(func)
+        def wrapper(*args: Any, **kwargs: Any) -> T:
+            for attempt in range(max_retries):
+                remaining_retries.set(max_retries - attempt - 1)
+                try:
+                    return func(*args, **kwargs)
+                except urllib.error.HTTPError as e:
+                    if attempt < max_retries - 1:
+                        delay = base_delay * (2**attempt)
+                        print(
+                            f"Got HTTP error {e.code}, retrying in {delay} seconds..."
+                        )
+                        time.sleep(delay)
+                        continue
+                    raise
+            return func(*args, **kwargs)  # Final attempt
+
+        return wrapper
+
+    return decorator
+
 
 def compute_cache_key(url: str) -> str:
     """Compute a cache key for a URL"""
@@ -76,11 +106,17 @@ def prune_cache(cache_dir: Optional[Path], size_limit: int):
     update_cache_digest(cache_dir)
 
 
+@retry_on_http_error()
 def fetch_github(base_url: str, cache_dir: Optional[Path], cache_limit: int) -> bytes:
     headers = {}
     token = os.environ.get("GITHUB_TOKEN")
-    if token is not None and token != "":
-        headers["Authorization"] = f"token {token}"
+
+    # Only add auth header if we have retries left
+    if token is not None and token != "" and remaining_retries.get() > 0:
+        headers["Authorization"] = f"Bearer {token}"
+
+    print(f"Remaining retries: {remaining_retries.get()} for {base_url}")
+    print(headers)
 
     with contextlib.ExitStack() as stack:
         if cache_dir is not None:

CI/dependencies/setup.sh

@@ -188,10 +188,7 @@ time spack -e "${env_dir}" find
 end_section
 
 start_section "Install spack packages"
-NCPUS=4 # set fixes low-ish number to avoid deadlocks
-time "${SCRIPT_DIR}"/parallel.sh "$NCPUS" spack -e "${env_dir}" install --fail-fast --use-buildcache only \
-  | tee install.log \
-  | grep -v "^Waiting\|^\[+\]"
+time spack -e "${env_dir}" install --fail-fast --use-buildcache only --concurrent-packages 10
 end_section
 
 start_section "Patch up Geant4 data directory"

CI/fix_pragma.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 import argparse
 import os
 from glob import glob
@@ -37,15 +38,13 @@ def main():
     if os.path.isfile(args.input):
         headers = [args.input]
     elif os.path.isdir(args.input):
-        patterns = ["**/*.hpp", "**/*.h"]
+        patterns = ["**/*.hpp", "**/*.ipp"]
         headers = sum(
             [glob(os.path.join(args.input, p), recursive=True) for p in patterns], []
         )
     else:
         headers = glob(args.input, recursive=True)
 
-    # for h in headers: print(h)
-
     for h in headers:
         fix_pragma(h)
 

CI/missing_include_check.sh

@@ -3,13 +3,13 @@
 RET=0
 ERRORS=0
 
-FILES=$(find  Core/include/ -name "*.hpp" | grep -v "/detail/")
+FILES=$(find Core/include/ -type f -name "*.hpp" -o -name "*.ipp")
 N_FILES=$(echo "$FILES" | wc -l)
 echo "Check $N_FILES files"
 
 ITER=0
 
-for file in $(find  Core/include/ -name "*.hpp" | grep -v "/detail/"); do
+for file in $FILES; do
     ITER=$((ITER+1))
     echo "$(date +%H:%M:%S)    $((100*ITER/N_FILES))%   check $file"
     out=$(printf "#include <${file:13}>\nint main() { return 0; }" | clang++ -std=c++20 -O0 -c -I "Core/include" -I "/usr/include/eigen3" -x c++ - 2>&1)

CMakeLists.txt

@@ -76,7 +76,6 @@ option(ACTS_USE_SYSTEM_MODULEMAPGRAPH "Use a system installation of ModuleMapGra
 option(ACTS_USE_SYSTEM_EIGEN3 "Use a system-provided eigen3" ON)
 
 option(ACTS_BUILD_PLUGIN_ACTSVG "Build SVG display plugin" OFF)
-option(ACTS_BUILD_PLUGIN_CUDA "Build CUDA plugin" OFF)
 option(ACTS_BUILD_PLUGIN_DD4HEP "Build DD4hep plugin" OFF)
 option(ACTS_BUILD_PLUGIN_PODIO "Build Podio plugin" OFF)
 option(ACTS_BUILD_PLUGIN_EDM4HEP "Build EDM4hep plugin" OFF)
@@ -92,9 +91,8 @@ option(ACTS_EXATRKX_ENABLE_CUDA "Enable CUDA for the exatrkx plugin" OFF)
 option(ACTS_EXATRKX_ENABLE_MODULEMAP "Enable Module-Map-based graph construction" OFF)
 option(ACTS_EXATRKX_ENABLE_TENSORRT "Enable the native TensorRT inference modules" OFF)
 option(ACTS_BUILD_PLUGIN_JSON "Build json plugin" OFF)
-option(ACTS_BUILD_PLUGIN_LEGACY "Build legacy plugin" OFF)
 option(ACTS_BUILD_PLUGIN_ONNX "Build ONNX plugin" OFF)
-option(ACTS_BUILD_PLUGIN_TGEO "Build TGeo plugin" OFF)
+option(ACTS_BUILD_PLUGIN_ROOT "Build ROOT plugin" OFF)
 option(ACTS_SETUP_ANNOY "Explicitly set up Annoy for the project" OFF)
 option(ACTS_BUILD_PLUGIN_HASHING "Build Hashing plugin" OFF)
 # fatras related options
@@ -166,7 +164,7 @@ set_option_if(
   ACTS_BUILD_EXAMPLES_EDM4HEP
 )
 set_option_if(
-  ACTS_BUILD_PLUGIN_PODIO
+  ACTS_BUILD_EXAMPLES_PODIO
   ACTS_BUILD_EXAMPLES_EDM4HEP
 )
 set_option_if(
@@ -178,13 +176,13 @@ set_option_if(
     ACTS_BUILD_EXAMPLES_GEANT4
 )
 set_option_if(
-  ACTS_BUILD_PLUGIN_TGEO
+  ACTS_BUILD_PLUGIN_ROOT
   ACTS_BUILD_PLUGIN_DD4HEP OR
   ACTS_BUILD_EXAMPLES
 )
 set_option_if(
   ACTS_BUILD_PLUGIN_IDENTIFICATION
-  ACTS_BUILD_PLUGIN_TGEO OR
+  ACTS_BUILD_PLUGIN_ROOT OR
   ACTS_BUILD_PLUGIN_PODIO OR
   ACTS_BUILD_EXAMPLES
 )
@@ -270,27 +268,29 @@ endif()
 # they can be easily upgraded, although they might not be used if the
 # dependency is included via `add_subdirectory(...)`.
 set(_acts_actsvg_version 0.4.56)
-set(_acts_boost_version 1.71.0)
-set(_acts_dd4hep_version 1.21)
+set(_acts_boost_version 1.77.0) # first version with C++20 support
+set(_acts_dd4hep_version 1.26)
 set(_acts_geant4_version 11.1.3)
-set(_acts_edm4hep_version 0.7)
+set(_acts_edm4hep_version 0.10.5)
 set(_acts_eigen3_version 3.4.0)
 set(_acts_podio_version 1.0.1) # will try this first
-set(_acts_podio_fallback_version 0.16) # if not found, will try this one
+set(_acts_podio_fallback_version 0.17.4) # if not found, will try this one
 set(_acts_doxygen_version 1.9.4)
-set(_acts_hepmc3_version 3.2.1)
+set(_acts_hepmc3_version 3.2.4)
 set(_acts_nlohmanjson_version 3.10.5)
 set(_acts_onnxruntime_version 1.12.0)
-set(_acts_root_version 6.20)
+set(_acts_geomodel_version 6.3.0)
+set(_acts_root_version 6.28.04) # first version with C++20 support
 set(_acts_tbb_version 2020.1)
-set(_acts_pythia8_version 8.309)
+set(_acts_pythia8_version 8.310)
 set(_acts_pybind11_version 2.13.1)
-set(_acts_detray_version 0.89.0)
-set(_acts_traccc_version 0.20.0)
-set(_acts_covfie_version 0.12.1)
-set(_acts_vecmem_version 1.14.0)
-set(_acts_algebraplugins_version 0.26.2)
+set(_acts_detray_version 0.98.0)
+set(_acts_traccc_version 0.22.0)
+set(_acts_covfie_version 0.13.0)
+set(_acts_vecmem_version 1.17.0)
+set(_acts_algebraplugins_version 0.27.0)
 set(_acts_annoy_version 1.17.3)
+set(_acts_fastjet_version 3.4.1)
 
 # recommended dependency version. if there is an opportunity to reach
 # this version we will try so.
@@ -383,9 +383,6 @@ if(ACTS_BUILD_PLUGIN_ACTSVG)
         add_subdirectory(thirdparty/actsvg)
     endif()
 endif()
-if(ACTS_BUILD_PLUGIN_CUDA)
-    enable_cuda()
-endif()
 if(ACTS_BUILD_PLUGIN_DD4HEP)
     # Explicitly find python so we can more easily override the version
     find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development)
@@ -405,7 +402,6 @@ if(ACTS_BUILD_PLUGIN_JSON)
     endif()
 endif()
 if(ACTS_BUILD_PLUGIN_FASTJET)
-    set(_acts_fastjet_version 3.4.0)
     find_package(FastJet ${_acts_fastjet_version} REQUIRED)
 endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
@@ -417,18 +413,16 @@ if(ACTS_BUILD_PLUGIN_GEOMODEL)
         )
     endif()
 
-    set(_gm_ver_min 6.3.0)
-
-    if(GeoModelCore_VERSION VERSION_LESS _gm_ver_min)
+    if(GeoModelCore_VERSION VERSION_LESS _acts_geomodel_version)
         message(
             FATAL_ERROR
-            "GeoModel version ${GeoModelCore_VERSION} is insufficient. Please install GeoModel version ${_gm_ver_min} or newer."
+            "GeoModel version ${GeoModelCore_VERSION} is insufficient. Please install GeoModel version ${_acts_geomodel_version} or newer."
         )
     endif()
     # find other GeoModel components of EXACT same version
     find_package(GeoModelIO ${GeoModelCore_VERSION} REQUIRED EXACT CONFIG)
 endif()
-if(ACTS_BUILD_PLUGIN_TGEO)
+if(ACTS_BUILD_PLUGIN_ROOT)
     find_package(
         ROOT
         ${_acts_root_version}
@@ -449,15 +443,17 @@ if(ACTS_BUILD_ANALYSIS_APPS)
     check_root_compatibility()
 endif()
 if(ACTS_BUILD_PLUGIN_EXATRKX)
-    find_package(Torch REQUIRED)
     if(ACTS_EXATRKX_ENABLE_CUDA)
         find_package(CUDAToolkit REQUIRED)
         enable_cuda()
-        add_subdirectory(thirdparty/FRNN)
         message(STATUS "Build Exa.TrkX plugin with CUDA")
     else()
         message(STATUS "Build Exa.TrkX plugin for CPU only")
     endif()
+    if(ACTS_EXATRKX_ENABLE_TORCH)
+        find_package(Torch REQUIRED)
+        add_subdirectory(thirdparty/FRNN)
+    endif()
     if(ACTS_EXATRKX_ENABLE_MODULEMAP)
         if(ACTS_USE_SYSTEM_MODULEMAPGRAPH)
             find_package(ModuleMapGraph REQUIRED COMPONENTS CPU GPU)