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: oneAPI 2025 Fixes, main branch (2024.12.04.) #3938

Merged
merged 2 commits into from
Dec 3, 2024
Merged

fix: oneAPI 2025 Fixes, main branch (2024.12.04.) #3938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f4d888
Make the code compile with oneAPI 2025.0.0.
krasznaa Dec 3, 2024
4a9c80f
Merge branch 'main' into oneAPI2025Compat-main-20241203
kodiakhq[bot] Dec 3, 2024
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
4 changes: 2 additions & 2 deletions Core/include/Acts/EventData/MultiTrajectory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ class MultiTrajectory {

visit_measurement(measdim, [this, istate]<std::size_t DIM>(
std::integral_constant<std::size_t, DIM>) {
self().template allocateCalibrated_impl(
self().allocateCalibrated_impl(
istate, ActsVector<DIM>{ActsVector<DIM>::Zero()},
ActsSquareMatrix<DIM>{ActsSquareMatrix<DIM>::Zero()});
});
Expand All @@ -705,7 +705,7 @@ class MultiTrajectory {
template <std::size_t measdim, typename val_t, typename cov_t>
void allocateCalibrated(IndexType istate, const Eigen::DenseBase<val_t>& val,
const Eigen::DenseBase<cov_t>& cov) {
self().template allocateCalibrated_impl(istate, val, cov);
self().allocateCalibrated_impl(istate, val, cov);
}

void setUncalibratedSourceLink(IndexType istate, SourceLink&& sourceLink)
Expand Down
8 changes: 4 additions & 4 deletions Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ concept MutableMultiTrajectoryBackend =
{ v.template addColumn_impl<double>(col) };

{
v.template allocateCalibrated_impl(istate, ActsVector<1>{},
ActsSquareMatrix<1>{})
v.allocateCalibrated_impl(istate, ActsVector<1>{},
ActsSquareMatrix<1>{})
};
// Assuming intermediate values also work
{
v.template allocateCalibrated_impl(istate, ActsVector<eBoundSize>{},
ActsSquareMatrix<eBoundSize>{})
v.allocateCalibrated_impl(istate, ActsVector<eBoundSize>{},
ActsSquareMatrix<eBoundSize>{})
};

{ v.setUncalibratedSourceLink_impl(istate, std::move(sl)) };
Expand Down
10 changes: 5 additions & 5 deletions Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ class MultiTrajectoryTestsCommon {

auto [par, cov] = generateBoundParametersCovariance(rng, {});

ts.template allocateCalibrated(par.head<3>(), cov.topLeftCorner<3, 3>());
ts.allocateCalibrated(par.head<3>(), cov.topLeftCorner<3, 3>());

BOOST_CHECK_EQUAL(ts.calibratedSize(), 3);
BOOST_CHECK_EQUAL(ts.template calibrated<3>(), par.head<3>());
Expand All @@ -1239,17 +1239,17 @@ class MultiTrajectoryTestsCommon {
BOOST_CHECK_EQUAL(ts.template calibratedCovariance<3>(),
ActsSquareMatrix<3>::Zero());

ts.template allocateCalibrated(par2.head<3>(), cov2.topLeftCorner<3, 3>());
ts.allocateCalibrated(par2.head<3>(), cov2.topLeftCorner<3, 3>());
BOOST_CHECK_EQUAL(ts.calibratedSize(), 3);
// The values are re-assigned
BOOST_CHECK_EQUAL(ts.template calibrated<3>(), par2.head<3>());
BOOST_CHECK_EQUAL(ts.template calibratedCovariance<3>(),
(cov2.topLeftCorner<3, 3>()));

// Re-allocation with a different measurement dimension is an error
BOOST_CHECK_THROW(ts.template allocateCalibrated(
par2.head<4>(), cov2.topLeftCorner<4, 4>()),
std::invalid_argument);
BOOST_CHECK_THROW(
ts.allocateCalibrated(par2.head<4>(), cov2.topLeftCorner<4, 4>()),
std::invalid_argument);
}
};
} // namespace Acts::detail::Test
Loading