Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eic/EICrecon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8432604e51a8a7323768ea41be2200316b2bcf6b
Choose a base ref
..
head repository: eic/EICrecon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e56fd2c19d6b9e53297415aa8653679950f520f
Choose a head ref
Showing 349 changed files with 20,913 additions and 24,218 deletions.
20 changes: 10 additions & 10 deletions .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"image": "ghcr.io/eic/jug_prod:master-nightly",
"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cmake-tools",
"ms-vscode.cpptools",
"ms-vscode.cpptools-extension-pack"
]
"image": "ghcr.io/eic/jug_prod:master-nightly",
"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cmake-tools",
"ms-vscode.cpptools",
"ms-vscode.cpptools-extension-pack"
]
}
}
}
}
22 changes: 11 additions & 11 deletions .github/eicrecon.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"problemMatcher": [
{
"owner": "eicrecon",
"pattern": [
"problemMatcher": [
{
"regexp": "^\\[(.*)\\]\\s\\[(error)\\]\\s*(.*)$",
"file": 1,
"severity": 2,
"message": 3
"owner": "eicrecon",
"pattern": [
{
"regexp": "^\\[(.*)\\]\\s\\[(error)\\]\\s*(.*)$",
"file": 1,
"severity": 2,
"message": 3
}
]
}
]
}
]
]
}
30 changes: 15 additions & 15 deletions .github/ubsan.json
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"problemMatcher": [
{
"owner": "ubsan",
"pattern": [
"problemMatcher": [
{
"regexp": "^.*/(src/.+):(\\d+):(\\d+):\\sruntime\\s(error):\\s*(.*)$",
"file": 1,
"fromPath": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
},
]
}
]
"owner": "ubsan",
"pattern": [
{
"regexp": "^.*/(src/.+):(\\d+):(\\d+):\\sruntime\\s(error):\\s*(.*)$",
"file": 1,
"fromPath": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
},
]
}
]
}
46 changes: 23 additions & 23 deletions .github/workflows/linux-eic-shell.yml
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ jobs:
env:
# env cannot be used in matrix, but outputs can
# so this job turns env into outputs
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
platform_json: ${{ steps.define.outputs.platform_json }}
release_json: ${{ steps.define.outputs.release_json }}
@@ -60,7 +60,7 @@ jobs:
echo "release_json=[\"${{ env.release }}\"]" >> $GITHUB_OUTPUT
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: env
strategy:
# include multiple compilers for one release version,
@@ -175,7 +175,7 @@ jobs:
if-no-files-found: error

clang-tidy-iwyu:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: build
steps:
- uses: actions/checkout@v4
@@ -252,7 +252,7 @@ jobs:
run: git diff --exit-code

llvm-cov:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: build
permissions:
statuses: write
@@ -311,7 +311,7 @@ jobs:
path: build/codecov_report/

detector-info:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
hash: ${{ steps.detector-info.outputs.hash }}
steps:
@@ -326,7 +326,7 @@ jobs:
echo "hash=${hash%% *}" | tee $GITHUB_OUTPUT
npsim-gun:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- detector-info
strategy:
@@ -356,7 +356,7 @@ jobs:
if-no-files-found: error

npsim-gun-EcalLumiSpec:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- detector-info
strategy:
@@ -390,7 +390,7 @@ jobs:
if-no-files-found: error

npsim-dis:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- detector-info
strategy:
@@ -426,7 +426,7 @@ jobs:
if-no-files-found: error

npsim-minbias:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- detector-info
strategy:
@@ -462,7 +462,7 @@ jobs:
if-no-files-found: error

eicrecon-two-stage-running:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun
@@ -526,7 +526,7 @@ jobs:
if-no-files-found: error

eicrecon-eicmkplugin:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun
@@ -569,7 +569,7 @@ jobs:
$PWD/install/bin/eicrecon $JANA_OPTIONS -Pplugins=MyCustomPlugin -Ppodio:output_file=rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4eic.root sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root
eicrecon-test-plugins:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun
@@ -618,7 +618,7 @@ jobs:
if-no-files-found: error

eicrecon-benchmarks-plugins:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun
@@ -671,7 +671,7 @@ jobs:
if-no-files-found: error

eicrecon-gun:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun
@@ -785,7 +785,7 @@ jobs:
if-no-files-found: error

eicrecon-gun-EcalLumiSpec:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-gun-EcalLumiSpec
@@ -852,7 +852,7 @@ jobs:
if-no-files-found: error

eicrecon-dis:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- npsim-dis
@@ -985,7 +985,7 @@ jobs:
if-no-files-found: error

trigger-container:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'merge_group' && github.event_name != 'schedule' && github.actor != 'dependabot[bot]' }}
needs:
- eicrecon-gun
@@ -1017,7 +1017,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-docs:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- eicrecon-gun
- eicrecon-dis
@@ -1055,7 +1055,7 @@ jobs:
if-no-files-found: error

list-open-prs:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
json: ${{ steps.remap.outputs.json }}
steps:
@@ -1074,7 +1074,7 @@ jobs:
include.*.head_sha: ${{ toJSON(fromJSON(steps.query.outputs.data).*.head.sha) }}

get-docs-from-open-prs:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build-docs
- list-open-prs
@@ -1125,7 +1125,7 @@ jobs:
if-no-files-found: ignore

get-docs-from-main:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build-docs
steps:
@@ -1182,7 +1182,7 @@ jobs:
if-no-files-found: error

collect-docs:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- get-docs-from-main
- get-docs-from-open-prs
@@ -1241,7 +1241,7 @@ jobs:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Deploy to GitHub Pages
id: deployment
17 changes: 15 additions & 2 deletions cmake/jana_plugin.cmake
View file
Original file line number Diff line number Diff line change
@@ -107,6 +107,17 @@ macro(plugin_add _name)
endif()
endmacro()

# add_dependencies for both a plugin and a library
macro(plugin_add_dependencies _name)
if(${_name}_WITH_PLUGIN)
add_dependencies(${_name}_plugin ${ARGN})
endif(${_name}_WITH_PLUGIN)

if(${_name}_WITH_LIBRARY)
add_dependencies(${_name}_library ${ARGN})
endif(${_name}_WITH_LIBRARY)
endmacro()

# target_link_libraries for both a plugin and a library
macro(plugin_link_libraries _name)
if(${_name}_WITH_PLUGIN)
@@ -287,11 +298,13 @@ macro(plugin_add_acts _name)
)
if(${_name}_WITH_LIBRARY)
target_compile_definitions(
${PLUGIN_NAME}_library PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}")
${PLUGIN_NAME}_library PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}"
"Acts_VERSION_MINOR=${Acts_VERSION_MINOR}")
endif()
if(${_name}_WITH_PLUGIN)
target_compile_definitions(
${PLUGIN_NAME}_plugin PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}")
${PLUGIN_NAME}_plugin PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}"
"Acts_VERSION_MINOR=${Acts_VERSION_MINOR}")
endif()

endmacro()
Loading