Browse Source

!667 minor fixes for latest ascend package

From: @nicholas_yhr
Reviewed-by: @liujunzhu,@youui
Signed-off-by: @youui
tags/v1.1.0
mindspore-ci-bot Gitee 4 years ago
parent
commit
e4da33cca6
2 changed files with 8 additions and 2 deletions
  1. +1
    -0
      inc/framework/common/ge_types.h
  2. +7
    -2
      metadef/graph/utils/type_utils.cc

+ 1
- 0
inc/framework/common/ge_types.h View File

@@ -37,6 +37,7 @@ enum FrameworkType {
MINDSPORE = 1, MINDSPORE = 1,
TENSORFLOW = 3, TENSORFLOW = 3,
ANDROID_NN, ANDROID_NN,
ONNX,
FRAMEWORK_RESERVED, FRAMEWORK_RESERVED,
}; };




+ 7
- 2
metadef/graph/utils/type_utils.cc View File

@@ -118,7 +118,8 @@ const std::map<std::string, Format> kDataFormatMap = {
{"NCDHW", FORMAT_NCDHW}, {"NCDHW", FORMAT_NCDHW},
{"ND", FORMAT_ND}}; {"ND", FORMAT_ND}};


const std::map<std::string, Format> kStringToFormatMap = {
const std::map<std::string, Format> kStringToFormatMap =
{
{"NCHW", FORMAT_NCHW}, {"NCHW", FORMAT_NCHW},
{"NHWC", FORMAT_NHWC}, {"NHWC", FORMAT_NHWC},
{"ND", FORMAT_ND}, {"ND", FORMAT_ND},
@@ -160,7 +161,11 @@ const std::map<std::string, Format> kStringToFormatMap = {
{"FRACTAL_Z_G", FORMAT_FRACTAL_Z_G}, {"FRACTAL_Z_G", FORMAT_FRACTAL_Z_G},
{"FORMAT_RESERVED", FORMAT_RESERVED}, {"FORMAT_RESERVED", FORMAT_RESERVED},
{"ALL", FORMAT_ALL}, {"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 = { const std::map<DataType, std::string> kDataTypeToStringMap = {
{DT_UNDEFINED, "DT_UNDEFINED"}, // Used to indicate a DataType field has not been set. {DT_UNDEFINED, "DT_UNDEFINED"}, // Used to indicate a DataType field has not been set.


Loading…
Cancel
Save