From 4804f1111c3122edf33e83beae3f39a9e55c3fed Mon Sep 17 00:00:00 2001
From: yefeng <yefeng24@huawei.com>
Date: Thu, 11 Mar 2021 15:28:13 +0800
Subject: [PATCH] add_while_create_1

---
 mindspore/lite/nnacl/infer/random_standard_normal_infer.c    | 2 +-
 mindspore/lite/src/ops/ops_utils.cc                          | 5 +++++
 .../converter/legacy_optimizer/graph/format_trans_pass.cc    | 2 +-
 mindspore/lite/tools/converter/parser/tf/tf_model_parser.cc  | 2 +-
 mindspore/lite/tools/optimizer/graph/infershape_pass.cc      | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mindspore/lite/nnacl/infer/random_standard_normal_infer.c b/mindspore/lite/nnacl/infer/random_standard_normal_infer.c
index 22bd8a1856..7488b52bb3 100644
--- a/mindspore/lite/nnacl/infer/random_standard_normal_infer.c
+++ b/mindspore/lite/nnacl/infer/random_standard_normal_infer.c
@@ -41,6 +41,6 @@ int RandomStandardNormalInferShape(const TensorC *const *inputs, size_t inputs_s
   }
   SetShapeArray(outputs[0], output_shape, output_shape_size);
   outputs[0]->data_type_ = kNumberTypeFloat32;
-  outputs[0]->format_ = Format_NHWC;
+  outputs[0]->format_ = inputs[0]->format_;
   return NNACL_OK;
 }
diff --git a/mindspore/lite/src/ops/ops_utils.cc b/mindspore/lite/src/ops/ops_utils.cc
index 34c4a86aa7..7c772f26b1 100644
--- a/mindspore/lite/src/ops/ops_utils.cc
+++ b/mindspore/lite/src/ops/ops_utils.cc
@@ -712,6 +712,10 @@ schema::PrimitiveT *ZerosLikePrimitiveCreator(const AnfNodePtr &node) {
   auto ms_primc = GetValueNode<std::shared_ptr<mindspore::ops::ZerosLike>>(node);
   return ms_primc != nullptr ? ops::MSOp2SchemaOp(ms_primc.get()) : nullptr;
 }
+schema::PrimitiveT *WhilePrimitiveCreator(const AnfNodePtr &node) {
+  auto ms_primc = GetValueNode<std::shared_ptr<mindspore::ops::While>>(node);
+  return ms_primc != nullptr ? ops::MSOp2SchemaOp(ms_primc.get()) : nullptr;
+}
 
 RegistryMSOps g_absPrimitiveCreatorRegistry("Abs", AbsPrimitiveCreator);
 RegistryMSOps g_activationPrimitiveCreatorRegistry("Activation", ActivationPrimitiveCreator);
@@ -910,6 +914,7 @@ RegistryMSOps g_unsortedSegmentSumPrimitiveCreatorRegistry("UnsortedSegmentSum",
 RegistryMSOps g_unsqueezePrimitiveCreatorRegistry("Unsqueeze", UnsqueezePrimitiveCreator);
 RegistryMSOps g_wherePrimitiveCreatorRegistry("Where", WherePrimitiveCreator);
 RegistryMSOps g_zerosLikePrimitiveCreatorRegistry("ZerosLike", ZerosLikePrimitiveCreator);
+RegistryMSOps g_whilePrimitiveCreatorRegistry("While", WhilePrimitiveCreator);
 }  // namespace lite
 }  // namespace mindspore
 
diff --git a/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc
index 4f52a04fdc..f2cc67b1f3 100644
--- a/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc
+++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc
@@ -277,7 +277,7 @@ STATUS FormatTransPass::ChangeOpAxis(schema::MetaGraphT *graph, const std::uniqu
         return RET_NOT_SUPPORT;
       }
     } else {
-      MS_LOG(ERROR) << "change op axis only support 4 dims";
+      MS_LOG(DEBUG) << "change op axis only support 4 dims";
       return RET_NOT_SUPPORT;
     }
   }
diff --git a/mindspore/lite/tools/converter/parser/tf/tf_model_parser.cc b/mindspore/lite/tools/converter/parser/tf/tf_model_parser.cc
index 33f386775d..847e167153 100644
--- a/mindspore/lite/tools/converter/parser/tf/tf_model_parser.cc
+++ b/mindspore/lite/tools/converter/parser/tf/tf_model_parser.cc
@@ -184,7 +184,7 @@ STATUS TFModelParser::ConvertConstVariant(const tensorflow::TensorProto &tensor_
   }
   auto &variant = tensor_proto.variant_val(0);
   if (variant.type_name() != "tensorflow::TensorList" || variant.tensors_size() <= 0) {
-    MS_LOG(ERROR) << "Only nonempty TensorList type is supported now";
+    MS_LOG(DEBUG) << "Only nonempty TensorList type is supported now";
   }
   auto descriptor = variant.GetMetadata().descriptor;
   auto reflection = variant.GetMetadata().reflection;
diff --git a/mindspore/lite/tools/optimizer/graph/infershape_pass.cc b/mindspore/lite/tools/optimizer/graph/infershape_pass.cc
index 673dae5389..7aa8b95772 100644
--- a/mindspore/lite/tools/optimizer/graph/infershape_pass.cc
+++ b/mindspore/lite/tools/optimizer/graph/infershape_pass.cc
@@ -388,7 +388,7 @@ bool InferShapePass::Run(const FuncGraphPtr &func_graph) {
     }
     auto prim_t = lite::GetPrimitiveT(cnode->input(0));
     if (prim_t == nullptr) {
-      MS_LOG(ERROR) << "prim_t is nullptr";
+      MS_LOG(DEBUG) << "prim_t is nullptr";
       FreeTensors(&input_tensors);
       FreeTensors(&output_tensors);
       return false;