Merge remote-tracking branch 'origin/main' into releases

acts-project · Jan 19, 2024 · f766705 · f766705
2 parents 1d2e90f + b6480f7
commit f766705
Show file tree

Hide file tree

Showing 458 changed files with 15,371 additions and 7,332 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -8,7 +8,7 @@ on:
       - 'release/**'
       - 'develop/**'
 
-concurrency: 
+concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
@@ -33,9 +33,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install black
-        run: pip install black==22.3.0
+        run: pip install black==23.12.1
       - name: Run black format check
         run: black --check . --extend-exclude ".*thirdparty.*"
 
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           sudo apt-get install -y git
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           CI/check_include_guards.py . --fail-global --exclude "*thirdparty/*"
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           CI/check_size_t.py . --exclude "thirdparty/*"
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           CI/check_smearing_config.py .
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           docs/parse_cmake_options.py CMakeLists.txt --write docs/getting_started.md --verify
@@ -120,7 +120,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install codespell
         run: >
           pip install codespell==2.2.5
@@ -143,7 +143,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install dependencies
         run: >
           pip install -r CI/requirements_fpe_masks.txt
@@ -156,7 +156,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Check
         run: >
           CI/check_unused_files.py
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -8,7 +8,7 @@ on:
       - 'release/**'
       - 'develop/**'
 
-concurrency: 
+concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
         DOXYGEN_WARN_AS_ERROR: FAIL_ON_WARNINGS
-        DOXYGEN_VERSION: 1.9.4
+        DOXYGEN_VERSION: 1.9.8
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml
@@ -57,7 +57,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             if(!${{ steps.dl-af.outputs.result }}) {
-              console.log("No artifact => no PR numner");
+              console.log("No artifact => no PR number");
               return false;
             }
             let fs = require('fs');
@@ -86,7 +86,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Render comment
         if: steps.get-pr-number.outputs.result != 'false'

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -13,22 +13,22 @@ clang_tidy:
     paths:
       - src/clang-tidy/
     when: always
-    expire_in: 2 weeks
+    expire_in: 1 week
   script:
-    - git clone $CLONE_URL src 
+    - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
     - >
         apt-get update
-        && apt-get install -y g++-8 libstdc++-8-dev parallel software-properties-common 
+        && apt-get install -y g++-8 libstdc++-8-dev parallel software-properties-common
         && curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
         && add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main'
         && apt-get install -y clang-17 clang-tidy-17
         && ln -s /usr/bin/clang++-17 /usr/bin/clang++
         && ln -s /usr/bin/clang-17 /usr/bin/clang
         && ln -s /usr/bin/clang-tidy-17 /usr/bin/clang-tidy
         && mkdir -p /opt/lib/gcc/x86_64-linux-gnu
-        && ln -s /usr/lib/gcc/x86_64-linux-gnu/8/ /opt/lib/gcc/x86_64-linux-gnu/ 
+        && ln -s /usr/lib/gcc/x86_64-linux-gnu/8/ /opt/lib/gcc/x86_64-linux-gnu/
         && clang++ --gcc-toolchain=/opt -v
     - >
         cmake -B build -S .
@@ -48,9 +48,9 @@ clang_tidy:
 
     # Parse the main clang-tidy run
     - >
-        CI/clang_tidy/parse_clang_tidy.py 
-        clang-tidy/clang-tidy.log 
-        clang-tidy/clang-tidy.json 
+        CI/clang_tidy/parse_clang_tidy.py
+        clang-tidy/clang-tidy.log
+        clang-tidy/clang-tidy.json
         --exclude "*thirdparty*"
         --exclude "*ActsPodioEdm*"
 
@@ -77,6 +77,7 @@ build_exatrkx:
     exclude:
       - build/**/*.o
       - build/bin/ActsIntegrationTest*
+    expire_in: 6 hours
 
   script:
     - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
@@ -132,7 +133,7 @@ test_exatrkx_python:
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
-    - pip3 install -r Examples/Python/tests/requirements.txt
+    - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt
     - nvidia-smi
     - pytest -rFsv -k test_exatrkx
 
@@ -153,6 +154,7 @@ build_linux_ubuntu:
       - build/bin/ActsUnitTest*
       - build/bin/ActsIntegrationTest*
       - build/**/*.o
+    expire_in: 1 day
 
   script:
     - echo $PATH
@@ -172,7 +174,7 @@ build_linux_ubuntu:
       -DCMAKE_BUILD_TYPE=RelWithDebInfo
       -DCMAKE_CXX_FLAGS=-Werror
       -DCMAKE_CXX_STANDARD=17
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON 
+      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
       -DACTS_BUILD_EVERYTHING=ON
       -DACTS_BUILD_ODD=ON
       -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
@@ -222,6 +224,7 @@ linux_physmon:
     when: always
     paths:
       - src/physmon
+    expire_in: 1 week
 
   script:
     - apt-get update && apt-get install -y git-lfs
@@ -279,7 +282,7 @@ linux_physmon:
       -DCMAKE_BUILD_TYPE=Release
       -DCMAKE_CXX_FLAGS=-Werror
       -DCMAKE_CXX_STANDARD=${CXXSTD}
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON 
+      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
       -DACTS_BUILD_EVERYTHING=ON
       -DACTS_BUILD_ODD=ON
       -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
@@ -294,12 +297,12 @@ linux_physmon:
 
     - ctest --test-dir build -j$(nproc)
     - cmake --build build --target integrationtests
-      
+
     # Install main project
     - cmake --install build
 
     # Downstream configure
-    - > 
+    - >
       cmake -B build-downstream -S src/Tests/DownstreamProject
       -GNinja
       -DCMAKE_BUILD_TYPE=Release
@@ -345,7 +348,7 @@ linux_ubuntu_2204_clang:
   variables:
     INSTALL_DIR: ${{ github.workspace }}/install
 
-    SETUP: 
+    SETUP:
 
   cache:
     key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
@@ -359,27 +362,27 @@ linux_ubuntu_2204_clang:
 
     # Figure out LCG platform name based on version number and OS
     - >
-      if [ "$OS" = "alma9"  ]; then 
-        if [ "$LCG_VERSION" = "104" ]; then 
+      if [ "$OS" = "alma9"  ]; then
+        if [ "$LCG_VERSION" = "104" ]; then
           export LCG_PLATFORM="el9"
         else
           export LCG_PLATFORM="centos9"
         fi
-      else 
+      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
-      
+
     - git clone $CLONE_URL src
 
     - cd src
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
     - cd ..
-    
+
     - ccache --version
 
   script:
@@ -443,8 +446,6 @@ lcg_104:
   parallel:
     matrix:
       - OS: [alma9]
-        COMPILER: 
+        COMPILER:
           - gcc13
           - clang16
-
-
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,10 +3,17 @@ repos:
     rev: 'v14.0.0'
     hooks:
       - id: clang-format
+        files: ".*\\.(cpp|hpp|ipp|cu|cuh)$"
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.2.0
     hooks:
     - id: trailing-whitespace
     - id: end-of-file-fixer
     - id: check-yaml
     - id: check-added-large-files
+
+  - repo: https://github.com/psf/black
+    rev: 23.12.1
+    hooks:
+    - id: black
diff --git a/CI/check_include_guards.py b/CI/check_include_guards.py
@@ -60,7 +60,6 @@ def check_include_guards(file):
 
     if valid_global or len(match_local) > 1:
         for m in match_local:
-
             lineno = text[: m.start()].count("\n") + 1
 
             valid_local = False

diff --git a/CI/check_license.py b/CI/check_license.py
@@ -191,7 +191,6 @@ def year_print(*pargs):
     nsrcs = len(srcs)
     step = int(nsrcs / 20)
     for i, src in enumerate(srcs):
-
         if any([fnmatch(src, e) for e in args.exclude]):
             continue
 
@@ -267,7 +266,6 @@ def year_print(*pargs):
                         valid = False
 
                     if args.check_years:
-
                         if git_add_year != git_mod_year:
                             # need year range in licence
                             if not (year1 and year2):
@@ -308,7 +306,6 @@ def year_print(*pargs):
                                     int(year1) != git_add_year
                                     or int(year2) != git_mod_year
                                 ):
-
                                     year_print("File: {}".format(src))
                                     year_print(
                                         "Year range {}-{} does not match range from git {}-{}".format(

diff --git a/CI/check_smearing_config.py b/CI/check_smearing_config.py
@@ -59,7 +59,6 @@
     ref = ifile.read()
 
 for i, (line_ref, line_gen) in enumerate(zip(ref.split("\n"), output.split("\n"))):
-
     lhs = line_ref.strip()
     rhs = line_gen.strip()