Skip to content

Commit

Permalink
Merge branch 'main' into compile-time-PPP-SSS
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisFelipeCoelho authored Aug 28, 2023
2 parents cd04769 + c535c5d commit 6063a55
Show file tree
Hide file tree
Showing 530 changed files with 15,243 additions and 7,269 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ jobs:
- name: Python level tests
shell: bash
env:
PYTEST_MD_REPORT: true
PYTEST_MD_REPORT_VERBOSE: 0
PYTEST_MD_REPORT_OUTPUT: pytest.md
run: >
/usr/local/bin/geant4-config --install-datasets
&& source /usr/local/bin/thisroot.sh
Expand All @@ -266,7 +270,9 @@ jobs:
&& export PYTHONPATH=/usr/local/python:$PYTHONPATH
&& export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
&& pip3 install -r Examples/Python/tests/requirements.txt
&& pip3 install pytest-md-report
&& pytest -rFsv -k "not exatrkx" -v
&& cat ${PYTEST_MD_REPORT_OUTPUT} >> $GITHUB_STEP_SUMMARY
linux_physmon:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -303,7 +309,7 @@ jobs:
run: >
echo "::group::Dependencies"
&& git config --global safe.directory "$GITHUB_WORKSPACE"
&& pip3 install histcmp==0.6.2 spyral-cli==1.1.0 matplotlib
&& pip3 install histcmp==0.6.3 spyral-cli==1.1.1 matplotlib
&& pip3 install -r Examples/Scripts/requirements.txt
&& /usr/local/bin/geant4-config --install-datasets
&& source /usr/local/bin/thisroot.sh
Expand All @@ -314,6 +320,7 @@ jobs:
&& echo "::endgroup::"
&& export PYTHONPATH="${PYTHONPATH}":"${GITHUB_WORKSPACE}/Examples/Scripts/Python"
&& CI/physmon/phys_perf_mon.sh all physmon
&& cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
- uses: actions/upload-artifact@v3
if: always()
Expand Down Expand Up @@ -401,7 +408,7 @@ jobs:
-DACTS_BUILD_ODD=ON
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-DACTS_FORCE_ASSERTIONS=ON
-DACTS_FORCE_ASSERTIONS=OFF
-DACTS_BUILD_ANALYSIS_APPS=ON
-DACTS_BUILD_PLUGIN_ACTSVG=ON
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,16 @@ jobs:
- name: Check
run: >
CI/check_spelling
missing_includes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install clang
run: >
sudo apt-get install -y clang libeigen3-dev libboost-dev
- name: Check
run: >
CI/missing_include_check.sh
fpe_masks:
runs-on: ubuntu-latest
steps:
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/pr_commands.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: PR comment ops
on: issue_comment

jobs:
pr_commented:
# This job only runs for pull request comments
name: PR comment
if: "${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/') }}"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install prerequisites
run: pip install -r CI/commands/requirements.txt
- name: Run command
env:
GITLAB_TRIGGER_TOKEN: ${{ secrets.GITLAB_ATHENA_BUILD_TRIGGER_TOKEN}}
GITLAB_TRIGGER_URL: https://gitlab.cern.ch/api/v4/projects/153873/trigger/pipeline
GITHUB_TOKEN: ${{ secrets.PR_COMMANDS_GH_TOKEN }}
run: |
echo "${{ github.event.comment.body }}" > body.txt
cat body.txt
CI/commands/pr_commands.py \
--pr ${{ github.event.issue.pull_request.url }} \
--body body.txt \
--sender ${{ github.event.comment.user.login }} \
--repository ${{ github.event.repository.full_name }}
9 changes: 7 additions & 2 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,14 @@ jobs:
- name: Render comment
if: steps.get-pr-number.outputs.result != 'false'
run: |
pip install Jinja2
ls -al $GITHUB_WORKSPACE/physmon
CI/physmon/generate_comment.py $GITHUB_WORKSPACE/physmon comment.md
echo "# 📊: Physics performance monitoring for ${PR_SHA}" >> comment.md
echo "[Full contents](${ARTIFACT_URL})" >> comment.md
if [ -f "$GITHUB_WORKSPACE/physmon/summary.md" ]; then
cat $GITHUB_WORKSPACE/physmon/summary.md >> comment.md
else
echo "🟥 summary not found!" >> comment.md
fi
cat comment.md
- name: Find Comment
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/trigger_athena.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ jobs:
curl -X POST --fail
-F token=${{ secrets.GITLAB_ATHENA_BUILD_TRIGGER_TOKEN}}
-F ref=main
--form variables[SOURCE_SHA]="${{ github.sha }}"
https://gitlab.cern.ch/api/v4/projects/153873/trigger/pipeline
20 changes: 14 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ clang_tidy:
-DACTS_BUILD_EVERYTHING=on
-DACTS_RUN_CLANG_TIDY=on
- mkdir clang-tidy

# Main clang-tidy run during cmake compilation
- CI/clang_tidy/run_clang_tidy.sh build | tee clang-tidy/clang-tidy.log
- CI/clang_tidy/run_clang_tidy.sh clang-tidy build

# Install dependencies for processing scripts
- pip install -r CI/clang_tidy/requirements.txt
Expand Down Expand Up @@ -74,7 +72,6 @@ build_exatrkx:
- build/
exclude:
- build/**/*.o
- build/bin/ActsUnitTest*
- build/bin/ActsIntegrationTest*

script:
Expand All @@ -96,21 +93,32 @@ build_exatrkx:
-DCMAKE_CUDA_ARCHITECTURES="75;86"
-DACTS_BUILD_PLUGIN_EXATRKX=ON
-DACTS_BUILD_EXAMPLES_EXATRKX=ON
-DACTS_BUILD_UNITTESTS=ON
-DACTS_EXATRKX_ENABLE_TORCH=ON
-DACTS_EXATRKX_ENABLE_ONNX=ON
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
- cmake --build build -- -j3

test_exatrkx:
test_exatrkx_unittests:
stage: test
needs:
- build_exatrkx
image: ghcr.io/acts-project/ubuntu2004_exatrkx:v41
tags:
- docker-gpu-nvidia
script:
- ctest --test-dir build -R ExaTrkX

test_exatrkx_python:
stage: test
needs:
- build_exatrkx
image: ghcr.io/acts-project/ubuntu2004_exatrkx:v41
tags:
- docker-gpu-nvidia
script:
- apt-get update -y
- apt-get update -y || true # TODO revert
- apt-get install -y python3 libxxhash0
- source /usr/local/bin/thisroot.sh
- source build/python/setup.sh
Expand Down
2 changes: 1 addition & 1 deletion .policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ approval_rules:
options:
allow_author: false # just for completeness
allow_contributor: true # Update button 'contributions' should be ignored
invalidate_on_push: false
invalidate_on_push: true
ignore_update_merges: true
if:
targets_branch:
Expand Down
23 changes: 21 additions & 2 deletions CI/clang_tidy/run_clang_tidy.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
#!/bin/bash

set -e

output_dir=$1
shift
build_dir=$1
shift

export NINJA_STATUS="[ninja][%f/%t] "
mkdir -p $output_dir
output_dir=$(realpath $output_dir)

pushd $build_dir
ninja | grep -v '\[ninja\]'
NINJA_STATUS="[ninja] [%f/%t] " ninja $@ | tee $output_dir/ninja.log
popd

# grep fails if it does not find anything
set +e
rm $output_dir/clang-tidy.log
cat $output_dir/ninja.log | grep -v '\[ninja\]' > $output_dir/clang-tidy.log
set -e

if [ ! -f $output_dir/clang-tidy.log ]; then
exit 1
fi

exit 0
Loading

0 comments on commit 6063a55

Please sign in to comment.