Skip to content

Commit 9dac473

Browse files
krasznaakrasznaa
authored
Merge pull request #891 from krasznaa/oneAPI2025Updates-main-20241129
oneAPI 2025 Updates, main branch (2024.11.29.)
2 parents 381896c + e25092f commit 9dac473

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎core/include/detray/definitions/detail/math.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** Detray library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2023 CERN for the benefit of the ACTS project
3+
* (c) 2023-2024 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -9,7 +9,7 @@
99

1010
// SYCL include(s).
1111
#if defined(CL_SYCL_LANGUAGE_VERSION) || defined(SYCL_LANGUAGE_VERSION)
12-
#include <CL/sycl.hpp>
12+
#include <sycl/sycl.hpp>
1313
#endif
1414

1515
// System include(s).
@@ -19,7 +19,7 @@ namespace detray {
1919

2020
/// Namespace to pick up math functions from
2121
#if defined(CL_SYCL_LANGUAGE_VERSION) || defined(SYCL_LANGUAGE_VERSION)
22-
namespace math = cl::sycl;
22+
namespace math = ::sycl;
2323
#elif IS_SOA
2424

2525
namespace math {

‎core/include/detray/propagator/detail/jacobian_cartesian.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ struct jacobian<cartesian2D<algebra_t>> {
8080
const matrix_type<3, 2> bound_pos_to_free_pos_derivative =
8181
matrix_operator().template block<3, 2>(frame, 0u, 0u);
8282

83-
matrix_operator().template set_block(bound_to_free_jacobian,
84-
bound_pos_to_free_pos_derivative,
85-
e_free_pos0, e_bound_loc0);
83+
matrix_operator().set_block(bound_to_free_jacobian,
84+
bound_pos_to_free_pos_derivative,
85+
e_free_pos0, e_bound_loc0);
8686
}
8787

8888
DETRAY_HOST_DEVICE
@@ -98,9 +98,9 @@ struct jacobian<cartesian2D<algebra_t>> {
9898
const matrix_type<2, 3> free_pos_to_bound_pos_derivative =
9999
matrix_operator().template block<2, 3>(frameT, 0, 0);
100100

101-
matrix_operator().template set_block(free_to_bound_jacobian,
102-
free_pos_to_bound_pos_derivative,
103-
e_bound_loc0, e_free_pos0);
101+
matrix_operator().set_block(free_to_bound_jacobian,
102+
free_pos_to_bound_pos_derivative,
103+
e_bound_loc0, e_free_pos0);
104104
}
105105

106106
DETRAY_HOST_DEVICE

‎core/include/detray/propagator/detail/jacobian_cylindrical.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ struct jacobian<cylindrical2D<algebra_t>> {
102102
const auto bound_pos_to_free_pos_derivative =
103103
matrix_operator().template block<3, 2>(frame, 0u, 0u);
104104

105-
matrix_operator().template set_block(bound_to_free_jacobian,
106-
bound_pos_to_free_pos_derivative,
107-
e_free_pos0, e_bound_loc0);
105+
matrix_operator().set_block(bound_to_free_jacobian,
106+
bound_pos_to_free_pos_derivative,
107+
e_free_pos0, e_bound_loc0);
108108
}
109109

110110
DETRAY_HOST_DEVICE
@@ -120,9 +120,9 @@ struct jacobian<cylindrical2D<algebra_t>> {
120120
const auto free_pos_to_bound_pos_derivative =
121121
matrix_operator().template block<2, 3>(frameT, 0u, 0u);
122122

123-
matrix_operator().template set_block(free_to_bound_jacobian,
124-
free_pos_to_bound_pos_derivative,
125-
e_bound_loc0, e_free_pos0);
123+
matrix_operator().set_block(free_to_bound_jacobian,
124+
free_pos_to_bound_pos_derivative,
125+
e_bound_loc0, e_free_pos0);
126126
}
127127

128128
DETRAY_HOST_DEVICE

‎core/include/detray/propagator/detail/jacobian_line.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ struct jacobian<line2D<algebra_t>> {
120120
const auto bound_pos_to_free_pos_derivative =
121121
matrix_operator().template block<3, 2>(frame, 0u, 0u);
122122

123-
matrix_operator().template set_block(bound_to_free_jacobian,
124-
bound_pos_to_free_pos_derivative,
125-
e_free_pos0, e_bound_loc0);
123+
matrix_operator().set_block(bound_to_free_jacobian,
124+
bound_pos_to_free_pos_derivative,
125+
e_free_pos0, e_bound_loc0);
126126
}
127127

128128
DETRAY_HOST_DEVICE
@@ -138,9 +138,9 @@ struct jacobian<line2D<algebra_t>> {
138138
const auto free_pos_to_bound_pos_derivative =
139139
matrix_operator().template block<2, 3>(frameT, 0u, 0u);
140140

141-
matrix_operator().template set_block(free_to_bound_jacobian,
142-
free_pos_to_bound_pos_derivative,
143-
e_bound_loc0, e_free_pos0);
141+
matrix_operator().set_block(free_to_bound_jacobian,
142+
free_pos_to_bound_pos_derivative,
143+
e_bound_loc0, e_free_pos0);
144144
}
145145

146146
DETRAY_HOST_DEVICE

‎core/include/detray/propagator/detail/jacobian_polar.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ struct jacobian<polar2D<algebra_t>> {
106106
matrix_operator().template set_block<3, 1>(
107107
bound_pos_to_free_pos_derivative, col1, e_free_pos0, e_bound_loc1);
108108

109-
matrix_operator().template set_block(bound_to_free_jacobian,
110-
bound_pos_to_free_pos_derivative,
111-
e_free_pos0, e_bound_loc0);
109+
matrix_operator().set_block(bound_to_free_jacobian,
110+
bound_pos_to_free_pos_derivative,
111+
e_free_pos0, e_bound_loc0);
112112
}
113113

114114
DETRAY_HOST_DEVICE
@@ -149,9 +149,9 @@ struct jacobian<polar2D<algebra_t>> {
149149
matrix_operator().template set_block<1, 3>(
150150
free_pos_to_bound_pos_derivative, row1, e_bound_loc1, e_free_pos0);
151151

152-
matrix_operator().template set_block(free_to_bound_jacobian,
153-
free_pos_to_bound_pos_derivative,
154-
e_bound_loc0, e_free_pos0);
152+
matrix_operator().set_block(free_to_bound_jacobian,
153+
free_pos_to_bound_pos_derivative,
154+
e_bound_loc0, e_free_pos0);
155155
}
156156

157157
DETRAY_HOST_DEVICE

‎io/include/detray/io/common/geometry_reader.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class geometry_reader {
117117
}
118118

119119
// @TODO: Implement voume finder IO
120-
det_builder.template set_volume_finder();
120+
det_builder.set_volume_finder();
121121
}
122122

123123
/// @returns a surface transform from its io payload @param trf_data

0 commit comments

Comments
 (0)