Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Solve the CI issue with the ML solver #2026

Merged
merged 10 commits into from
Apr 20, 2023
Merged

fix: Solve the CI issue with the ML solver #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
10fb4e7
solver possible /0 in the ML solver
Corentin-Allaire Apr 12, 2023
4883144
solver possible /0 in the ML solver
Corentin-Allaire Apr 12, 2023
30fa737
Merge branch 'main' into FPE-CI
Corentin-Allaire Apr 13, 2023
901c5a8
removed commented lines
Corentin-Allaire Apr 13, 2023
d803721
test
Corentin-Allaire Apr 13, 2023
312be1b
Merge branch 'main' into FPE-CI
Corentin-Allaire Apr 13, 2023
c731e52
solve the FPE error
Corentin-Allaire Apr 19, 2023
927623c
Merge remote-tracking branch 'upstream/main' into FPE-CI
Corentin-Allaire Apr 19, 2023
fa5bbde
Merge branch 'FPE-CI' of https://github.com/Corentin-Allaire/acts int…
Corentin-Allaire Apr 19, 2023
2bcdad3
Merge branch 'main' into FPE-CI
asalzburger Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Examples/Python/tests/test_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,9 +1119,6 @@ def test_full_chain_odd_example_pythia_geant4(tmp_path):
)


@pytest.mark.skip(
reason="as of https://github.com/acts-project/acts/issues/2023 disabling for now"
)
@pytest.mark.skipif(not dd4hepEnabled, reason="DD4hep not set up")
@pytest.mark.skipif(not onnxEnabled, reason="ONNX plugin not enabled")
@pytest.mark.slow
Expand Down
11 changes: 9 additions & 2 deletions Plugins/Onnx/include/Acts/Plugins/Onnx/AmbiguityTrackClassifier.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ class AmbiguityTrackClassifier {
std::unordered_map<int, std::vector<int>>& clusters,
const Acts::TrackContainer<track_container_t, traj_t, holder_t>& tracks)
const {
// Compute the number of entry (since it is smaller than the number of
// track)
int trackNb = 0;
for (const auto& [_, val] : clusters) {
trackNb += val.size();
}
// Input of the neural network
Acts::NetworkBatchInput networkInput(tracks.size() + 1, 8);
Acts::NetworkBatchInput networkInput(trackNb, 8);
int inputID = 0;
// Get the input feature of the network for all the tracks
for (const auto& [key, val] : clusters) {
Expand All @@ -56,7 +62,8 @@ class AmbiguityTrackClassifier {
networkInput(inputID, 2) = trajState.nOutliers;
networkInput(inputID, 3) = trajState.nHoles;
networkInput(inputID, 4) = trajState.NDF;
networkInput(inputID, 5) = (trajState.chi2Sum * 1.0) / trajState.NDF;
networkInput(inputID, 5) = (trajState.chi2Sum * 1.0) /
(trajState.NDF != 0 ? trajState.NDF : 1);
networkInput(inputID, 6) = Acts::VectorHelpers::eta(track.momentum());
networkInput(inputID, 7) = Acts::VectorHelpers::phi(track.momentum());
inputID++;
Expand Down