From cfb816329e8d7cd03249a02d58710bdb9f3b1280 Mon Sep 17 00:00:00 2001
From: yanghaoran <yanghaoran2@huawei.com>
Date: Sat, 19 Dec 2020 14:21:31 +0800
Subject: [PATCH] minor fixes

---
 inc/framework/common/ge_types.h   | 1 +
 metadef/graph/utils/type_utils.cc | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/framework/common/ge_types.h b/inc/framework/common/ge_types.h
index fb1f0be1..254dbada 100644
--- a/inc/framework/common/ge_types.h
+++ b/inc/framework/common/ge_types.h
@@ -37,6 +37,7 @@ enum FrameworkType {
   MINDSPORE = 1,
   TENSORFLOW = 3,
   ANDROID_NN,
+  ONNX,
   FRAMEWORK_RESERVED,
 };
 
diff --git a/metadef/graph/utils/type_utils.cc b/metadef/graph/utils/type_utils.cc
index cd2f8545..e724b606 100644
--- a/metadef/graph/utils/type_utils.cc
+++ b/metadef/graph/utils/type_utils.cc
@@ -118,7 +118,8 @@ const std::map<std::string, Format> kDataFormatMap = {
   {"NCDHW", FORMAT_NCDHW},
   {"ND",   FORMAT_ND}};
 
-const std::map<std::string, Format> kStringToFormatMap = {
+const std::map<std::string, Format> kStringToFormatMap =
+  {
     {"NCHW", FORMAT_NCHW},
     {"NHWC", FORMAT_NHWC},
     {"ND", FORMAT_ND},
@@ -160,7 +161,11 @@ const std::map<std::string, Format> kStringToFormatMap = {
     {"FRACTAL_Z_G", FORMAT_FRACTAL_Z_G},
     {"FORMAT_RESERVED", FORMAT_RESERVED},
     {"ALL", FORMAT_ALL},
-    {"NULL", FORMAT_NULL}};
+    {"NULL", FORMAT_NULL},
+    // add for json input
+    {"RESERVED", FORMAT_RESERVED},
+    {"UNDEFINED", FORMAT_RESERVED},
+  };
 
 const std::map<DataType, std::string> kDataTypeToStringMap = {
     {DT_UNDEFINED, "DT_UNDEFINED"},            // Used to indicate a DataType field has not been set.