Skip to content

Commit

Permalink
Review comment, removed axes==0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
siju-samuel committed Oct 30, 2018
1 parent e71b52e commit ea35173
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/tvm/relay/attrs/transform.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ struct SliceLikeAttrs : public tvm::AttrsNode<SliceLikeAttrs> {
Array<Integer> axes;

TVM_DECLARE_ATTRS(SliceLikeAttrs, "relay.attrs.SliceLikeAttrs") {
TVM_ATTR_FIELD(axes).set_default(Array<Integer>())
TVM_ATTR_FIELD(axes)
.describe("List of axes on which input data will be sliced according to the "
"corresponding size of the second input. By default will slice "
"on all axes. Negative axes mean counting in reverse.");
Expand Down
3 changes: 2 additions & 1 deletion src/relay/op/tensor/transform.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ bool SliceLikeRel(const Array<Type>& types,
const Array<IndexExpr> target_shape = target->shape;
std::vector<IndexExpr>&& oshape = AsVector(dshape);

if (!param->axes.defined() || param->axes.size() == 0) {
if (!param->axes.defined()) {
for (size_t i = 0; i < dshape.size(); ++i) {
if (i < target_shape.size()) {
oshape[i] = target_shape[i];
Expand All @@ -1030,6 +1030,7 @@ bool SliceLikeRel(const Array<Type>& types,
}
}
} else {
CHECK(param->axes.size() != 0) << "Axes cannot be empty.";
for (Integer i : param->axes) {
if (reporter->Assert(i < make_const(Int(64), 0))) {
i += make_const(Int(64), dshape.size());
Expand Down
8 changes: 4 additions & 4 deletions tests/python/relay/test_op_level10.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ def verify_slice_like(data, slice_like, axes, output, dtype="float32"):

def test_slice_like():
d1, d2, d3, d4 = tvm.var("d1"), tvm.var("d2"), tvm.var("d3"), tvm.var("d4")
verify_slice_like(data=(d1, d2, d3), slice_like=(1, 2, 3), axes=[], output=(1, 2, 3))
verify_slice_like(data=(1, 2, 3), slice_like=(d1, d2, d3), axes=[], output=(d1, d2, d3))
verify_slice_like(data=(d1, d2, d3), slice_like=(1, 2, 3), axes=None, output=(1, 2, 3))
verify_slice_like(data=(1, 2, 3), slice_like=(d1, d2, d3), axes=None, output=(d1, d2, d3))
verify_slice_like(data=(d2, d3, d4), slice_like=(d1, d2, d3), axes=(1,2), output=(d2, d2, d3))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2, 3), axes=[], output=(1, 2, 3))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2), axes=[], output=(1, 2, 5))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2, 3), axes=None, output=(1, 2, 3))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2), axes=None, output=(1, 2, 5))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2, 3), axes=(1, 2), output=(3, 2, 3))
verify_slice_like(data=(3, 4, 5), slice_like=(1, 2, 3), axes=(-1, -3), output=(1, 4, 3))
verify_slice_like(data=(1, 3, 224, 224),
Expand Down

0 comments on commit ea35173

Please sign in to comment.