haojin2 commented on a change in pull request #11024: concat of CSR NDArrays on
first dimension
URL: https://github.com/apache/incubator-mxnet/pull/11024#discussion_r192551923
##########
File path: src/operator/nn/concat.cc
##########
@@ -105,27 +105,41 @@ static bool ConcatType(const nnvm::NodeAttrs& attrs,
return true;
}
+
inline static bool ConcatForwardInferStorageType(const nnvm::NodeAttrs& attrs,
const int dev_mask,
DispatchMode* dispatch_mode,
std::vector<int> *in_attrs,
std::vector<int> *out_attrs) {
CHECK(!in_attrs->empty());
CHECK_EQ(out_attrs->size(), 1U);
- DispatchMode wanted_mode;
-#if MXNET_USE_MKLDNN == 1
+ auto& out_stype = out_attrs->at(0);
+ bool dispatched = false;
const ConcatParam& param = nnvm::get<ConcatParam>(attrs.parsed);
- if (dev_mask == mshadow::cpu::kDevMask
+ if (!dispatched && common::ContainsOnlyStorage(*in_attrs, kCSRStorage)
+ && param.dim == 0) {
+ dispatched = storage_type_assign(&out_stype, kCSRStorage,
+ dispatch_mode, DispatchMode::kFComputeEx);
+ }
+#if MXNET_USE_MKLDNN == 1
+ if (!dispatched && dev_mask == mshadow::cpu::kDevMask
&& common::ContainsOnlyStorage(*in_attrs, kDefaultStorage)
- && param.dim > 0)
- wanted_mode = DispatchMode::kFComputeEx;
- else
+ && param.dim > 0) {
+ dispatched = storage_type_assign(&out_stype, kDefaultStorage,
+ dispatch_mode, DispatchMode::kFComputeEx);
+ }
#endif
- wanted_mode = DispatchMode::kFCompute;
- return storage_type_assign(out_attrs, mxnet::kDefaultStorage,
- dispatch_mode, wanted_mode);
+ if (!dispatched && common::ContainsOnlyStorage(*in_attrs, kDefaultStorage)) {
+ dispatched = storage_type_assign(&out_stype, kDefaultStorage,
+ dispatch_mode, DispatchMode::kFCompute);
+ }
+ if (!dispatched) {
+ dispatched = dispatch_fallback(out_attrs, dispatch_mode);
+ }
+ return dispatched;
}
+
Review comment:
nit: too many blank lines here
----------------------------------------------------------------
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
