You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/07/23 20:19:34 UTC
[GitHub] reminisce closed pull request #11406: [MXNET-599] Partial shape
infer for Slice
reminisce closed pull request #11406: [MXNET-599] Partial shape infer for Slice
URL: https://github.com/apache/incubator-mxnet/pull/11406
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/operator/tensor/matrix_op-inl.h b/src/operator/tensor/matrix_op-inl.h
index 555b9cc7cb5..dcdf03a5316 100644
--- a/src/operator/tensor/matrix_op-inl.h
+++ b/src/operator/tensor/matrix_op-inl.h
@@ -606,7 +606,6 @@ inline void GetIndexRange(const TShape& dshape,
common::StaticArray<int, ndim>* end,
common::StaticArray<int, ndim>* step) {
CHECK_NE(dshape.ndim(), 0U);
- CHECK_NE(dshape.Size(), 0U);
CHECK_LE(param_begin.ndim(), dshape.ndim())
<< "Slicing axis exceeds data dimensions";
CHECK_LE(param_end.ndim(), dshape.ndim())
@@ -633,32 +632,36 @@ inline void GetIndexRange(const TShape& dshape,
}
}
- if (param_begin[i].has_value()) {
- b = param_begin[i].value();
- if (b < 0) {
- b += len;
- CHECK_GE(b, 0) << "slicing with begin[" << i << "]="
- << b - len << " exceeds limit of " << len;
+ if (len) {
+ if (param_begin[i].has_value()) {
+ b = param_begin[i].value();
+ if (b < 0) {
+ b += len;
+ CHECK_GE(b, 0) << "slicing with begin[" << i << "]="
+ << b - len << " exceeds limit of " << len;
+ }
+ } else if (s < 0) {
+ b = len - 1;
}
- } else if (s < 0) {
- b = len - 1;
- }
- CHECK_LT(b, len) << "slicing with begin[" << i << "]="
- << b << " exceends limit of " << len;
-
- if (param_end[i].has_value()) {
- e = param_end[i].value();
- if (e < 0) {
- e += len;
- CHECK_GE(e, 0) << "slicing with end[" << i << "]="
- << e - len << " exceeds limit of " << len;
+ CHECK_LT(b, len) << "slicing with begin[" << i << "]="
+ << b << " exceends limit of " << len;
+
+ if (param_end[i].has_value()) {
+ e = param_end[i].value();
+ if (e < 0) {
+ e += len;
+ CHECK_GE(e, 0) << "slicing with end[" << i << "]="
+ << e - len << " exceeds limit of " << len;
+ }
+ } else if (s < 0) {
+ e = -1;
}
- } else if (s < 0) {
- e = -1;
+ CHECK_LE(e, len) << "slicing with end[" << i << "]="
+ << e << " exceeds limit of " << len;
+ } else {
+ b = 0;
+ e = 0;
}
- CHECK_LE(e, len) << "slicing with end[" << i << "]="
- << e << " exceeds limit of " << len;
-
(*begin)[i] = b;
(*end)[i] = e;
(*step)[i] = s;
@@ -673,15 +676,17 @@ inline void GetIndexRange(const TShape& dshape,
inline void SetSliceOpOutputDimSize(const index_t i, const int b,
const int e, const int s,
TShape* oshape) {
- if (s > 0) {
- CHECK_LT(b, e) << "slicing with begin=[" << i << "]=" << b << ", end[" << i << "]="
- << e << ", and step[" << i << "]=" << s << " is invalid";
- (*oshape)[i] = (e - b - 1) / s + 1;
- } else {
- CHECK_LT(e, b) << "slicing with begin=[" << i << "]=" << b << ", end[" << i << "]="
- << e << ", and step[" << i << "]=" << s << " is invalid";
- (*oshape)[i] = (b - e - 1) / (-s) + 1;
- }
+ if (e != b) {
+ if (s > 0) {
+ CHECK_LT(b, e) << "slicing with begin=[" << i << "]=" << b << ", end[" << i << "]="
+ << e << ", and step[" << i << "]=" << s << " is invalid";
+ (*oshape)[i] = (e - b - 1) / s + 1;
+ } else {
+ CHECK_LT(e, b) << "slicing with begin=[" << i << "]=" << b << ", end[" << i << "]="
+ << e << ", and step[" << i << "]=" << s << " is invalid";
+ (*oshape)[i] = (b - e - 1) / (-s) + 1;
+ }
+ } // else leave oshape[i] as 0 for partial infer
}
inline bool SliceOpShape(const nnvm::NodeAttrs& attrs,
@@ -690,9 +695,10 @@ inline bool SliceOpShape(const nnvm::NodeAttrs& attrs,
CHECK_EQ(in_attrs->size(), 1U);
CHECK_EQ(out_attrs->size(), 1U);
const TShape& dshape = (*in_attrs)[0];
- if (dshape.ndim() == 0 || dshape.Size() == 0) return false;
+ if (dshape.ndim() == 0) return false;
const SliceParam& param = nnvm::get<SliceParam>(attrs.parsed);
TShape oshape = dshape;
+
MXNET_NDIM_SWITCH(dshape.ndim(), ndim, {
common::StaticArray<int, ndim> begin, end, step;
GetIndexRange(dshape, param.begin, param.end, param.step, &begin, &end, &step);
@@ -703,7 +709,7 @@ inline bool SliceOpShape(const nnvm::NodeAttrs& attrs,
});
SHAPE_ASSIGN_CHECK(*out_attrs, 0, oshape);
- return oshape.ndim() != 0 && oshape.Size() != 0;
+ return !shape_is_none(dshape) && !shape_is_none(oshape);
}
template<int ndim, int req, typename xpu>
@@ -1091,18 +1097,25 @@ inline void GetSliceAxisParams(const SliceAxisParam& param, const TShape& ishape
if (*begin < 0) {
*begin += axis_size;
}
- if (!static_cast<bool>(param.end)) {
- *end = axis_size;
- } else {
- *end = param.end.value();
- if (*end < 0) {
- *end += axis_size;
+ if (axis_size) {
+ if (!static_cast<bool>(param.end)) {
+ *end = axis_size;
+ } else {
+ *end = param.end.value();
+ if (*end < 0) {
+ *end += axis_size;
+ }
}
+ CHECK(*end <= axis_size) << "Invalid end for end=" << *end << " as axis_size is " << axis_size;
+ CHECK((*begin < *end))
+ << "Invalid begin, end, get begin=" << param.begin << ", end=" << param.end;
+ } else {
+ *begin = 0;
+ *end = 0;
}
- CHECK((*end <= axis_size) && (*end >= 0))
- << "Invalid begin, end, get begin=" << param.begin << ", end=" << param.end;
- CHECK((*begin < *end) && (*begin >= 0))
+ CHECK(*end >= 0)
<< "Invalid begin, end, get begin=" << param.begin << ", end=" << param.end;
+ CHECK(*begin >= 0) << "Invalid begin for begin=" << param.begin;
}
inline bool SliceAxisShape(const nnvm::NodeAttrs& attrs,
diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
index 67426693436..628d8c6316c 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -5740,6 +5740,27 @@ def test_slice_forward_backward(a, index):
slice_sym = mx.sym.slice(data, begin=[0, None], end=[1, None], step=[2, -1])
check_numeric_gradient(slice_sym, [in_data])
+def test_slice_partial_infer():
+ def check_slice_partial_infer(data, begin, end, step, expected_out_shape):
+ out = mx.sym.slice(data, begin=begin, end=end, step=step)
+ assert (out.infer_shape_partial()[1][0] == expected_out_shape), out.infer_shape_partial()[1]
+
+ def check_slice_axis_partial_infer(data, axis, begin, end, expected_out_shape):
+ out = mx.sym.slice_axis(data, axis=axis, begin=begin, end=end)
+ assert (out.infer_shape_partial()[1][0] == expected_out_shape), out.infer_shape_partial()[1]
+
+ var1 = mx.sym.var(name="data", shape=(0, 20))
+ check_slice_partial_infer(var1, (None, None), (None, 10), [], (0, 10))
+ check_slice_partial_infer(var1, (None, None), (None, 10), (None, 2), (0, 5))
+ check_slice_partial_infer(var1, (None, 3), (None, 10), [], (0, 7))
+ check_slice_partial_infer(var1, (None, 3), (5, 10), [], (0, 7))
+ check_slice_partial_infer(var1, (2, 3), (None, 10), [], (0, 7))
+ check_slice_partial_infer(var1, (2, 3), (None, 10), (None, 1), (0, 7))
+ check_slice_partial_infer(var1, (2, 3), (None, 10), (3, 3), (0, 3))
+
+ var1 = mx.sym.var(name="data", shape=(10, 0))
+ check_slice_axis_partial_infer(var1, 0, 0, 5, (5, 0))
+ check_slice_axis_partial_infer(var1, 1, 0, 5, (10, 0))
@with_seed()
def test_float16_min_max():
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services