szha closed pull request #12202: Fix the topk regression issue (#12197)
URL: https://github.com/apache/incubator-mxnet/pull/12202
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/ordering_op-inl.h
b/src/operator/tensor/ordering_op-inl.h
index 16e6c0ecd3f..a6f638e2932 100644
--- a/src/operator/tensor/ordering_op-inl.h
+++ b/src/operator/tensor/ordering_op-inl.h
@@ -433,6 +433,8 @@ void TopKImpl(RunContext ctx,
// 3. Assign results to the ret blob
// When returning indices, only update(modulo) required elements instead of
full elements
// to avoid redundant calculation.
+ // Cast `ret_indices` from int to real_t could introduce conversion error
when the element_num
+ // is large enough.
if (param.ret_typ == topk_enum::kReturnMask) {
Tensor<xpu, 2, real_t> ret_mask =
ret[0].get_with_shape<xpu, 2, real_t>(Shape2(ret[0].Size(), 1), s);
@@ -452,20 +454,21 @@ void TopKImpl(RunContext ctx,
} else if (param.ret_typ == topk_enum::kReturnIndices) {
if (do_transpose) {
Tensor<xpu, 3, real_t> ret_indices = ret[0].FlatTo3D<xpu, real_t>(axis,
axis, s);
- ret_indices = tcast<real_t>(transpose(
- slice<2>(inplace_reshape(indices,
- Shape3(ret_indices.shape_[0],
- ret_indices.shape_[2],
- element_num)),
- 0, k),
- Shape3(0, 2, 1)));
- ret_indices = F<mshadow_op::mod>(ret_indices, element_num);
+ ret_indices = tcast<real_t>(F<mshadow_op::mod>(
+ transpose(slice<2>(inplace_reshape(indices,
+
Shape3(ret_indices.shape_[0],
+
ret_indices.shape_[2],
+ element_num)),
+ 0, k),
+ Shape3(0, 2, 1)),
+ element_num));
} else {
Tensor<xpu, 2, real_t> ret_indices =
ret[0].get_with_shape<xpu, 2, real_t>(Shape2(batch_size, k), s);
- ret_indices = tcast<real_t>(slice<1>(
- inplace_reshape(indices, Shape2(batch_size,
element_num)), 0, k));
- ret_indices = F<mshadow_op::mod>(ret_indices, element_num);
+ ret_indices = tcast<real_t>(F<mshadow_op::mod>(
+ slice<1>(inplace_reshape(indices, Shape2(batch_size,
element_num)),
+ 0, k),
+ element_num));
}
} else {
if (do_transpose) {
@@ -476,23 +479,24 @@ void TopKImpl(RunContext ctx,
Shape3(ret_value.shape_[0],
ret_value.shape_[2], element_num)),
0, k),
Shape3(0, 2, 1));
- ret_indices = tcast<real_t>(transpose(
- slice<2>(inplace_reshape(indices,
- Shape3(ret_indices.shape_[0],
- ret_indices.shape_[2],
- element_num)),
- 0, k),
- Shape3(0, 2, 1)));
- ret_indices = F<mshadow_op::mod>(ret_indices, element_num);
+ ret_indices = tcast<real_t>(F<mshadow_op::mod>(
+ transpose(slice<2>(inplace_reshape(indices,
+
Shape3(ret_indices.shape_[0],
+ ret_indices.shape_[2],
+ element_num)),
+ 0, k),
+ Shape3(0, 2, 1)),
+ element_num));
} else {
Tensor<xpu, 2, real_t> ret_value =
ret[0].get_with_shape<xpu, 2, real_t>(Shape2(batch_size, k), s);
Tensor<xpu, 2, real_t> ret_indices =
ret[1].get_with_shape<xpu, 2, real_t>(Shape2(batch_size, k), s);
ret_value = slice<1>(inplace_reshape(sorted_dat, Shape2(batch_size,
element_num)), 0, k);
- ret_indices = tcast<real_t>(slice<1>(
- inplace_reshape(indices, Shape2(batch_size,
element_num)), 0, k));
- ret_indices = F<mshadow_op::mod>(ret_indices, element_num);
+ ret_indices = tcast<real_t>(F<mshadow_op::mod>(
+ slice<1>(inplace_reshape(indices, Shape2(batch_size,
element_num)),
+ 0, k),
+ element_num));
}
}
}
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
