Skip to content

Commit 0370b09

Browse files
oleksandr-pavlykoleksandr-pavlyk
committed
Used sycl::queue & for signatures in Python bindings
1 parent a7d4737 commit 0370b09

30 files changed

+209
-248
lines changed

‎dpctl/tensor/libtensor/source/accumulators.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void populate_mask_positions_dispatch_vectors(void)
9999

100100
size_t py_mask_positions(const dpctl::tensor::usm_ndarray &mask,
101101
const dpctl::tensor::usm_ndarray &cumsum,
102-
sycl::queue exec_q,
102+
sycl::queue &exec_q,
103103
const std::vector<sycl::event> &depends)
104104
{
105105
// cumsum is 1D
@@ -155,8 +155,7 @@ size_t py_mask_positions(const dpctl::tensor::usm_ndarray &mask,
155155
? mask_positions_contig_i32_dispatch_vector[mask_typeid]
156156
: mask_positions_contig_i64_dispatch_vector[mask_typeid];
157157

158-
return fn(std::move(exec_q), mask_size, mask_data, cumsum_data,
159-
depends);
158+
return fn(exec_q, mask_size, mask_data, cumsum_data, depends);
160159
}
161160

162161
const py::ssize_t *shape = mask.get_shape_raw();
@@ -236,7 +235,7 @@ void populate_cumsum_1d_dispatch_vectors(void)
236235

237236
size_t py_cumsum_1d(const dpctl::tensor::usm_ndarray &src,
238237
const dpctl::tensor::usm_ndarray &cumsum,
239-
sycl::queue exec_q,
238+
sycl::queue &exec_q,
240239
std::vector<sycl::event> const &depends)
241240
{
242241
// cumsum is 1D
@@ -291,7 +290,7 @@ size_t py_cumsum_1d(const dpctl::tensor::usm_ndarray &src,
291290
"this cumsum requires integer type, got src_typeid=" +
292291
std::to_string(src_typeid));
293292
}
294-
return fn(std::move(exec_q), src_size, src_data, cumsum_data, depends);
293+
return fn(exec_q, src_size, src_data, cumsum_data, depends);
295294
}
296295

297296
const py::ssize_t *shape = src.get_shape_raw();

‎dpctl/tensor/libtensor/source/accumulators.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ extern void populate_mask_positions_dispatch_vectors(void);
4141

4242
extern size_t py_mask_positions(const dpctl::tensor::usm_ndarray &mask,
4343
const dpctl::tensor::usm_ndarray &cumsum,
44-
sycl::queue exec_q,
44+
sycl::queue &exec_q,
4545
const std::vector<sycl::event> &depends = {});
4646

4747
extern void populate_cumsum_1d_dispatch_vectors(void);
4848

4949
extern size_t py_cumsum_1d(const dpctl::tensor::usm_ndarray &src,
5050
const dpctl::tensor::usm_ndarray &cumsum,
51-
sycl::queue exec_q,
51+
sycl::queue &exec_q,
5252
std::vector<sycl::event> const &depends = {});
5353

5454
} // namespace py_internal

‎dpctl/tensor/libtensor/source/boolean_advanced_indexing.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ py_extract(const dpctl::tensor::usm_ndarray &src,
114114
const dpctl::tensor::usm_ndarray &cumsum,
115115
int axis_start, // axis_start <= mask_i < axis_end
116116
int axis_end,
117-
dpctl::tensor::usm_ndarray dst,
118-
sycl::queue exec_q,
117+
const dpctl::tensor::usm_ndarray &dst,
118+
sycl::queue &exec_q,
119119
const std::vector<sycl::event> &depends)
120120
{
121121
int src_nd = src.get_ndim();
@@ -449,7 +449,7 @@ py_place(const dpctl::tensor::usm_ndarray &dst,
449449
int axis_start, // axis_start <= mask_i < axis_end
450450
int axis_end,
451451
const dpctl::tensor::usm_ndarray &rhs,
452-
sycl::queue exec_q,
452+
sycl::queue &exec_q,
453453
const std::vector<sycl::event> &depends)
454454
{
455455
int dst_nd = dst.get_ndim();
@@ -718,7 +718,7 @@ py_nonzero(const dpctl::tensor::usm_ndarray
718718
&indexes, // int32/int64 2D output array, C-contiguous
719719
const std::vector<py::ssize_t>
720720
&mask_shape, // shape of array from which cumsum was computed
721-
sycl::queue exec_q,
721+
sycl::queue &exec_q,
722722
const std::vector<sycl::event> &depends)
723723
{
724724
if (!dpctl::utils::queues_are_compatible(exec_q, {cumsum, indexes})) {

‎dpctl/tensor/libtensor/source/boolean_advanced_indexing.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ py_extract(const dpctl::tensor::usm_ndarray &src,
4343
const dpctl::tensor::usm_ndarray &cumsum,
4444
int axis_start, // axis_start <= mask_i < axis_end
4545
int axis_end,
46-
dpctl::tensor::usm_ndarray dst,
47-
sycl::queue exec_q,
46+
const dpctl::tensor::usm_ndarray &dst,
47+
sycl::queue &exec_q,
4848
const std::vector<sycl::event> &depends = {});
4949

5050
extern void populate_masked_extract_dispatch_vectors(void);
@@ -55,7 +55,7 @@ py_place(const dpctl::tensor::usm_ndarray &dst,
5555
int axis_start, // axis_start <= mask_i < axis_end
5656
int axis_end,
5757
const dpctl::tensor::usm_ndarray &rhs,
58-
sycl::queue exec_q,
58+
sycl::queue &exec_q,
5959
const std::vector<sycl::event> &depends = {});
6060

6161
extern void populate_masked_place_dispatch_vectors(void);
@@ -67,7 +67,7 @@ py_nonzero(const dpctl::tensor::usm_ndarray
6767
&indexes, // int32 2D output array, C-contiguous
6868
const std::vector<py::ssize_t>
6969
&mask_shape, // shape of array from which cumsum was computed
70-
sycl::queue exec_q,
70+
sycl::queue &exec_q,
7171
const std::vector<sycl::event> &depends = {});
7272

7373
} // namespace py_internal

‎dpctl/tensor/libtensor/source/boolean_reductions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ void init_boolean_reduction_functions(py::module_ m)
149149
using impl::all_reduction_strided_dispatch_vector;
150150

151151
auto all_pyapi = [&](const arrayT &src, int trailing_dims_to_reduce,
152-
const arrayT &dst, sycl::queue exec_q,
152+
const arrayT &dst, sycl::queue &exec_q,
153153
const event_vecT &depends = {}) {
154154
return py_boolean_reduction(
155-
src, trailing_dims_to_reduce, dst, std::move(exec_q), depends,
155+
src, trailing_dims_to_reduce, dst, exec_q, depends,
156156
all_reduction_axis1_contig_dispatch_vector,
157157
all_reduction_axis0_contig_dispatch_vector,
158158
all_reduction_strided_dispatch_vector);
@@ -170,10 +170,10 @@ void init_boolean_reduction_functions(py::module_ m)
170170
using impl::any_reduction_strided_dispatch_vector;
171171

172172
auto any_pyapi = [&](const arrayT &src, int trailing_dims_to_reduce,
173-
const arrayT &dst, sycl::queue exec_q,
173+
const arrayT &dst, sycl::queue &exec_q,
174174
const event_vecT &depends = {}) {
175175
return py_boolean_reduction(
176-
src, trailing_dims_to_reduce, dst, std::move(exec_q), depends,
176+
src, trailing_dims_to_reduce, dst, exec_q, depends,
177177
any_reduction_axis1_contig_dispatch_vector,
178178
any_reduction_axis0_contig_dispatch_vector,
179179
any_reduction_strided_dispatch_vector);

‎dpctl/tensor/libtensor/source/boolean_reductions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ std::pair<sycl::event, sycl::event>
5252
py_boolean_reduction(const dpctl::tensor::usm_ndarray &src,
5353
int trailing_dims_to_reduce,
5454
const dpctl::tensor::usm_ndarray &dst,
55-
sycl::queue exec_q,
55+
sycl::queue &exec_q,
5656
const std::vector<sycl::event> &depends,
5757
const contig_dispatchT &axis1_contig_dispatch_vector,
5858
const contig_dispatchT &axis0_contig_dispatch_vector,

‎dpctl/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ using dpctl::utils::keep_args_alive;
6969
std::pair<sycl::event, sycl::event>
7070
copy_usm_ndarray_into_usm_ndarray(const dpctl::tensor::usm_ndarray &src,
7171
const dpctl::tensor::usm_ndarray &dst,
72-
sycl::queue exec_q,
72+
sycl::queue &exec_q,
7373
const std::vector<sycl::event> &depends = {})
7474
{
7575
// array dimensions must be the same

‎dpctl/tensor/libtensor/source/copy_and_cast_usm_to_usm.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace py_internal
4040
extern std::pair<sycl::event, sycl::event>
4141
copy_usm_ndarray_into_usm_ndarray(const dpctl::tensor::usm_ndarray &src,
4242
const dpctl::tensor::usm_ndarray &dst,
43-
sycl::queue exec_q,
43+
sycl::queue &exec_q,
4444
const std::vector<sycl::event> &depends = {});
4545

4646
extern void init_copy_and_cast_usm_to_usm_dispatch_tables();

‎dpctl/tensor/libtensor/source/copy_for_reshape.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static copy_for_reshape_fn_ptr_t
6060
std::pair<sycl::event, sycl::event>
6161
copy_usm_ndarray_for_reshape(const dpctl::tensor::usm_ndarray &src,
6262
const dpctl::tensor::usm_ndarray &dst,
63-
sycl::queue exec_q,
63+
sycl::queue &exec_q,
6464
const std::vector<sycl::event> &depends)
6565
{
6666
py::ssize_t src_nelems = src.get_size();

‎dpctl/tensor/libtensor/source/copy_for_reshape.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace py_internal
4040
extern std::pair<sycl::event, sycl::event>
4141
copy_usm_ndarray_for_reshape(const dpctl::tensor::usm_ndarray &src,
4242
const dpctl::tensor::usm_ndarray &dst,
43-
sycl::queue exec_q,
43+
sycl::queue &exec_q,
4444
const std::vector<sycl::event> &depends = {});
4545

4646
extern void init_copy_for_reshape_dispatch_vectors();

0 commit comments

Comments
 (0)