From 8dde5b9ad9f86600a7d0312f1a6354b1240fb20b Mon Sep 17 00:00:00 2001
From: yangjie159 <yangjie159@huawei.com>
Date: Thu, 18 Jun 2020 16:36:11 +0800
Subject: [PATCH] fix export lite model for gpu

---
 mindspore/ccsrc/predict/converter/kernel2ms.cc              | 3 +--
 .../ccsrc/predict/converter/lite_model/op_attr_packer.cc    | 4 ++--
 mindspore/ccsrc/predict/predict.cc                          | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mindspore/ccsrc/predict/converter/kernel2ms.cc b/mindspore/ccsrc/predict/converter/kernel2ms.cc
index a1537fa3f0..902efac720 100644
--- a/mindspore/ccsrc/predict/converter/kernel2ms.cc
+++ b/mindspore/ccsrc/predict/converter/kernel2ms.cc
@@ -402,8 +402,7 @@ bool Kernel2Ms::SetGraphOpTensors(const KernelGraphPtr &kernel_graph_ptr, const
     auto c_name = AnfAlgo::GetCNodeName(kernel);
     auto fun = predict::convert::OpAttrFactory::GetInstance()->GetPackFun(c_name);
     if (fun == nullptr) {
-      MS_LOG(ERROR) << "get node [" << kernel->fullname_with_scope() << "] attr failed.";
-      return false;
+      MS_LOG(WARNING) << "get node [" << kernel->fullname_with_scope() << "] attr failed.";
     } else if (!fun(kernel, ms_node.get())) {
       MS_LOG(ERROR) << "set node [" << kernel->fullname_with_scope() << "] attr failed.";
       return false;
diff --git a/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.cc b/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.cc
index 932b5928fa..52648812be 100644
--- a/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.cc
+++ b/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.cc
@@ -72,8 +72,8 @@ OpAttrFactory::OpAttrFactory() {
                 {"AddFold", AddFoldPacker},
                 {"ArgMax", ArgMaxPacker},
                 {"BatchNorm", BatchNormFoldPacker},
-                {"FakeQuantWithMinMax", FakeQuantWithMinMaxPacker},
-                {"FakeQuantWithMinMaxPerChannel", FakeQuantWithMinMaxPerChannelPacker},
+                {"FakeQuantPerLayer", FakeQuantWithMinMaxPacker},
+                {"FakeQuantPerChannel", FakeQuantWithMinMaxPerChannelPacker},
                 {"Mul", MulPacker},
                 {"MulFold", MulFoldPacker},
                 {"Squeeze", SqueezePacker}};
diff --git a/mindspore/ccsrc/predict/predict.cc b/mindspore/ccsrc/predict/predict.cc
index 8310fc4028..bbb12c3787 100644
--- a/mindspore/ccsrc/predict/predict.cc
+++ b/mindspore/ccsrc/predict/predict.cc
@@ -28,6 +28,9 @@ void StepConvertGraph(const KernelGraphPtr &kernel_graph_ptr) {
   MS_EXCEPTION_IF_NULL(kernel_graph_ptr);
   bool save_ms_model = MsContext::GetInstance()->save_ms_model_flag();
   if (save_ms_model) {
+    if (kernel_graph_ptr->inputs().empty()) {
+      return;
+    }
     // set convert_mode: convert cpu info or convert Davnici
     executor::Kernel2Ms::GetInstance().set_convert_mode(executor::kConvertCpuMode);
     // convert kernel_graph to sub_ms_graph
@@ -46,6 +49,9 @@ void StepConvertWeight(const std::vector<tensor::TensorPtr> &inputs) {
   bool save_ms_model = MsContext::GetInstance()->save_ms_model_flag();
   std::string save_path = MsContext::GetInstance()->save_ms_model_path();
   if (save_ms_model) {
+    if (inputs.empty()) {
+      return;
+    }
     MS_LOG(INFO) << "save ms model is true to path " << save_path;
     if (!executor::Kernel2Ms::GetInstance().KernelInput2MS(inputs)) {
       MS_LOG(WARNING) << "convert mindspore kernel input failed";