From 9f427befd16eb56471758966161fe40d6a38a399 Mon Sep 17 00:00:00 2001 From: chang zherui <760161589@qq.com> Date: Tue, 7 Apr 2020 22:59:52 +0800 Subject: [PATCH] utf --- graphengine | 2 +- mindspore/ccsrc/transform/convert.cc | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/graphengine b/graphengine index 78a40081fc1..32f06965993 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit 78a40081fc1462ab9e2083d37e5fbe608a57dd06 +Subproject commit 32f06965993ca25ea936239d284e992c5512d2ff diff --git a/mindspore/ccsrc/transform/convert.cc b/mindspore/ccsrc/transform/convert.cc index f6697dbbd28..b194a0b3ca7 100755 --- a/mindspore/ccsrc/transform/convert.cc +++ b/mindspore/ccsrc/transform/convert.cc @@ -171,9 +171,9 @@ const char kNameAbsGrad[] = "AbsGrad"; const char kNameBinaryCrossEntropy[] = "BinaryCrossEntropy"; const char kNameBinaryCrossEntropyGrad[] = "BinaryCrossEntropyGrad"; const char kNameSparseApplyAdagrad[] = "SparseApplyAdagrad"; -const char kNameSparseApplyFtrlD[] = "SparseApplyFtrlD"; const char kNameAcosh[] = "Acosh"; const char kNameFloorMod[] = "FloorMod"; +const char kNameSparseApplyFtrlD[] = "SparseApplyFtrlD"; const char kNameSpaceToDepth[] = "SpaceToDepth"; const char kNameDepthToSpace[] = "DepthToSpace"; const char kNameSign[] = "Sign"; @@ -363,12 +363,9 @@ std::unordered_map &DfGraphConvertor::get_adpt_ma {string(kNameBinaryCrossEntropy), ADPT_DESC(BinaryCrossEntropy)}, {string(kNameBinaryCrossEntropyGrad), ADPT_DESC(BinaryCrossEntropyGrad)}, {string(kNameSparseApplyAdagrad), ADPT_DESC(SparseApplyAdagradD)}, -<<<<<<< HEAD {string(kNameSparseApplyFtrlD), ADPT_DESC(SparseApplyFtrlD)}, -======= {string(kNameAcosh), ADPT_DESC(Acosh)}, {string(kNameFloorMod), ADPT_DESC(FloorMod)}, ->>>>>>> Add FloorMod, Acosh in ME {string(kNameSpaceToDepth), ADPT_DESC(SpaceToDepth)}, {string(kNameDepthToSpace), ADPT_DESC(DepthToSpace)}, {string(kNameSign), ADPT_DESC(Sign)},