Skip to content

Technical debt changes in indexing functions #2012

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Technical debt changes in indexing functions #2012

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
89ec213
Rename Python bindings for integer indexing
ndgrigorian Jan 14, 2025
d409117
Change integer indexing mode dispatching
ndgrigorian Feb 22, 2025
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
58 changes: 30 additions & 28 deletions dpctl/tensor/libtensor/source/integer_advanced_indexing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@

#include "integer_advanced_indexing.hpp"

#define INDEXING_MODES 2
#define WRAP_MODE 0
#define CLIP_MODE 1

namespace dpctl
{
namespace tensor
Expand All @@ -62,11 +58,15 @@ namespace td_ns = dpctl::tensor::type_dispatch;
using dpctl::tensor::kernels::indexing::put_fn_ptr_t;
using dpctl::tensor::kernels::indexing::take_fn_ptr_t;

static take_fn_ptr_t take_dispatch_table[INDEXING_MODES][td_ns::num_types]
[td_ns::num_types];
static take_fn_ptr_t take_wrap_dispatch_table[td_ns::num_types]
[td_ns::num_types];

static take_fn_ptr_t take_clip_dispatch_table[td_ns::num_types]
[td_ns::num_types];

static put_fn_ptr_t put_wrap_dispatch_table[td_ns::num_types][td_ns::num_types];

static put_fn_ptr_t put_dispatch_table[INDEXING_MODES][td_ns::num_types]
[td_ns::num_types];
static put_fn_ptr_t put_clip_dispatch_table[td_ns::num_types][td_ns::num_types];

namespace py = pybind11;

Expand Down Expand Up @@ -244,13 +244,13 @@ std::vector<dpctl::tensor::usm_ndarray> parse_py_ind(const sycl::queue &q,
}

std::pair<sycl::event, sycl::event>
usm_ndarray_take(const dpctl::tensor::usm_ndarray &src,
const py::object &py_ind,
const dpctl::tensor::usm_ndarray &dst,
int axis_start,
std::uint8_t mode,
sycl::queue &exec_q,
const std::vector<sycl::event> &depends)
py_take(const dpctl::tensor::usm_ndarray &src,
const py::object &py_ind,
const dpctl::tensor::usm_ndarray &dst,
int axis_start,
std::uint8_t mode,
sycl::queue &exec_q,
const std::vector<sycl::event> &depends)
{
std::vector<dpctl::tensor::usm_ndarray> ind = parse_py_ind(exec_q, py_ind);

Expand Down Expand Up @@ -486,7 +486,8 @@ usm_ndarray_take(const dpctl::tensor::usm_ndarray &src,
std::end(pack_deps));
all_deps.insert(std::end(all_deps), std::begin(depends), std::end(depends));

auto fn = take_dispatch_table[mode][src_type_id][ind_type_id];
auto fn = mode ? take_clip_dispatch_table[src_type_id][ind_type_id]
: take_wrap_dispatch_table[src_type_id][ind_type_id];

if (fn == nullptr) {
sycl::event::wait(host_task_events);
Expand Down Expand Up @@ -515,13 +516,13 @@ usm_ndarray_take(const dpctl::tensor::usm_ndarray &src,
}

std::pair<sycl::event, sycl::event>
usm_ndarray_put(const dpctl::tensor::usm_ndarray &dst,
const py::object &py_ind,
const dpctl::tensor::usm_ndarray &val,
int axis_start,
std::uint8_t mode,
sycl::queue &exec_q,
const std::vector<sycl::event> &depends)
py_put(const dpctl::tensor::usm_ndarray &dst,
const py::object &py_ind,
const dpctl::tensor::usm_ndarray &val,
int axis_start,
std::uint8_t mode,
sycl::queue &exec_q,
const std::vector<sycl::event> &depends)
{
std::vector<dpctl::tensor::usm_ndarray> ind = parse_py_ind(exec_q, py_ind);
int k = ind.size();
Expand Down Expand Up @@ -755,7 +756,8 @@ usm_ndarray_put(const dpctl::tensor::usm_ndarray &dst,
std::end(pack_deps));
all_deps.insert(std::end(all_deps), std::begin(depends), std::end(depends));

auto fn = put_dispatch_table[mode][dst_type_id][ind_type_id];
auto fn = mode ? put_clip_dispatch_table[dst_type_id][ind_type_id]
: put_wrap_dispatch_table[dst_type_id][ind_type_id];

if (fn == nullptr) {
sycl::event::wait(host_task_events);
Expand Down Expand Up @@ -790,20 +792,20 @@ void init_advanced_indexing_dispatch_tables(void)
using dpctl::tensor::kernels::indexing::TakeClipFactory;
DispatchTableBuilder<take_fn_ptr_t, TakeClipFactory, num_types>
dtb_takeclip;
dtb_takeclip.populate_dispatch_table(take_dispatch_table[CLIP_MODE]);
dtb_takeclip.populate_dispatch_table(take_clip_dispatch_table);

using dpctl::tensor::kernels::indexing::TakeWrapFactory;
DispatchTableBuilder<take_fn_ptr_t, TakeWrapFactory, num_types>
dtb_takewrap;
dtb_takewrap.populate_dispatch_table(take_dispatch_table[WRAP_MODE]);
dtb_takewrap.populate_dispatch_table(take_wrap_dispatch_table);

using dpctl::tensor::kernels::indexing::PutClipFactory;
DispatchTableBuilder<put_fn_ptr_t, PutClipFactory, num_types> dtb_putclip;
dtb_putclip.populate_dispatch_table(put_dispatch_table[CLIP_MODE]);
dtb_putclip.populate_dispatch_table(put_clip_dispatch_table);

using dpctl::tensor::kernels::indexing::PutWrapFactory;
DispatchTableBuilder<put_fn_ptr_t, PutWrapFactory, num_types> dtb_putwrap;
dtb_putwrap.populate_dispatch_table(put_dispatch_table[WRAP_MODE]);
dtb_putwrap.populate_dispatch_table(put_wrap_dispatch_table);
}

} // namespace py_internal
Expand Down
28 changes: 14 additions & 14 deletions dpctl/tensor/libtensor/source/integer_advanced_indexing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ namespace py_internal
{

extern std::pair<sycl::event, sycl::event>
usm_ndarray_take(const dpctl::tensor::usm_ndarray &,
const py::object &,
const dpctl::tensor::usm_ndarray &,
int,
std::uint8_t,
sycl::queue &,
const std::vector<sycl::event> & = {});
py_take(const dpctl::tensor::usm_ndarray &,
const py::object &,
const dpctl::tensor::usm_ndarray &,
int,
std::uint8_t,
sycl::queue &,
const std::vector<sycl::event> & = {});

extern std::pair<sycl::event, sycl::event>
usm_ndarray_put(const dpctl::tensor::usm_ndarray &,
const py::object &,
const dpctl::tensor::usm_ndarray &,
int,
std::uint8_t,
sycl::queue &,
const std::vector<sycl::event> & = {});
py_put(const dpctl::tensor::usm_ndarray &,
const py::object &,
const dpctl::tensor::usm_ndarray &,
int,
std::uint8_t,
sycl::queue &,
const std::vector<sycl::event> & = {});

extern void init_advanced_indexing_dispatch_tables(void);

Expand Down
8 changes: 4 additions & 4 deletions dpctl/tensor/libtensor/source/tensor_ctors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ using dpctl::tensor::py_internal::usm_ndarray_full;
using dpctl::tensor::py_internal::usm_ndarray_zeros;

/* ============== Advanced Indexing ============= */
using dpctl::tensor::py_internal::usm_ndarray_put;
using dpctl::tensor::py_internal::usm_ndarray_take;
using dpctl::tensor::py_internal::py_put;
using dpctl::tensor::py_internal::py_take;

using dpctl::tensor::py_internal::py_extract;
using dpctl::tensor::py_internal::py_mask_positions;
Expand Down Expand Up @@ -324,7 +324,7 @@ PYBIND11_MODULE(_tensor_impl, m)
py::arg("fill_value"), py::arg("dst"), py::arg("sycl_queue"),
py::arg("depends") = py::list());

m.def("_take", &usm_ndarray_take,
m.def("_take", &py_take,
"Takes elements at usm_ndarray indices `ind` and axes starting "
"at axis `axis_start` from array `src` and copies them "
"into usm_ndarray `dst` synchronously."
Expand All @@ -333,7 +333,7 @@ PYBIND11_MODULE(_tensor_impl, m)
py::arg("mode"), py::arg("sycl_queue"),
py::arg("depends") = py::list());

m.def("_put", &usm_ndarray_put,
m.def("_put", &py_put,
"Puts elements at usm_ndarray indices `ind` and axes starting "
"at axis `axis_start` into array `dst` from "
"usm_ndarray `val` synchronously."
Expand Down
Loading