Browse Source

MatMul->MatMulV2

tags/v0.6.0-beta
liuxiao93 5 years ago
parent
commit
e691c11f30
3 changed files with 8 additions and 8 deletions
  1. +1
    -1
      mindspore/ccsrc/transform/convert.cc
  2. +5
    -5
      mindspore/ccsrc/transform/op_declare.cc
  3. +2
    -2
      mindspore/ccsrc/transform/op_declare.h

+ 1
- 1
mindspore/ccsrc/transform/convert.cc View File

@@ -378,7 +378,7 @@ std::unordered_map<std::string, OpAdapterDescPtr> &DfGraphConvertor::get_adpt_ma
{string(kNameBiasAdd), ADPT_DESC(BiasAdd)},
{prim::kPrimRelu->name(), ADPT_DESC(Relu)},

{prim::kPrimMatMul->name(), ADPT_DESC(MatMul)},
{prim::kPrimMatMul->name(), ADPT_DESC(MatMulV2)},

{string(kNameConst), ADPT_DESC(Constant, Const)},
{string(kNameSoftmax), ADPT_DESC(SoftmaxV2)},


+ 5
- 5
mindspore/ccsrc/transform/op_declare.cc View File

@@ -808,11 +808,11 @@ ATTR_MAP(DepthwiseConv2DBackpropFilterD) = {
};
OUTPUT_MAP(DepthwiseConv2DBackpropFilterD) = {{0, OUTPUT_DESC(filter_grad)}};

// MatMul
INPUT_MAP(MatMul) = {{1, INPUT_DESC(x1)}, {2, INPUT_DESC(x2)}};
ATTR_MAP(MatMul) = {{"transpose_a", ATTR_DESC(transpose_x1, AnyTraits<bool>())},
{"transpose_b", ATTR_DESC(transpose_x2, AnyTraits<bool>())}};
OUTPUT_MAP(MatMul) = {{0, OUTPUT_DESC(y)}};
// MatMulV2
INPUT_MAP(MatMulV2) = {{1, INPUT_DESC(x1)}, {2, INPUT_DESC(x2)}};
ATTR_MAP(MatMulV2) = {{"transpose_a", ATTR_DESC(transpose_x1, AnyTraits<bool>())},
{"transpose_b", ATTR_DESC(transpose_x2, AnyTraits<bool>())}};
OUTPUT_MAP(MatMulV2) = {{0, OUTPUT_DESC(y)}};

// Merge
INPUT_MAP(Merge) = EMPTY_INPUT_MAP;


+ 2
- 2
mindspore/ccsrc/transform/op_declare.h View File

@@ -313,8 +313,8 @@ DECLARE_OP_ADAPTER(NPUAllocFloatStatus)
DECLARE_OP_USE_OUTPUT(NPUAllocFloatStatus)
DECLARE_OP_ADAPTER(NPUClearFloatStatus)
DECLARE_OP_USE_OUTPUT(NPUClearFloatStatus)
DECLARE_OP_ADAPTER(MatMul)
DECLARE_OP_USE_OUTPUT(MatMul)
DECLARE_OP_ADAPTER(MatMulV2)
DECLARE_OP_USE_OUTPUT(MatMulV2)

DECLARE_OP_ADAPTER(SoftmaxCrossEntropyWithLogits)
DECLARE_OP_USE_OUTPUT(SoftmaxCrossEntropyWithLogits)


Loading…
Cancel
Save