rongzha1 commented on a change in pull request #13699: add mkldnn softmax_output
URL: https://github.com/apache/incubator-mxnet/pull/13699#discussion_r247010864
##########
File path: src/operator/softmax_output.cc
##########
@@ -21,30 +21,141 @@
* Copyright (c) 2015 by Contributors
* \file softmax_output.cc
* \brief
- * \author Bing Xu
+ * \author Bing Xu, Zhang Rong A
*/
#include "./softmax_output-inl.h"
-
+#if MXNET_USE_MKLDNN == 1
+#include "./nn/mkldnn/mkldnn_ops-inl.h"
+#endif
namespace mxnet {
namespace op {
-template<>
-Operator *CreateOp<cpu>(SoftmaxOutputParam param, int dtype) {
- Operator *op = nullptr;
- MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
- op = new SoftmaxOutputOp<cpu, DType>(param);
- })
- return op;
+
+DMLC_REGISTER_PARAMETER(SoftmaxOutputParam);
+struct SoftmaxOutputGrad {
+ const char *op_name;
+ std::vector<nnvm::NodeEntry> operator()(const nnvm::NodePtr& n,
+ const std::vector<nnvm::NodeEntry>&
ograds) const {
+ std::vector<nnvm::NodeEntry> out_data(n->num_outputs());
+ for (uint32_t i = 0; i < out_data.size(); ++i) {
+ out_data[i] = nnvm::NodeEntry{n, i, 0};
+ }
+ std::vector<nnvm::NodeEntry> heads;
+ heads.push_back(out_data[softmaxout_enum::kOut]);
+ heads.push_back(n->inputs[softmaxout_enum::kLabel]);
+
+ nnvm::NodePtr gnode = nnvm::Node::Create();
+ gnode->inputs = std::move(heads);
+ gnode->control_deps.emplace_back(n);
+ gnode->attrs = n->attrs;
+ gnode->attrs.op = nnvm::Op::Get("_backward_SoftmaxOutput");
+ gnode->attrs.name = n->attrs.name + "_backward";
+ std::vector<nnvm::NodeEntry> in_grad(2);
+ for (uint32_t i = 0; i < 2; ++i) {
+ in_grad[i] = nnvm::NodeEntry{gnode, i, 0};
+ }
+ return in_grad;
+ }
+};
+
+static inline std::vector<std::string> ListArguments() {
+ return {"data", "label"};
+}
+
+
+static bool SoftmaxOutputType(const nnvm::NodeAttrs& attrs,
+ std::vector<int> *in_type,
+ std::vector<int> *out_type) {
+ CHECK_GE(in_type->size(), 2U);
+ int dtype = (*in_type)[0];
+ CHECK_NE(dtype, -1) << "First input must have specified type";
+ for (size_t i = 0; i < in_type->size(); ++i) {
+ if ((*in_type)[i] == -1) {
+ (*in_type)[i] = dtype;
+ } else {
+ UNIFORM_TYPE_CHECK((*in_type)[i], dtype, ListArguments()[i]);
Review comment:
use CHECK_EQ at line 68
----------------------------------------------------------------
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
