Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7125977

Browse files
krasznaakrasznaa
committedDec 4, 2024
Make the code SYCL2020 compatible.
1 parent 4e96e56 commit 7125977

21 files changed

+94
-98
lines changed
 

‎core/include/traccc/definitions/math.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -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 traccc {
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
#else
2424
namespace math = std;
2525
#endif // SYCL

‎device/sycl/include/traccc/sycl/utils/calculate1DimNdRange.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022 CERN for the benefit of the ACTS project
3+
* (c) 2022-2024 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
77

88
#pragma once
99

1010
// Sycl include(s).
11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212

1313
namespace traccc::sycl {
1414

‎device/sycl/include/traccc/sycl/utils/make_prefix_sum_buff.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022 CERN for the benefit of the ACTS project
3+
* (c) 2022-2024 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
77

88
#pragma once
99

1010
// Sycl include(s).
11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212

1313
// Project include(s).
1414
#include "traccc/device/fill_prefix_sum.hpp"

‎device/sycl/src/fitting/fit_tracks.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <oneapi/dpl/execution>
2828

2929
// SYCL include(s).
30-
#include <CL/sycl.hpp>
30+
#include <sycl/sycl.hpp>
3131

3232
namespace traccc::sycl {
3333
namespace kernels {
@@ -46,7 +46,7 @@ track_state_container_types::buffer fit_tracks(
4646
const typename track_candidate_container_types::const_view&
4747
track_candidates_view,
4848
const fitting_config& config, const memory_resource& mr, vecmem::copy& copy,
49-
cl::sycl::queue& queue) {
49+
::sycl::queue& queue) {
5050

5151
// Get the number of tracks.
5252
const track_candidate_container_types::const_device::header_vector::
@@ -87,15 +87,15 @@ track_state_container_types::buffer fit_tracks(
8787

8888
// The execution range for the two kernels of the function.
8989
static constexpr unsigned int localSize = 64;
90-
cl::sycl::nd_range<1> range = calculate1DimNdRange(n_tracks, localSize);
90+
::sycl::nd_range<1> range = calculate1DimNdRange(n_tracks, localSize);
9191

9292
// Fill the keys and param_ids buffers.
93-
cl::sycl::event fill_keys_event = queue.submit([&](cl::sycl::handler& h) {
93+
::sycl::event fill_keys_event = queue.submit([&](::sycl::handler& h) {
9494
h.parallel_for<kernels::fill_sort_keys>(
9595
range,
9696
[track_candidates_view, keys_view = vecmem::get_data(keys_buffer),
97-
param_ids_view = vecmem::get_data(param_ids_buffer)](
98-
cl::sycl::nd_item<1> item) {
97+
param_ids_view =
98+
vecmem::get_data(param_ids_buffer)](::sycl::nd_item<1> item) {
9999
device::fill_sort_keys(item.get_global_linear_id(),
100100
track_candidates_view, keys_view,
101101
param_ids_view);
@@ -115,11 +115,11 @@ track_state_container_types::buffer fit_tracks(
115115
track_states_headers_setup_event->wait();
116116
track_states_items_setup_event->wait();
117117
queue
118-
.submit([&](cl::sycl::handler& h) {
118+
.submit([&](::sycl::handler& h) {
119119
h.parallel_for<fit_kernel_t>(
120120
range, [det_view, field_view, config, track_candidates_view,
121121
param_ids_view = vecmem::get_data(param_ids_buffer),
122-
track_states_view](cl::sycl::nd_item<1> item) {
122+
track_states_view](::sycl::nd_item<1> item) {
123123
device::fit<fitter_t>(item.get_global_linear_id(), det_view,
124124
field_view, config,
125125
track_candidates_view, param_ids_view,

‎device/sycl/src/sanity/contiguous_on.hpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <vecmem/utils/copy.hpp>
2020

2121
// SYCL include
22-
#include <CL/sycl.hpp>
22+
#include <sycl/sycl.hpp>
2323

2424
// System include
2525
#include <concepts>
@@ -44,7 +44,7 @@ struct is_contiguous_on_compress_adjacent {
4444
: m_projection(projection), m_view(view), m_out_view(out_view) {}
4545

4646
/// Execution operator for the kernel
47-
void operator()(cl::sycl::nd_item<1> item) const {
47+
void operator()(::sycl::nd_item<1> item) const {
4848

4949
std::size_t tid = item.get_global_linear_id();
5050

@@ -111,7 +111,7 @@ is_contiguous_on(P&& projection, vecmem::memory_resource& mr,
111111
constexpr int local_size = 512;
112112
constexpr int local_size_2d = 32;
113113

114-
cl::sycl::queue& queue = details::get_queue(queue_wrapper);
114+
::sycl::queue& queue = details::get_queue(queue_wrapper);
115115

116116
// Grab the number of elements in our vector.
117117
const typename VIEW::size_type n = copy.get_size(view);
@@ -133,16 +133,16 @@ is_contiguous_on(P&& projection, vecmem::memory_resource& mr,
133133

134134
bool initial_out = true;
135135

136-
cl::sycl::event kernel2_memcpy_evt = queue.copy(&initial_out, out.get(), 1);
136+
::sycl::event kernel2_memcpy_evt = queue.copy(&initial_out, out.get(), 1);
137137

138-
cl::sycl::nd_range<1> compress_adjacent_range{
139-
cl::sycl::range<1>(((n + local_size - 1) / local_size) * local_size),
140-
cl::sycl::range<1>(local_size)};
138+
::sycl::nd_range<1> compress_adjacent_range{
139+
::sycl::range<1>(((n + local_size - 1) / local_size) * local_size),
140+
::sycl::range<1>(local_size)};
141141

142142
// Launch the first kernel, which will squash consecutive equal elements
143143
// into one element.
144144
queue
145-
.submit([&](cl::sycl::handler& h) {
145+
.submit([&](::sycl::handler& h) {
146146
h.parallel_for<kernels::is_contiguous_on_compress_adjacent<
147147
CONTAINER, P, VIEW, projection_t>>(
148148
compress_adjacent_range,
@@ -156,17 +156,17 @@ is_contiguous_on(P&& projection, vecmem::memory_resource& mr,
156156
copy.get_size(iout);
157157
uint32_t grid_size_rd =
158158
(host_iout_size + local_size_2d - 1) / local_size_2d;
159-
cl::sycl::nd_range<2> all_unique_range{
160-
cl::sycl::range<2>(grid_size_rd * local_size_2d,
161-
grid_size_rd * local_size_2d),
162-
cl::sycl::range<2>(local_size_2d, local_size_2d)};
159+
::sycl::nd_range<2> all_unique_range{
160+
::sycl::range<2>(grid_size_rd * local_size_2d,
161+
grid_size_rd * local_size_2d),
162+
::sycl::range<2>(local_size_2d, local_size_2d)};
163163

164164
// Launch the second kernel, which will check if the values are unique.
165-
cl::sycl::event kernel2_evt = queue.submit([&](cl::sycl::handler& h) {
165+
::sycl::event kernel2_evt = queue.submit([&](::sycl::handler& h) {
166166
h.depends_on(kernel2_memcpy_evt);
167167
h.parallel_for<kernels::is_contiguous_on_all_unique<projection_t>>(
168168
all_unique_range, [in_view = vecmem::get_data(iout),
169-
out = out.get()](cl::sycl::nd_item<2> item) {
169+
out = out.get()](::sycl::nd_item<2> item) {
170170
std::size_t tid_x = item.get_global_id(0);
171171
std::size_t tid_y = item.get_global_id(1);
172172

‎device/sycl/src/sanity/ordered_on.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <vecmem/utils/copy.hpp>
1919

2020
// SYCL include
21-
#include <CL/sycl.hpp>
21+
#include <sycl/sycl.hpp>
2222

2323
// System include
2424
#include <concepts>
@@ -40,7 +40,7 @@ struct is_ordered_on {
4040
: m_relation(relation), m_view(view), m_out(out) {}
4141

4242
/// Execution operator for the kernel
43-
void operator()(cl::sycl::nd_item<1> item) const {
43+
void operator()(::sycl::nd_item<1> item) const {
4444

4545
std::size_t tid = item.get_global_linear_id();
4646

@@ -98,7 +98,7 @@ is_ordered_on(R&& relation, vecmem::memory_resource& mr, vecmem::copy& copy,
9898
// block size fixed.
9999
constexpr int block_size = 512;
100100

101-
cl::sycl::queue& queue = details::get_queue(queue_wrapper);
101+
::sycl::queue& queue = details::get_queue(queue_wrapper);
102102

103103
// Grab the number of elements in our container.
104104
const typename VIEW::size_type n = copy.get_size(view);
@@ -112,14 +112,14 @@ is_ordered_on(R&& relation, vecmem::memory_resource& mr, vecmem::copy& copy,
112112
vecmem::unique_alloc_ptr<bool> out = vecmem::make_unique_alloc<bool>(mr);
113113
bool initial_out = true;
114114

115-
cl::sycl::event kernel1_memcpy1 =
115+
::sycl::event kernel1_memcpy1 =
116116
queue.memcpy(out.get(), &initial_out, sizeof(bool));
117117

118-
cl::sycl::nd_range<1> kernel_range{
119-
cl::sycl::range<1>(((n + block_size - 1) / block_size) * block_size),
120-
cl::sycl::range<1>(block_size)};
118+
::sycl::nd_range<1> kernel_range{
119+
::sycl::range<1>(((n + block_size - 1) / block_size) * block_size),
120+
::sycl::range<1>(block_size)};
121121

122-
cl::sycl::event kernel1 = queue.submit([&](cl::sycl::handler& h) {
122+
::sycl::event kernel1 = queue.submit([&](::sycl::handler& h) {
123123
h.depends_on(kernel1_memcpy1);
124124
h.parallel_for<kernels::is_ordered_on<CONTAINER, R, VIEW>>(
125125
kernel_range, kernels::is_ordered_on<CONTAINER, R, VIEW>(

‎device/sycl/src/seeding/silicon_pixel_spacepoint_formation.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <vecmem/memory/memory_resource.hpp>
2121

2222
// SYCL include(s).
23-
#include <CL/sycl.hpp>
23+
#include <sycl/sycl.hpp>
2424

2525
namespace traccc::sycl::details {
2626

@@ -40,7 +40,7 @@ template <typename detector_t>
4040
spacepoint_collection_types::buffer silicon_pixel_spacepoint_formation(
4141
const typename detector_t::view_type& det_view,
4242
const measurement_collection_types::const_view& measurements_view,
43-
vecmem::memory_resource& mr, vecmem::copy& copy, cl::sycl::queue& queue) {
43+
vecmem::memory_resource& mr, vecmem::copy& copy, ::sycl::queue& queue) {
4444

4545
// Get the number of measurements.
4646
const measurement_collection_types::const_view::size_type n_measurements =
@@ -63,11 +63,11 @@ spacepoint_collection_types::buffer silicon_pixel_spacepoint_formation(
6363

6464
// Run the spacepoint formation on the device.
6565
queue
66-
.submit([&](cl::sycl::handler& h) {
66+
.submit([&](::sycl::handler& h) {
6767
h.parallel_for(
6868
countRange, [det_view, measurements_view, n_measurements,
6969
spacepoints_view = vecmem::get_data(result)](
70-
cl::sycl::nd_item<1> item) {
70+
::sycl::nd_item<1> item) {
7171
device::form_spacepoints<detector_t>(
7272
item.get_global_linear_id(), det_view,
7373
measurements_view, n_measurements, spacepoints_view);

‎device/sycl/src/seeding/spacepoint_binning.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "traccc/seeding/device/populate_grid.hpp"
1818

1919
// SYCL include(s).
20-
#include <CL/sycl.hpp>
20+
#include <sycl/sycl.hpp>
2121

2222
namespace traccc::sycl {
2323
namespace kernels {

‎device/sycl/src/utils/barrier.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#include "traccc/definitions/qualifiers.hpp"
1212

1313
// SYCL includes
14-
#include <CL/sycl.hpp>
14+
#include <sycl/sycl.hpp>
1515

1616
namespace traccc::sycl {
1717

1818
struct barrier {
19-
barrier(::sycl::nd_item<1> item) : m_item(item){};
19+
barrier(::sycl::nd_item<1> item) : m_item(item) {}
2020

2121
TRACCC_DEVICE
2222
void blockBarrier() { m_item.barrier(); }

‎device/sycl/src/utils/get_queue.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "traccc/sycl/utils/queue_wrapper.hpp"
1212

1313
// SYCL include(s).
14-
#include <CL/sycl.hpp>
14+
#include <sycl/sycl.hpp>
1515

1616
namespace traccc::sycl::details {
1717

‎examples/run/sycl/seeding_example_sycl.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
// SYCL include(s)
9-
#include <CL/sycl.hpp>
9+
#include <sycl/sycl.hpp>
1010

1111
// algorithms
1212
#include "traccc/seeding/seeding_algorithm.hpp"

‎examples/run/sycl/seq_example_sycl.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
// SYCL include(s)
9-
#include <CL/sycl.hpp>
9+
#include <sycl/sycl.hpp>
1010

1111
// io
1212
#include "traccc/io/read_cells.hpp"

‎tests/sycl/test_barrier.sycl

+13-16
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <gtest/gtest.h>
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212
#include <vecmem/memory/sycl/shared_memory_resource.hpp>
1313
#include <vecmem/memory/unique_ptr.hpp>
1414

@@ -17,19 +17,18 @@
1717
TEST(SYCLBarrier, BarrierAnd) {
1818
vecmem::sycl::shared_memory_resource mr;
1919

20-
cl::sycl::queue queue;
20+
::sycl::queue queue;
2121
constexpr std::size_t n_bools = 4;
2222

2323
vecmem::unique_alloc_ptr<bool[]> out =
2424
vecmem::make_unique_alloc<bool[]>(mr, n_bools);
2525

26-
cl::sycl::nd_range test_range(cl::sycl::range<1>(128),
27-
cl::sycl::range<1>(128));
26+
::sycl::nd_range test_range(::sycl::range<1>(128), ::sycl::range<1>(128));
2827

2928
queue
30-
.submit([&, out = out.get()](cl::sycl::handler &h) {
29+
.submit([&, out = out.get()](::sycl::handler &h) {
3130
h.parallel_for<class BarrierAndTest>(
32-
test_range, [=](cl::sycl::nd_item<1> item) {
31+
test_range, [=](::sycl::nd_item<1> item) {
3332
traccc::sycl::barrier bar(item);
3433

3534
bool v;
@@ -66,19 +65,18 @@ TEST(SYCLBarrier, BarrierAnd) {
6665
TEST(SYCLBarrier, BarrierOr) {
6766
vecmem::sycl::shared_memory_resource mr;
6867

69-
cl::sycl::queue queue;
68+
::sycl::queue queue;
7069
constexpr std::size_t n_bools = 4;
7170

7271
vecmem::unique_alloc_ptr<bool[]> out =
7372
vecmem::make_unique_alloc<bool[]>(mr, n_bools);
7473

75-
cl::sycl::nd_range test_range(cl::sycl::range<1>(128),
76-
cl::sycl::range<1>(128));
74+
::sycl::nd_range test_range(::sycl::range<1>(128), ::sycl::range<1>(128));
7775

7876
queue
79-
.submit([&, out = out.get()](cl::sycl::handler &h) {
77+
.submit([&, out = out.get()](::sycl::handler &h) {
8078
h.parallel_for<class BarrierOrTest>(
81-
test_range, [=](cl::sycl::nd_item<1> item) {
79+
test_range, [=](::sycl::nd_item<1> item) {
8280
traccc::sycl::barrier bar(item);
8381

8482
bool v;
@@ -115,19 +113,18 @@ TEST(SYCLBarrier, BarrierOr) {
115113
TEST(SYCLBarrier, BarrierCount) {
116114
vecmem::sycl::shared_memory_resource mr;
117115

118-
cl::sycl::queue queue;
116+
::sycl::queue queue;
119117
constexpr std::size_t n_ints = 4;
120118

121119
vecmem::unique_alloc_ptr<unsigned int[]> out =
122120
vecmem::make_unique_alloc<unsigned int[]>(mr, n_ints);
123121

124-
cl::sycl::nd_range test_range(cl::sycl::range<1>(128),
125-
cl::sycl::range<1>(128));
122+
::sycl::nd_range test_range(::sycl::range<1>(128), ::sycl::range<1>(128));
126123

127124
queue
128-
.submit([&, out = out.get()](cl::sycl::handler &h) {
125+
.submit([&, out = out.get()](::sycl::handler &h) {
129126
h.parallel_for<class BarrierCountTest>(
130-
test_range, [=](cl::sycl::nd_item<1> item) {
127+
test_range, [=](::sycl::nd_item<1> item) {
131128
traccc::sycl::barrier bar(item);
132129

133130
unsigned int v;

‎tests/sycl/test_cca.sycl

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#include <gtest/gtest.h>
99

10-
#include <CL/sycl.hpp>
1110
#include <functional>
11+
#include <sycl/sycl.hpp>
1212
#include <vecmem/memory/host_memory_resource.hpp>
1313
#include <vecmem/memory/sycl/device_memory_resource.hpp>
1414
#include <vecmem/utils/sycl/async_copy.hpp>
@@ -27,7 +27,7 @@ cca_function_t get_f_with(traccc::clustering_config cfg) {
2727
result;
2828

2929
vecmem::host_memory_resource host_mr;
30-
cl::sycl::queue q;
30+
::sycl::queue q;
3131
traccc::sycl::queue_wrapper queue{&q};
3232
vecmem::sycl::device_memory_resource device_mr;
3333
vecmem::sycl::async_copy copy{&q};

‎tests/sycl/test_dpl.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <oneapi/dpl/execution>
1111

1212
// SYCL include(s).
13-
#include <CL/sycl.hpp>
13+
#include <sycl/sycl.hpp>
1414

1515
// VecMem include(s).
1616
#include <vecmem/containers/data/vector_buffer.hpp>

‎tests/sycl/test_kalman_fitter_telescope.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
// SYCL include(s)
9-
#include <CL/sycl.hpp>
9+
#include <sycl/sycl.hpp>
1010

1111
// Project include(s).
1212
#include "traccc/device/container_d2h_copy_alg.hpp"

‎tests/sycl/test_mutex.sycl

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
#include <gtest/gtest.h>
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212
#include <vecmem/memory/sycl/shared_memory_resource.hpp>
1313
#include <vecmem/memory/unique_ptr.hpp>
1414

1515
#include "traccc/device/mutex.hpp"
1616

1717
TEST(SYCLMutex, MassAdditionKernel) {
1818
vecmem::sycl::shared_memory_resource mr;
19-
cl::sycl::queue queue;
19+
::sycl::queue queue;
2020

2121
vecmem::unique_alloc_ptr<uint32_t> out =
2222
vecmem::make_unique_alloc<uint32_t>(mr);
@@ -29,13 +29,13 @@ TEST(SYCLMutex, MassAdditionKernel) {
2929
uint32_t n_blocks = 262144;
3030
uint32_t n_threads = 32;
3131

32-
cl::sycl::nd_range test_range(cl::sycl::range<1>(n_blocks * n_threads),
33-
cl::sycl::range<1>(n_threads));
32+
::sycl::nd_range test_range(::sycl::range<1>(n_blocks * n_threads),
33+
::sycl::range<1>(n_threads));
3434

3535
queue
36-
.submit([&, out = out.get(), lock = lock.get()](cl::sycl::handler &h) {
36+
.submit([&, out = out.get(), lock = lock.get()](::sycl::handler &h) {
3737
h.parallel_for<class MassAdditionTest>(
38-
test_range, [=](cl::sycl::nd_item<1> item) {
38+
test_range, [=](::sycl::nd_item<1> item) {
3939
traccc::device::mutex m(*lock);
4040

4141
if (item.get_local_id() == 0) {

‎tests/sycl/test_sanity_contiguous_on.sycl

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
#include <gtest/gtest.h>
1919

2020
// System include
21-
#include <CL/sycl.hpp>
21+
#include <sycl/sycl.hpp>
2222

2323
struct int_identity_projection {
2424
int operator()(const int& v) const { return v; }
2525
};
2626

2727
class SYCLSanityContiguousOn : public testing::Test {
2828
protected:
29-
cl::sycl::queue queue;
29+
::sycl::queue queue;
3030
traccc::sycl::queue_wrapper queue_wrapper{&queue};
3131
vecmem::sycl::device_memory_resource mr{&queue};
3232
vecmem::sycl::async_copy copy{&queue};

‎tests/sycl/test_sanity_ordered_on.sycl

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <gtest/gtest.h>
2020

2121
// System include
22-
#include <CL/sycl.hpp>
22+
#include <sycl/sycl.hpp>
2323

2424
struct int_lt_relation {
2525
bool operator()(const int& a, const int& b) const { return a < b; }
@@ -31,7 +31,7 @@ struct int_leq_relation {
3131

3232
class SYCLSanityOrderedOn : public testing::Test {
3333
protected:
34-
cl::sycl::queue queue;
34+
::sycl::queue queue;
3535
traccc::sycl::queue_wrapper queue_wrapper{&queue};
3636
vecmem::sycl::device_memory_resource mr{&queue};
3737
vecmem::sycl::async_copy copy{&queue};

‎tests/sycl/test_sort.sycl

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <gtest/gtest.h>
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212
#include <vecmem/memory/sycl/shared_memory_resource.hpp>
1313
#include <vecmem/memory/unique_ptr.hpp>
1414

@@ -18,7 +18,7 @@
1818

1919
TEST(SYCLSort, BlockOddEvenSort) {
2020
vecmem::sycl::shared_memory_resource mr;
21-
cl::sycl::queue queue;
21+
::sycl::queue queue;
2222

2323
uint32_t n = 2803;
2424
vecmem::unique_alloc_ptr<uint32_t[]> arr =
@@ -30,13 +30,12 @@ TEST(SYCLSort, BlockOddEvenSort) {
3030
arr[i] = (13 * 500 * i) % n;
3131
}
3232

33-
cl::sycl::nd_range test_range(cl::sycl::range<1>(128),
34-
cl::sycl::range<1>(128));
33+
::sycl::nd_range test_range(::sycl::range<1>(128), ::sycl::range<1>(128));
3534

3635
queue
37-
.submit([&, keys = arr.get()](cl::sycl::handler &h) {
36+
.submit([&, keys = arr.get()](::sycl::handler &h) {
3837
h.parallel_for<class BlockOddEvenSortKernel>(
39-
test_range, [=](cl::sycl::nd_item<1> item) {
38+
test_range, [=](::sycl::nd_item<1> item) {
4039
traccc::sycl::thread_id1 thread_id(item);
4140
traccc::sycl::barrier barrier(item);
4241
traccc::device::blockOddEvenSort(thread_id, barrier, keys,

‎tests/sycl/test_unique_lock.sycl

+16-16
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <gtest/gtest.h>
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212
#include <vecmem/memory/sycl/shared_memory_resource.hpp>
1313
#include <vecmem/memory/unique_ptr.hpp>
1414

@@ -17,7 +17,7 @@
1717

1818
TEST(SYCLUniqueLock, MassAdditionKernelTryLock) {
1919
vecmem::sycl::shared_memory_resource mr;
20-
cl::sycl::queue queue;
20+
::sycl::queue queue;
2121

2222
vecmem::unique_alloc_ptr<uint32_t> out =
2323
vecmem::make_unique_alloc<uint32_t>(mr);
@@ -30,13 +30,13 @@ TEST(SYCLUniqueLock, MassAdditionKernelTryLock) {
3030
uint32_t n_blocks = 262144;
3131
uint32_t n_threads = 32;
3232

33-
cl::sycl::nd_range test_range(cl::sycl::range<1>(n_blocks * n_threads),
34-
cl::sycl::range<1>(n_threads));
33+
::sycl::nd_range test_range(::sycl::range<1>(n_blocks * n_threads),
34+
::sycl::range<1>(n_threads));
3535

3636
queue
37-
.submit([&, out = out.get(), _lock = lock.get()](cl::sycl::handler &h) {
37+
.submit([&, out = out.get(), _lock = lock.get()](::sycl::handler &h) {
3838
h.parallel_for<class MassAdditionTryLockTest>(
39-
test_range, [=](cl::sycl::nd_item<1> item) {
39+
test_range, [=](::sycl::nd_item<1> item) {
4040
traccc::device::mutex m(*_lock);
4141

4242
if (item.get_local_id() == 0) {
@@ -59,7 +59,7 @@ TEST(SYCLUniqueLock, MassAdditionKernelTryLock) {
5959

6060
TEST(SYCLUniqueLock, MassAdditionKernelDeferLock) {
6161
vecmem::sycl::shared_memory_resource mr;
62-
cl::sycl::queue queue;
62+
::sycl::queue queue;
6363

6464
vecmem::unique_alloc_ptr<uint32_t> out =
6565
vecmem::make_unique_alloc<uint32_t>(mr);
@@ -72,13 +72,13 @@ TEST(SYCLUniqueLock, MassAdditionKernelDeferLock) {
7272
uint32_t n_blocks = 262144;
7373
uint32_t n_threads = 32;
7474

75-
cl::sycl::nd_range test_range(cl::sycl::range<1>(n_blocks * n_threads),
76-
cl::sycl::range<1>(n_threads));
75+
::sycl::nd_range test_range(::sycl::range<1>(n_blocks * n_threads),
76+
::sycl::range<1>(n_threads));
7777

7878
queue
79-
.submit([&, out = out.get(), _lock = lock.get()](cl::sycl::handler &h) {
79+
.submit([&, out = out.get(), _lock = lock.get()](::sycl::handler &h) {
8080
h.parallel_for<class MassAdditionDeferLockTest>(
81-
test_range, [=](cl::sycl::nd_item<1> item) {
81+
test_range, [=](::sycl::nd_item<1> item) {
8282
traccc::device::mutex m(*_lock);
8383
traccc::device::unique_lock lock(m, std::defer_lock);
8484

@@ -98,7 +98,7 @@ TEST(SYCLUniqueLock, MassAdditionKernelDeferLock) {
9898

9999
TEST(SYCLUniqueLock, MassAdditionKernelAdoptLock) {
100100
vecmem::sycl::shared_memory_resource mr;
101-
cl::sycl::queue queue;
101+
::sycl::queue queue;
102102

103103
vecmem::unique_alloc_ptr<uint32_t> out =
104104
vecmem::make_unique_alloc<uint32_t>(mr);
@@ -111,13 +111,13 @@ TEST(SYCLUniqueLock, MassAdditionKernelAdoptLock) {
111111
uint32_t n_blocks = 262144;
112112
uint32_t n_threads = 32;
113113

114-
cl::sycl::nd_range test_range(cl::sycl::range<1>(n_blocks * n_threads),
115-
cl::sycl::range<1>(n_threads));
114+
::sycl::nd_range test_range(::sycl::range<1>(n_blocks * n_threads),
115+
::sycl::range<1>(n_threads));
116116

117117
queue
118-
.submit([&, out = out.get(), _lock = lock.get()](cl::sycl::handler &h) {
118+
.submit([&, out = out.get(), _lock = lock.get()](::sycl::handler &h) {
119119
h.parallel_for<class MassAdditionAdoptLockTest>(
120-
test_range, [=](cl::sycl::nd_item<1> item) {
120+
test_range, [=](::sycl::nd_item<1> item) {
121121
traccc::device::mutex m(*_lock);
122122

123123
if (item.get_local_id() == 0) {

0 commit comments

Comments
 (0)
Please sign in to comment.