Merge remote-tracking branch 'origin/main' into normal-imprv-only

acts-project · Nov 8, 2023 · f08e295 · f08e295
2 parents f120883 + de6b940
commit f08e295
Show file tree

Hide file tree

Showing 1,105 changed files with 24,028 additions and 10,339 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,4 +1,7 @@
 ---
-Checks: '-*,readability-container-size-empty,readability-implicit-bool-cast,readability-implicit-bool-conversion,modernize-use-equals-default,modernize-use-override,modernize-use-using,readability-braces-around-statements,modernize-use-nullptr,performance-move-const-arg,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-init-variables,clang-analyzer-optin.cplusplus.UninitializedObject'
+Checks: '-*,readability-container-size-empty,readability-implicit-bool-cast,readability-implicit-bool-conversion,modernize-use-equals-default,modernize-use-override,modernize-use-using,readability-braces-around-statements,modernize-use-nullptr,performance-move-const-arg,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-init-variables,clang-analyzer-optin.cplusplus.UninitializedObject,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
@@ -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/analysis.yml b/.github/workflows/analysis.yml
@@ -63,9 +63,9 @@ jobs:
           && du -sh build
       - name: Coverage
         run: >
-          pip3 install gcovr==5.0
+          pip3 install gcovr==6.0
           && cd build
-          && /usr/bin/python3 ../CI/test_coverage
+          && /usr/bin/python3 ../CI/test_coverage.py
       - name: Upload coverage
         uses: codecov/codecov-action@v3
         with:

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=OFF
-          -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/docs.yml b/.github/workflows/docs.yml
@@ -15,21 +15,43 @@ concurrency:
 jobs:
   docs:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2204:v41
     env:
         DOXYGEN_WARN_AS_ERROR: FAIL_ON_WARNINGS
+        DOXYGEN_VERSION: 1.9.4
     steps:
       - uses: actions/checkout@v3
+
+      - name: Cache doxygen
+        id: cache-doxygen
+        uses: actions/cache@v3
+        with:
+          path: /usr/local/bin/doxygen
+          key: doxygen_${{ env.DOXYGEN_VERSION }}
+
+      - name: Install doxygen
+        if: steps.cache-doxygen.outputs.cache-hit != 'true'
+        run: >
+          curl -SL https://sourceforge.net/projects/doxygen/files/rel-${{ env.DOXYGEN_VERSION }}/doxygen-${{ env.DOXYGEN_VERSION }}.linux.bin.tar.gz/download | tar -xzC .
+          && mv doxygen-${{ env.DOXYGEN_VERSION }}/bin/doxygen /usr/local/bin/doxygen
+
       - name: Install dependencies
         run: >
-          curl -SL https://sourceforge.net/projects/doxygen/files/rel-1.9.4/doxygen-1.9.4.linux.bin.tar.gz/download | tar -xzC .
-          && mv doxygen-1.9.4/bin/doxygen /usr/local/bin/doxygen
-          && pip3 install --upgrade pip
+          pip3 install --upgrade pip
           && pip install -r docs/requirements.txt
-      - name: Configure
-        run: cmake -B build -S . -GNinja -DACTS_BUILD_DOCS=ON
-      - name: Build
-        run: cmake --build build --target docs-with-api
+
+      - name: Build documentation
+        run: >
+          cd docs
+          && sphinx-build
+          -b html
+          -d _build/doctrees/
+          -j auto
+          -W
+          --keep-going
+          -t run_doxygen
+          -b linkcheck
+          . _build/html/
+
       - uses: actions/upload-artifact@v3
         with:
           name: acts-docs

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