Skip to content

[Fix][Relax] Canonicalize strided slice begin indices #20284

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

Open
napronald wants to merge 1 commit into
base: main
Choose a base branch
from
+147 −25
Open

[Fix][Relax] Canonicalize strided slice begin indices #20284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions include/tvm/topi/transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ inline PrimExpr DynamicCanonicalizeIndex(PrimExpr index, PrimExpr extent, PrimEx
auto extent_var = extent.as<tvm::tirx::PrimVar>();

if (idx_var && extent_var && (*idx_var)->name == (*extent_var)->name) {
return index;
return tvm::if_then_else(stride < 0, extent - 1, extent);
}

PrimExpr begin_range = tvm::if_then_else(stride < 0, -1, 0);
Expand Down Expand Up @@ -747,7 +747,11 @@ inline te::Tensor dynamic_strided_slice_with_axes(

for (size_t i = 0; i < begin.size(); i++) {
int axis = static_cast<int>(axes[i]);
PrimExpr new_index = indices[axis] * strides[i] + begin[i];
PrimExpr begin_index = begin[i];
if (!assume_inbound) {
begin_index = CanonicalizeIndex(begin_index, x->shape[axis], strides[i]);
}
PrimExpr new_index = indices[axis] * strides[i] + begin_index;
real_indices.Set(axis, new_index);
}

Expand Down Expand Up @@ -805,7 +809,11 @@ inline Tensor dynamic_strided_slice(const Tensor& x, const ffi::Array<PrimExpr>&
[&](const ffi::Array<tvm::tirx::PrimVar>& indices) {
ffi::Array<PrimExpr> real_indices;
for (size_t i = 0; i < num_slice_axes; ++i) {
real_indices.push_back(indices[i] * strides[i] + tvm::min(begin[i], x->shape[i] - 1));
PrimExpr begin_index = tvm::min(begin[i], x->shape[i] - 1);
if (!assume_inbound) {
begin_index = CanonicalizeIndex(begin[i], x->shape[i], strides[i]);
}
real_indices.push_back(indices[i] * strides[i] + begin_index);
}
// keep input dim
for (size_t i = num_slice_axes; i < src_tensor_dim; ++i) {
Expand Down Expand Up @@ -2319,7 +2327,8 @@ inline te::Tensor dynamic_strided_slice(const te::Tensor& x, const te::Tensor& b
ffi::Array<PrimExpr> real_indices;
for (size_t i = 0; i < num_dynamic_axes; ++i) {
auto ind = IntImm::Int64(i);
real_indices.push_back(indices[i] * strides(ind) + tvm::min(begin(ind), x->shape[i] - 1));
PrimExpr begin_index = CanonicalizeIndex(begin(ind), x->shape[i], strides(ind));
real_indices.push_back(indices[i] * strides(ind) + begin_index);
}
return x(real_indices);
},
Expand Down
37 changes: 36 additions & 1 deletion tests/python/relax/test_e2e_op_dynamic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
pytest.importorskip("scipy") # tvm.topi.testing imports scipy

import tvm.topi.testing
from tvm import relax
from tvm import relax, tirx
from tvm.relax.transform import LegalizeOps
from tvm.script import relax as R
from tvm.script import tirx as T
Expand All @@ -44,6 +44,9 @@ def build(mod):
([0, 2, 4, 4], [5, 5, 7, 8], [1, 1, 2, 3]),
([0, 2, 4, 4], [5, 5, 11, 10], [1, 1, 1, 1]),
([0, 2, 10, 14], [0, 5, 1, 1], [1, 1, -1, -2]),
([-2, 0, 0, 0], [8, 9, 10, 10], [1, 1, 1, 1]),
([-58, 0, 0, 0], [8, 9, 10, 10], [1, 1, 1, 1]),
([-1, 0, 0, 0], [-9, 9, 10, 10], [-1, 1, 1, 1]),
],
)
def test_dynamic_strided_slice(begin, end, strides):
Expand Down Expand Up @@ -75,6 +78,9 @@ def main(x: R.Tensor((8, 9, 10, 10), "float32"), begin: R.Tensor((4,),"int64"),
([0, 2, 4, 4], [5, 5, 7, 8], [1, 1, 2, 3]),
([0, 2, 4, 4], [5, 5, 11, 10], [1, 1, 1, 1]),
([0, 2, 10, 14], [0, 5, 1, 1], [1, 1, -1, -2]),
([-2, 0, 0, 0], [8, 9, 10, 10], [1, 1, 1, 1]),
([-58, 0, 0, 0], [8, 9, 10, 10], [1, 1, 1, 1]),
([-1, 0, 0, 0], [-9, 9, 10, 10], [-1, 1, 1, 1]),
],
)
def test_dynamic_strided_slice_symbolic(begin, end, strides):
Expand Down Expand Up @@ -102,5 +108,34 @@ def main(x: R.Tensor(("m", "n", 10, 10), "float32"), begin: R.Tensor((4,),"int64
tvm.testing.assert_allclose(out_nd.numpy(), out_npy)


@pytest.mark.parametrize("begin_offset", [0, 1])
def test_strided_slice_symbolic_out_of_bounds(begin_offset):
dim = tirx.Var("m", "int64")

bb = relax.BlockBuilder()
x = relax.Var("x", relax.TensorType([dim], "float32"))

with bb.function("main", params=[x]):
with bb.dataflow():
y = bb.emit(
relax.op.strided_slice(
x,
axes=[0],
begin=[dim + begin_offset],
end=[-dim - 1],
strides=[-1],
)
)
gv = bb.emit_output(y)
bb.emit_func_output(gv)

vm = build(bb.get())

x_np = np.arange(8, dtype=np.float32)
out = vm["main"](tvm.runtime.tensor(x_np, dev)).numpy()

tvm.testing.assert_allclose(out, x_np[::-1])


if __name__ == "__main__":
tvm.testing.main()
4 changes: 2 additions & 2 deletions tests/python/relax/test_op_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,9 +954,9 @@ def strided_slice(A: T.Buffer((T.int64(16), T.int64(16)), "float32"), index: T.i
for ax0, ax1 in T.grid(T.max(T.int64(16) - T.max(T.if_then_else(index < T.int64(0), index + T.int64(16), index), T.int64(0)), T.int64(0)), T.int64(16)):
with T.sblock("T_dynamic_strided_slice_with_axes"):
v_ax0, v_ax1 = T.axis.remap("SS", [ax0, ax1])
T.reads(A[v_ax0 + index, v_ax1])
T.reads(A[v_ax0 : v_ax0 + T.int64(17), v_ax1])
T.writes(T_dynamic_strided_slice_with_axes[v_ax0, v_ax1])
T_dynamic_strided_slice_with_axes[v_ax0, v_ax1] = A[v_ax0 + index, v_ax1]
T_dynamic_strided_slice_with_axes[v_ax0, v_ax1] = A[T.min(T.max(T.if_then_else(index < T.int64(0), index + T.int64(16), index), T.int64(0)), T.int64(16)) + v_ax0, v_ax1]

@R.function
def main(A: R.Tensor((16, 16), dtype="float32"), B: R.Shape(["index"])) -> R.Tensor(("T.max(16 - T.max(T.if_then_else(index < 0, index + 16, index), 0), 0)", 16), dtype="float32"):
Expand Down
114 changes: 96 additions & 18 deletions tests/python/relax/test_transform_legalize_ops_index_linear_algebra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,27 +460,79 @@ def dynamic_strided_slice(
v_ax0, v_ax1, v_ax2, v_ax3 = T.axis.remap("SSSS", [ax0, ax1, ax2, ax3])
T.reads(
rxplaceholder[
T.min(rxplaceholder_1[T.int64(0)], T.int64(7))
+ v_ax0 * rxplaceholder_3[T.int64(0)],
T.min(rxplaceholder_1[T.int64(1)], T.int64(8))
+ v_ax1 * rxplaceholder_3[T.int64(1)],
T.min(rxplaceholder_1[T.int64(2)], T.int64(9))
+ v_ax2 * rxplaceholder_3[T.int64(2)],
T.min(rxplaceholder_1[T.int64(3)], T.int64(9))
+ v_ax3 * rxplaceholder_3[T.int64(3)],
T.int64(0) : T.int64(8),
T.int64(0) : T.int64(9),
T.int64(0) : T.int64(10),
T.int64(0) : T.int64(10),
],
rxplaceholder_1[T.int64(0) : T.int64(4)],
rxplaceholder_3[T.int64(0) : T.int64(4)],
)
T.writes(T_strided_slice_dynamic[v_ax0, v_ax1, v_ax2, v_ax3])
T_strided_slice_dynamic[v_ax0, v_ax1, v_ax2, v_ax3] = rxplaceholder[
T.min(rxplaceholder_1[T.int64(0)], T.int64(7))
T.min(
T.max(
T.if_then_else(
rxplaceholder_1[T.int64(0)] < T.int64(0),
rxplaceholder_1[T.int64(0)] + T.int64(8),
rxplaceholder_1[T.int64(0)],
),
T.if_then_else(
rxplaceholder_3[T.int64(0)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_3[T.int64(0)] < T.int64(0), T.int64(7), T.int64(8)
),
)
+ v_ax0 * rxplaceholder_3[T.int64(0)],
T.min(rxplaceholder_1[T.int64(1)], T.int64(8))
T.min(
T.max(
T.if_then_else(
rxplaceholder_1[T.int64(1)] < T.int64(0),
rxplaceholder_1[T.int64(1)] + T.int64(9),
rxplaceholder_1[T.int64(1)],
),
T.if_then_else(
rxplaceholder_3[T.int64(1)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_3[T.int64(1)] < T.int64(0), T.int64(8), T.int64(9)
),
)
+ v_ax1 * rxplaceholder_3[T.int64(1)],
T.min(rxplaceholder_1[T.int64(2)], T.int64(9))
T.min(
T.max(
T.if_then_else(
rxplaceholder_1[T.int64(2)] < T.int64(0),
rxplaceholder_1[T.int64(2)] + T.int64(10),
rxplaceholder_1[T.int64(2)],
),
T.if_then_else(
rxplaceholder_3[T.int64(2)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_3[T.int64(2)] < T.int64(0), T.int64(9), T.int64(10)
),
)
+ v_ax2 * rxplaceholder_3[T.int64(2)],
T.min(rxplaceholder_1[T.int64(3)], T.int64(9))
T.min(
T.max(
T.if_then_else(
rxplaceholder_1[T.int64(3)] < T.int64(0),
rxplaceholder_1[T.int64(3)] + T.int64(10),
rxplaceholder_1[T.int64(3)],
),
T.if_then_else(
rxplaceholder_3[T.int64(3)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_3[T.int64(3)] < T.int64(0), T.int64(9), T.int64(10)
),
)
+ v_ax3 * rxplaceholder_3[T.int64(3)],
]

Expand Down Expand Up @@ -748,19 +800,45 @@ def dynamic_strided_slice(
v_ax0, v_ax1 = T.axis.remap("SS", [ax0, ax1])
T.reads(
rxplaceholder_3[
T.min(rxplaceholder[T.int64(0)], T.int64(9))
+ v_ax0 * rxplaceholder_2[T.int64(0)],
T.min(rxplaceholder[T.int64(1)], n - T.int64(1))
+ v_ax1 * rxplaceholder_2[T.int64(1)],
T.int64(0) : T.int64(10),
T.int64(0) : n,
],
rxplaceholder[T.int64(0) : T.int64(2)],
rxplaceholder_2[T.int64(0) : T.int64(2)],
)
T.writes(T_strided_slice_dynamic[v_ax0, v_ax1])
T_strided_slice_dynamic[v_ax0, v_ax1] = rxplaceholder_3[
T.min(rxplaceholder[T.int64(0)], T.int64(9))
T.min(
T.max(
T.if_then_else(
rxplaceholder[T.int64(0)] < T.int64(0),
rxplaceholder[T.int64(0)] + T.int64(10),
rxplaceholder[T.int64(0)],
),
T.if_then_else(
rxplaceholder_2[T.int64(0)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_2[T.int64(0)] < T.int64(0), T.int64(9), T.int64(10)
),
)
+ v_ax0 * rxplaceholder_2[T.int64(0)],
T.min(rxplaceholder[T.int64(1)], n - T.int64(1))
T.min(
T.max(
T.if_then_else(
rxplaceholder[T.int64(1)] < T.int64(0),
rxplaceholder[T.int64(1)] + n,
rxplaceholder[T.int64(1)],
),
T.if_then_else(
rxplaceholder_2[T.int64(1)] < T.int64(0), T.int64(-1), T.int64(0)
),
),
T.if_then_else(
rxplaceholder_2[T.int64(1)] < T.int64(0), n - T.int64(1), n
),
)
+ v_ax1 * rxplaceholder_2[T.int64(1)],
]

Expand Down
Loading