Skip to content

Commit

Permalink
Merge branch 'main' into root_comparison
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger authored May 28, 2024
2 parents c37bc95 + a25c1da commit 672329b
Show file tree
Hide file tree
Showing 472 changed files with 10,572 additions and 10,209 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ IncludeCategories:
# Acts headers before system headers to ensure that they include what they use
- Regex: '^(<|")Acts.*'
Priority: 1
- Regex: '^(<|")ACTFW/.*'
- Regex: '^(<|")ActsExamples/.*'
Priority: 1
# standard library includes: '<...>' without any '/' or '.' in the path
- Regex: '^<[^/.]*>'
Expand Down
22 changes: 21 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
---
Checks: '-*,readability-container-size-empty,readability-implicit-bool-cast,readability-implicit-bool-conversion,modernize-concat-nested-namespaces,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'
Checks: '-*, \
clang-analyzer-optin.cplusplus.UninitializedObject, \
cppcoreguidelines-init-variables, \
cppcoreguidelines-pro-type-member-init, \
google-readability-casting, \
modernize-concat-nested-namespaces, \
modernize-use-equals-default, \
modernize-use-default-member-init, \
modernize-use-nullptr, \
modernize-use-override, \
modernize-use-using, \
performance-for-range-copy, \
performance-move-const-arg, \
performance-unnecessary-value-param, \
readability-braces-around-statements, \
readability-container-size-empty, \
readability-implicit-bool-cast, \
readability-implicit-bool-conversion, \
readability-inconsistent-declaration-parameter-name, \
readability-named-parameter, \
readability-operators-representation'
HeaderFilterRegex: '.*(?<!nlohmann\/json)\.(hpp|cpp|ipp)$'
AnalyzeTemporaryDtors: true
CheckOptions:
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
paths-ignore:
- "docs/**"

concurrency:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/ccache
key: ${{ runner.os }}-ccache-linux_ubuntu_debug_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
Expand Down Expand Up @@ -63,13 +63,15 @@ jobs:
&& du -sh build
- name: Coverage
run: >
pip3 install gcovr==6.0
pip3 install gcovr==7.2
&& cd build
&& /usr/bin/python3 ../CI/test_coverage.py
- name: Upload coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./build/coverage/cov.xml
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }} # required

build_performance:
runs-on: ubuntu-latest
Expand All @@ -95,7 +97,7 @@ jobs:
with:
name: cmakeperf
path: perf.csv

metric_tracking:
runs-on: ubuntu-latest
needs: build_performance
Expand Down
46 changes: 1 addition & 45 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -515,48 +515,4 @@ jobs:
run: cmake --build build-downstream
- name: Downstream run
run: ./build-downstream/bin/ShowActsVersion


sycl:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2004_oneapi:v41
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v4

- name: Restore ccache
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
key: ${{ runner.os }}-ccache-sycl_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
restore-keys: |
${{ runner.os }}-ccache-sycl_${{ env.CCACHE_KEY_SUFFIX }}_
- name: Configure
run: >
source /opt/intel/oneapi/setvars.sh
&& ccache -z
&& cmake -B build -S .
-GNinja
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DCMAKE_CXX_COMPILER=/opt/intel/oneapi/compiler/2022.0.2/linux/bin-llvm/clang++
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DACTS_SETUP_VECMEM=ON
-DACTS_BUILD_PLUGIN_SYCL=ON
-DACTS_BUILD_UNITTESTS=ON
- name: Build
run: >
source /opt/intel/oneapi/setvars.sh
&& cmake --build build
- name: ccache stats
run: ccache -s
- name: Save ccache
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
key: ${{ steps.ccache-restore.outputs.cache-primary-key }}

39 changes: 29 additions & 10 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install black
Expand All @@ -43,7 +43,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -81,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -98,7 +98,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -108,7 +108,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
Expand All @@ -118,7 +118,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install codespell
Expand All @@ -141,7 +141,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install dependencies
Expand All @@ -154,9 +154,28 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
run: >
CI/check_unused_files.py
codegen:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install dependencies
run: >
pip install -r codegen/requirements.txt
- name: Check
run: >
CI/check_codegen
- uses: actions/upload-artifact@v4
if: failure()
with:
name: changed
path: changed
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
docs:
runs-on: ubuntu-latest
env:
DOXYGEN_WARN_AS_ERROR: FAIL_ON_WARNINGS
DOXYGEN_VERSION: 1.9.8
DOXYGEN_WARN_AS_ERROR: FAIL_ON_WARNINGS
DOXYGEN_VERSION: 1.9.8
steps:
- uses: actions/checkout@v4

- name: Cache doxygen
id: cache-doxygen
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /usr/local/bin/doxygen
key: doxygen_${{ env.DOXYGEN_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
name: Validate PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v4
- uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'

- run: pip install -r CI/release_requirements.txt

- name: Create release
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4

- name: 'Download artifact'
uses: actions/github-script@v6
uses: actions/github-script@v7
id: dl-af
with:
script: |
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:


- name: 'Determine PR number'
uses: actions/github-script@v6
uses: actions/github-script@v7
id: get-pr-number
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
if: steps.get-pr-number.outputs.result != 'false'
run: curl -sL $ARTIFACT_URL

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'

Expand All @@ -103,7 +103,7 @@ jobs:
- name: Find Comment
if: steps.get-pr-number.outputs.result != 'false'
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
id: fc
with:
issue-number: ${{ steps.get-pr-number.outputs.result }}
Expand All @@ -112,7 +112,7 @@ jobs:

- name: Create or update comment
if: steps.get-pr-number.outputs.result != 'false'
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v4
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ steps.get-pr-number.outputs.result }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
Expand Down
38 changes: 38 additions & 0 deletions CI/check_codegen
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash

set -e # abort on error

# get script directory
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
REPO_DIR="$SCRIPT_DIR/.."

mkdir -p $REPO_DIR/Core/src/Propagator/codegen
mkdir -p $REPO_DIR/Core/src/Propagator/detail/codegen

# run code generation
export PYTHONPATH=$REPO_DIR/codegen:$PYTHONPATH
python $REPO_DIR/codegen/generate_sympy_stepper.py > $REPO_DIR/Core/src/Propagator/codegen/sympy_stepper_math.hpp
python $REPO_DIR/codegen/generate_sympy_jac.py > $REPO_DIR/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp
python $REPO_DIR/codegen/generate_sympy_cov.py > $REPO_DIR/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp

_format=${CLANG_FORMAT_BINARY:-clang-format}
$_format --version
$_format -i -style=file $REPO_DIR/Core/src/Propagator/codegen/sympy_stepper_math.hpp
$_format -i -style=file $REPO_DIR/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp
$_format -i -style=file $REPO_DIR/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp

if ! [ -z $CI ] || ! [ -z $GITHUB_ACTIONS ]; then
mkdir changed
for f in $(git diff --name-only); do
cp --parents $f changed
done
fi

echo "\033[32mINFO\033[0m"\
"codegen done"

set +e
git diff --exit-code --stat
result=$?

exit $result
4 changes: 2 additions & 2 deletions CI/check_format
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ if ! [ -z $CI ] || ! [ -z $GITHUB_ACTIONS ]; then
cp --parents $f changed
done
fi

echo "\033[32mINFO\033[0m"\
"clang-format done"

set +e
git diff --exit-code --stat
result=$?
Expand Down
Loading

0 comments on commit 672329b

Please sign in to comment.