mikemwx commented on a change in pull request #15314: [Numpy] Numpy dstack
URL: https://github.com/apache/incubator-mxnet/pull/15314#discussion_r302874471
##########
File path: src/operator/numpy/np_matrix_op.cc
##########
@@ -55,6 +55,67 @@ bool NumpyTransposeShape(const nnvm::NodeAttrs& attrs,
return shape_is_known(ret);
}
+bool DStackShape(const nnvm::NodeAttrs& attrs,
+ mxnet::ShapeVector *in_shape,
+ mxnet::ShapeVector *out_shape) {
+ using namespace mshadow;
+ ConcatParam param_ = nnvm::get<ConcatParam>(attrs.parsed);
+ CHECK_EQ(in_shape->size(), static_cast<size_t>(param_.num_args));
+ mxnet::TShape dshape;
+ dim_t size = 0;
+ bool has_unknown_dim_size = false;
+ int axis = 2;
+ param_.dim = axis;
+ for (int i = 0; i < param_.num_args; ++i) {
+ if ((*in_shape)[i].ndim() == 0) {
+ (*in_shape)[i] = mxnet::TShape(3, 1);
+ } else if ((*in_shape)[i].ndim() == 1) {
+ mxnet::TShape t = mxnet::TShape(3, 1);
+ t[1] = (*in_shape)[i][0];
+ (*in_shape)[i] = t;
+ } else if ((*in_shape)[i].ndim() == 2) {
+ mxnet::TShape t = mxnet::TShape(3, 1);
+ t[0] = (*in_shape)[i][0];
+ t[1] = (*in_shape)[i][1];
+ (*in_shape)[i] = t;
+ }
+ mxnet::TShape &tmp = (*in_shape)[i];
+ if (tmp.ndim() > 0) {
+ CheckAxis(axis, tmp.ndim());
+ if (!mxnet::dim_size_is_known(tmp, axis)) {
+ has_unknown_dim_size = true;
+ } else {
+ size += tmp[axis];
+ }
+ tmp[axis] = -1;
+ shape_assign(&dshape, tmp);
+ }
+ }
+
+ mxnet::TShape tmp = (*out_shape)[0];
+ if (tmp.ndim() > 0) {
+ axis = CheckAxis(param_.dim, tmp.ndim());
+ tmp[axis] = -1;
+ shape_assign(&dshape, tmp);
+ }
+
+ if (dshape.ndim() == -1) return false;
+ CHECK_NE(dshape.ndim(), 0) << "zero-dimensional arrays cannot be
concatenated";
+
+ for (int i = 0; i < param_.num_args; ++i) {
+ CHECK(shape_assign(&(*in_shape)[i], dshape))
+ << "Incompatible input shape: expected " << dshape << ", got " <<
(*in_shape)[i];
Review comment:
Thanks. Resolved.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
