Skip to content

Commit

Permalink
Merge branch 'uptuna_seeding' of https://github.com/LuisFelipeCoelho/…
Browse files Browse the repository at this point in the history
…acts into uptuna_seeding
  • Loading branch information
LuisFelipeCoelho committed Jan 19, 2024
2 parents e921735 + e734ece commit 8d986ff
Show file tree
Hide file tree
Showing 1,061 changed files with 24,250 additions and 12,829 deletions.
40 changes: 37 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'release/**'
- 'develop/**'

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

Expand All @@ -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.*"

Expand All @@ -44,6 +44,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
sudo apt-get install -y git
Expand All @@ -53,6 +55,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
CI/check_include_guards.py . --fail-global --exclude "*thirdparty/*"
Expand All @@ -68,9 +72,21 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
size_t:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
CI/check_size_t.py . --exclude "thirdparty/*"
boost_test_macro:
runs-on: ubuntu-latest
steps:
Expand All @@ -83,6 +99,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
CI/check_smearing_config.py .
Expand All @@ -91,6 +109,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
docs/parse_cmake_options.py CMakeLists.txt --write docs/getting_started.md --verify
Expand All @@ -99,6 +119,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Install codespell
run: >
pip install codespell==2.2.5
Expand All @@ -120,9 +142,21 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Install dependencies
run: >
pip install -r CI/requirements_fpe_masks.txt
- name: Check
run: >
CI/check_fpe_masks.py --token ${{ secrets.GITHUB_TOKEN }}
unused_files:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Check
run: >
CI/check_unused_files.py
5 changes: 3 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'release/**'
- 'develop/**'

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

Expand All @@ -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

Expand Down Expand Up @@ -49,6 +49,7 @@ jobs:
-W
--keep-going
-t run_doxygen
-t lazy_autodoc
-b linkcheck
. _build/html/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iwyu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
- name: Run IWYU
run: python3 iwyu-install/bin/iwyu_tool.py -p acts-build/ -j2 -- --mapping_file=acts/CI/iwyu/mapping.imp | tee iwyu-output.txt
run: python3 iwyu-install/bin/iwyu_tool.py -p acts-build/ -j2 -- -Xiwyu --mapping_file=$(pwd)/acts/CI/iwyu/mapping.imp | tee iwyu-output.txt
- name: Filter IWYU output
run: python3 acts/CI/iwyu/filter.py acts/CI/iwyu/filter.yaml iwyu-output.txt iwyu-filtered.txt
- name: Apply IWYU
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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'
Expand Down
54 changes: 24 additions & 30 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,28 @@ variables:
clang_tidy:
stage: build
image: ghcr.io/acts-project/ubuntu2004:v41
tags:
- large
artifacts:
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 .
Expand All @@ -46,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*"
Expand All @@ -75,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
Expand Down Expand Up @@ -130,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

Expand All @@ -151,6 +154,7 @@ build_linux_ubuntu:
- build/bin/ActsUnitTest*
- build/bin/ActsIntegrationTest*
- build/**/*.o
expire_in: 1 day

script:
- echo $PATH
Expand All @@ -170,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
Expand Down Expand Up @@ -220,6 +224,7 @@ linux_physmon:
when: always
paths:
- src/physmon
expire_in: 1 week

script:
- apt-get update && apt-get install -y git-lfs
Expand Down Expand Up @@ -277,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
Expand All @@ -292,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
Expand Down Expand Up @@ -343,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}
Expand All @@ -357,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:
Expand Down Expand Up @@ -440,18 +445,7 @@ lcg_104:

parallel:
matrix:
- OS: [centos7]
COMPILER:
- gcc11
- gcc12

- OS: [alma9]
COMPILER:
- gcc11
- gcc12
COMPILER:
- gcc13
- clang16

- OS: [centos8]
COMPILER: [gcc11]

2 changes: 1 addition & 1 deletion .merge-sentinel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rules:
- WIP
- milestone-set
required_pattern:
- "review-required: *"
- "policy-bot: *"

- branch_filter:
- "main"
Expand Down
19 changes: 19 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
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
7 changes: 6 additions & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"name": "Xiaocong Ai"
},
{
"affiliation": "Universitaet Freiburg",
"affiliation": "Universitaet Regensburg",
"name": "Benjamin Huth"
},
{
Expand Down Expand Up @@ -113,6 +113,11 @@
"name": "Stephen Nicholas Swatman",
"orcid": "0000-0002-3747-3229"
}
{
"affiliation": "CERN / TU Wien",
"name": "Felix Russo",
"orcid": "0009-0005-8975-2245"
}
],
"access_right": "open",
"related_identifiers": [
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The following people have contributed to the project (in alphabetical order):
- Fabian Klimpel, CERN
- Robert Langenberg, UMass
- Alexander J. Pfleger, CERN, University of Graz
- Felix Russo, CERN, TU Wien
- Andreas Salzburger, CERN
- Bastian Schlag, CERN, JGU Mainz
- Andreas Stefl, CERN, TU Wien
Expand Down
Loading

0 comments on commit 8d986ff

Please sign in to comment.