piiswrong closed pull request #10410: Fix output names of nn operators.
URL: https://github.com/apache/incubator-mxnet/pull/10410
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/executor/graph_executor.cc b/src/executor/graph_executor.cc
index 9108bae1732..4d24f5501ef 100644
--- a/src/executor/graph_executor.cc
+++ b/src/executor/graph_executor.cc
@@ -1457,6 +1457,7 @@ void GraphExecutor::ExecuteMonCallback(size_t nid) {
output_names.emplace_back(std::to_string(i));
}
}
+ CHECK_EQ(opnode.exec->out_array.size(), output_names.size());
for (index_t i = 0; i < opnode.exec->out_array.size(); ++i) {
NDArray *cpy = new NDArray(opnode.exec->out_array[i]);
std::string name = inode.source->attrs.name + "_" + output_names[i];
diff --git a/src/operator/nn/activation.cc b/src/operator/nn/activation.cc
index 08028265c48..382efeb1447 100644
--- a/src/operator/nn/activation.cc
+++ b/src/operator/nn/activation.cc
@@ -150,6 +150,10 @@ The following activation functions are supported:
)code" ADD_FILELINE)
.set_attr_parser(ParamParser<ActivationParam>)
.set_attr<FInferStorageType>("FInferStorageType", ActivationStorageType)
+.set_attr<nnvm::FListOutputNames>("FListOutputNames",
+ [](const NodeAttrs& attrs) {
+ return std::vector<std::string>{"output"};
+})
.set_attr<FCompute>("FCompute<cpu>", ActivationCompute<cpu>)
#if MXNET_USE_MKLDNN == 1
.set_attr<FComputeEx>("FComputeEx<cpu>", ActivationComputeExCPU)
diff --git a/src/operator/nn/concat.cc b/src/operator/nn/concat.cc
index 81dc95f1a5a..a7fcb1c8817 100644
--- a/src/operator/nn/concat.cc
+++ b/src/operator/nn/concat.cc
@@ -248,6 +248,10 @@ Example::
}
return ret;
})
+.set_attr<nnvm::FListOutputNames>("FListOutputNames",
+ [](const NodeAttrs& attrs) {
+ return std::vector<std::string>{"output"};
+})
#if MXNET_USE_MKLDNN == 1
.set_attr<FResourceRequest>("FResourceRequest", [](const NodeAttrs& n) {
return std::vector<ResourceRequest>{ResourceRequest::kTempSpace};
diff --git a/src/operator/nn/pooling.cc b/src/operator/nn/pooling.cc
index f719e0753e0..9843cb7f4f6 100644
--- a/src/operator/nn/pooling.cc
+++ b/src/operator/nn/pooling.cc
@@ -368,7 +368,11 @@ height, width)*.
})
.set_attr<nnvm::FListOutputNames>("FListOutputNames",
[](const NodeAttrs& attrs) {
- return std::vector<std::string>{"output"};
+ const PoolingParam ¶m = nnvm::get<PoolingParam>(attrs.parsed);
+ if (GetNumOutputs(param) == 2)
+ return std::vector<std::string>{"output", "workspace"};
+ else
+ return std::vector<std::string>{"output"};
})
.set_attr_parser(PoolingParamParser)
.set_attr<FInferStorageType>("FInferStorageType", PoolingStorageType)
diff --git a/src/operator/nn/softmax.cc b/src/operator/nn/softmax.cc
index 0f559475d1c..f8cc6fee9a2 100644
--- a/src/operator/nn/softmax.cc
+++ b/src/operator/nn/softmax.cc
@@ -96,6 +96,10 @@ Example::
)code" ADD_FILELINE)
.set_attr_parser(ParamParser<SoftmaxParam>)
+.set_attr<nnvm::FListOutputNames>("FListOutputNames",
+ [](const NodeAttrs& attrs) {
+ return std::vector<std::string>{"output"};
+})
.set_attr<FCompute>("FCompute<cpu>", SoftmaxCompute<cpu,
mxnet_op::softmax_fwd>)
#if MXNET_USE_MKLDNN == 1
.set_attr<FComputeEx>("FComputeEx<cpu>", SoftmaxComputeExCPU)
diff --git a/src/operator/nn/softmax_activation.cc
b/src/operator/nn/softmax_activation.cc
index bdfd8b065de..8a28243dfce 100644
--- a/src/operator/nn/softmax_activation.cc
+++ b/src/operator/nn/softmax_activation.cc
@@ -58,6 +58,10 @@ Example::
)code" ADD_FILELINE)
.set_attr_parser(ParamParser<SoftmaxActivationParam>)
+.set_attr<nnvm::FListOutputNames>("FListOutputNames",
+ [](const NodeAttrs& attrs) {
+ return std::vector<std::string>{"output"};
+})
.set_attr<FCompute>("FCompute<cpu>", SoftmaxActivationCompute<cpu>)
.set_attr<nnvm::FGradient>("FGradient",
ElemwiseGradUseOut{"_backward_SoftmaxActivation"})
.add_arguments(SoftmaxActivationParam::__FIELDS__());
diff --git a/src/operator/nn/upsampling.cc b/src/operator/nn/upsampling.cc
index 44b619ac951..5aa111e26f7 100644
--- a/src/operator/nn/upsampling.cc
+++ b/src/operator/nn/upsampling.cc
@@ -132,6 +132,10 @@ NNVM_REGISTER_OP(UpSampling)
[](const NodeAttrs& attrs) {
return ListArguments(nnvm::get<UpSamplingParam>(attrs.parsed));
})
+.set_attr<nnvm::FListOutputNames>("FListOutputNames",
+ [](const NodeAttrs& attrs) {
+ return std::vector<std::string>{"output"};
+})
.set_attr<nnvm::FInferShape>("FInferShape", UpSamplingShape)
.set_attr<nnvm::FInferType>("FInferType", UpSamplingType)
.set_attr<FResourceRequest>("FResourceRequest", [](const NodeAttrs& n) {
diff --git a/tests/python/unittest/test_operator.py
b/tests/python/unittest/test_operator.py
index a0ae4807e38..4451aa25ba0 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -5444,6 +5444,25 @@ def get_output_names_callback(name, arr):
lrn_sym = mx.sym.LRN(data, nsize=1, name='lrn')
check_name(lrn_sym, ['lrn_output', 'lrn_tmp_norm'])
+ act_sym = mx.sym.Activation(data, act_type='relu', name='act')
+ check_name(act_sym, ['act_output'])
+
+ cc_sym = mx.sym.concat(data, data, dim=0, name='concat')
+ check_name(cc_sym, ['concat_output'])
+
+ sm_sym = mx.sym.softmax(data, name='softmax')
+ check_name(sm_sym, ['softmax_output'])
+
+ sa_sym = mx.sym.SoftmaxActivation(data, name='softmax')
+ check_name(sa_sym, ['softmax_output'])
+
+ us_sym = mx.sym.UpSampling(data, scale=2, sample_type='nearest',
+ name='upsampling')
+ check_name(us_sym, ['upsampling_output'])
+
+ us_sym = mx.sym.Pooling(data, kernel=(2, 2), pool_type='avg',
+ name='pooling')
+ check_name(us_sym, ['pooling_output'])
if __name__ == '__main__':
import nose
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
