Skip to content

Commit

Permalink
Merge branch 'main' into feat-tgeo-binding
Browse files Browse the repository at this point in the history
  • Loading branch information
asalzburger authored Dec 2, 2024
2 parents af94236 + 8895da1 commit 40d7638
Show file tree
Hide file tree
Showing 628 changed files with 7,813 additions and 5,701 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/milestone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Check PR milestone

on:
pull_request_target:
types: [milestoned, demilestoned, opened, reopened]
branches:
- main

jobs:
check_milestone:
if: ${{ github.event.issue.pull_request || github.event.pull_request }}

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: "Check for milestone on PR"
uses: actions/github-script@v7
with:
script: |
let milestone = context.payload.pull_request.milestone;
if(context.payload.action === 'opened' || context.payload.action === 'reopened') {
if(milestone !== null) {
core.notice(`Milestone is ${milestone.title}`);
} else {
const milestones = await github.rest.issues.listMilestones({
owner: context.repo.owner,
repo: context.repo.repo,
state: "open"
});
for (const default_milestone of milestones.data) {
if (default_milestone.title === "next") {
core.notice(`No milestone set, setting default milestone: ${default_milestone.title}`);
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
milestone: default_milestone.number
});
return;
}
}
core.warning("Could not find default milestone named 'next'");
}
}
else {
if(milestone !== null) {
core.notice(`Milestone is ${milestone.title}`);
} else {
core.setFailed("No milestone: Please add a version milestone");
}
}
76 changes: 76 additions & 0 deletions .github/workflows/update-pip-requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Update Pip Requirements

on:
workflow_dispatch: # Allow running on-demand
schedule:
# Runs every Sunday at 1:23 UTC
- cron: '23 1 * * 0'

jobs:
update-pip-requirements:
# This action checks all monitored (specified in `folder_list` below) requirements.in
# files and generates a new requirements.txt file with pip-compile. If any
# requirements changed, a PR is created with the changes.
runs-on: ubuntu-latest
env:
# This branch will receive updates each time the workflow runs
# It doesn't matter if it's deleted when merged, it'll be re-created
BRANCH_NAME: auto-dependency-upgrades
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12

- name: Install pip-tools
run: pip install pip-tools

- name: Compile all requirements.txt
run: |
# Update this list after adding/removing requirements-files
folder_list=(
CI/clang_tidy
CI/fpe_masks
docs
Examples/Python/tests
Examples/Scripts
)
for folder in "${folder_list[@]}"; do
pip-compile "${folder}/requirements.in" > "${folder}/requirements.txt"
done
- name: Detect changes
id: changes
run:
# This output boolean tells us if the dependencies have actually changed
echo "count=$(git status --porcelain=v1 2>/dev/null | wc -l)" >> $GITHUB_OUTPUT

- name: Commit & push changes
# Only push if changes exist
if: steps.changes.outputs.count > 0
run: |
git config user.name github-actions
git config user.email github-actions@github.com
git add .
git commit -m "Weekly Update: Regenerate requirements.txt"
git push -f origin ${{ github.ref_name }}:$BRANCH_NAME
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Open pull request if needed
if: steps.changes.outputs.count > 0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Only open a PR if the branch is not attached to an existing one
run: |
PR=$(gh pr list --head $BRANCH_NAME --json number -q '.[0].number')
if [ -z $PR ]; then
gh pr create \
--head $BRANCH_NAME \
--title "chore: automated python requirements upgrades" \
--body "Full log: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
else
echo "Pull request already exists, won't create a new one."
fi
20 changes: 15 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,7 @@ linux_ubuntu_2204_clang:
# Figure out LCG platform name based on version number and OS
- >
if [ "$OS" = "alma9" ]; then
if [ "$LCG_VERSION" -ge "104" ]; then
export LCG_PLATFORM="el9"
else
export LCG_PLATFORM="centos9"
fi
export LCG_PLATFORM="el9"
else
export LCG_PLATFORM="$OS"
fi
Expand Down Expand Up @@ -431,3 +427,17 @@ lcg_105:
COMPILER:
- gcc13
- clang16

lcg_106a:
extends: .lcg_base_job

variables:
LCG_VERSION: "106a"

parallel:
matrix:
- OS: [alma9]
COMPILER:
- gcc13
- gcc14
- clang16
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ TrackAlignmentState trackAlignmentState(
measdim) = measCovariance;

// (b) Get and fill the bound parameters to measurement projection matrix
const ActsDynamicMatrix H = state.effectiveProjector();
const ActsDynamicMatrix H =
state.projectorSubspaceHelper().fullProjector().topLeftCorner(
measdim, eBoundSize);
alignState.projectionMatrix.block(iMeasurement, iParams, measdim,
eBoundSize) = H;
// (c) Get and fill the residual
Expand Down
20 changes: 10 additions & 10 deletions CI/clang_tidy/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@
#
# pip-compile CI/clang_tidy/requirements.in
#
annotated-types==0.6.0
annotated-types==0.7.0
# via pydantic
appdirs==1.4.4
# via fs
codereport==0.3.2
codereport==0.4.0
# via -r CI/clang_tidy/requirements.in
fs==2.4.16
# via codereport
jinja2==3.1.2
jinja2==3.1.4
# via codereport
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
markupsafe==3.0.2
# via jinja2
mdurl==0.1.2
# via markdown-it-py
pydantic==2.5.2
pydantic==2.9.2
# via -r CI/clang_tidy/requirements.in
pydantic-core==2.14.5
pydantic-core==2.23.4
# via pydantic
pygments==2.17.2
pygments==2.18.0
# via
# codereport
# rich
python-slugify==6.1.2
# via codereport
pyyaml==6.0.1
pyyaml==6.0.2
# via -r CI/clang_tidy/requirements.in
rich==13.7.0
rich==13.9.4
# via -r CI/clang_tidy/requirements.in
six==1.16.0
# via fs
text-unidecode==1.3
# via python-slugify
typing-extensions==4.8.0
typing-extensions==4.12.2
# via
# pydantic
# pydantic-core
Expand Down
54 changes: 33 additions & 21 deletions CI/fpe_masks/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,61 @@
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile CI/requirements_fpe_masks.in
# pip-compile CI/fpe_masks/requirements.in
#
aiohttp==3.9.1
# via -r CI/requirements_fpe_masks.in
aiohappyeyeballs==2.4.3
# via aiohttp
aiohttp==3.11.6
# via -r CI/fpe_masks/requirements.in
aiosignal==1.3.1
# via aiohttp
attrs==23.1.0
attrs==24.2.0
# via aiohttp
cffi==1.15.1
cffi==1.17.1
# via cryptography
click==8.1.4
click==8.1.7
# via typer
cryptography==41.0.1
cryptography==43.0.3
# via pyjwt
frozenlist==1.4.0
frozenlist==1.5.0
# via
# aiohttp
# aiosignal
gidgethub==5.3.0
# via -r CI/requirements_fpe_masks.in
idna==3.4
# via -r CI/fpe_masks/requirements.in
idna==3.10
# via yarl
markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
multidict==6.0.4
multidict==6.1.0
# via
# aiohttp
# yarl
propcache==0.2.0
# via
# aiohttp
# yarl
pycparser==2.21
pycparser==2.22
# via cffi
pygments==2.15.1
pygments==2.18.0
# via rich
pyjwt[crypto]==2.7.0
# via gidgethub
rich==13.4.2
# via -r CI/requirements_fpe_masks.in
typer==0.9.0
# via -r CI/requirements_fpe_masks.in
typing-extensions==4.7.1
pyjwt[crypto]==2.10.0
# via
# gidgethub
# pyjwt
rich==13.9.4
# via
# -r CI/fpe_masks/requirements.in
# typer
shellingham==1.5.4
# via typer
typer==0.13.1
# via -r CI/fpe_masks/requirements.in
typing-extensions==4.12.2
# via typer
uritemplate==4.1.1
# via gidgethub
yarl==1.9.2
yarl==1.17.2
# via aiohttp
18 changes: 9 additions & 9 deletions CI/physmon/workflows/physmon_trackfinding_1muon.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from acts.examples.reconstruction import (
addSeeding,
ParticleSmearingSigmas,
TrackSmearingSigmas,
SeedFinderConfigArg,
SeedFinderOptionsArg,
SeedingAlgorithm,
Expand Down Expand Up @@ -91,15 +91,15 @@ def run_ckf_tracking(label, seeding):
s,
setup.trackingGeometry,
setup.field,
ParticleSmearingSigmas( # only used by SeedingAlgorithm.TruthSmeared
TrackSmearingSigmas( # only used by SeedingAlgorithm.TruthSmeared
# zero eveything so the CKF has a chance to find the measurements
d0=0,
d0PtA=0,
d0PtB=0,
z0=0,
z0PtA=0,
z0PtB=0,
t0=0,
loc0=0,
loc0PtA=0,
loc0PtB=0,
loc1=0,
loc1PtA=0,
loc1PtB=0,
time=0,
phi=0,
theta=0,
ptRel=0,
Expand Down
6 changes: 3 additions & 3 deletions CI/physmon/workflows/physmon_trackfitting_gsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

tp = Path(temp)
runTruthTrackingGsf(
setup.trackingGeometry,
setup.field,
setup.digiConfig,
trackingGeometry=setup.trackingGeometry,
field=setup.field,
digiConfigFile=setup.digiConfig,
outputDir=tp,
s=s,
)
Expand Down
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -550,13 +550,6 @@ if(ACTS_BUILD_DOCS)
find_package(Sphinx REQUIRED)
endif()

if(ACTS_CUSTOM_SCALARTYPE)
message(
STATUS
"Building Acts with custom scalar type: ${ACTS_CUSTOM_SCALARTYPE}"
)
endif()

# core library, core plugins, and other components
add_component(Core Core)
add_subdirectory(Plugins)
Expand Down
7 changes: 0 additions & 7 deletions Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ if(ACTS_SOURCELINK_SBO_SIZE)
)
endif()

if(ACTS_CUSTOM_SCALARTYPE)
target_compile_definitions(
ActsCore
PUBLIC -DACTS_CUSTOM_SCALARTYPE=${ACTS_CUSTOM_SCALARTYPE}
)
endif()

if(ACTS_LOG_FAILURE_THRESHOLD)
message(
STATUS
Expand Down
Loading

0 comments on commit 40d7638

Please sign in to comment.