Pre Merge pull request !392 from 梁昊/c79

metadef

@@ -1 +1 @@
-Subproject commit 60df4b39a6f639c21dd7deb220b93345451938f5
+Subproject commit f011a4c7ad36e1ec80990e659abefc78b0aa7543

parser/common/types_map.h

@@ -45,6 +45,7 @@ static map<int32_t, int32_t> GE_TENSORFLOW_DATA_TYPE_MAP = {
     {ge::DataType::DT_QINT32, domi::tensorflow::DT_QINT32},
     {ge::DataType::DT_QUINT8, domi::tensorflow::DT_QUINT8},
     {ge::DataType::DT_QUINT16, domi::tensorflow::DT_QUINT16},
+    {ge::DataType::DT_VARIANT, domi::tensorflow::DT_VARIANT},
     {ge::DataType::DT_DUAL, domi::tensorflow::DT_INVALID},
     {ge::DataType::DT_DUAL_SUB_INT8, domi::tensorflow::DT_INVALID},
     {ge::DataType::DT_DUAL_SUB_UINT8, domi::tensorflow::DT_INVALID},

tests/st/CMakeLists.txt

@@ -165,8 +165,8 @@ set(REGISTER_SRC_FILES
     "${PARSER_DIR}/metadef/register/infer_data_slice_registry.cc"
     "${PARSER_DIR}/metadef/register/ops_kernel_builder_registry.cc"
     "${PARSER_DIR}/metadef/register/op_kernel_registry.cpp"
-    "${PARSER_DIR}/metadef/register/op_tiling.cpp"
-    "${PARSER_DIR}/metadef/register/op_tiling_registry.cpp"
+    "${PARSER_DIR}/metadef/register/op_tiling/op_tiling.cc"
+    "${PARSER_DIR}/metadef/register/op_tiling/op_tiling_registry.cc"
     "${PARSER_DIR}/metadef/register/register.cpp"
     "${PARSER_DIR}/metadef/register/register_format_transfer.cc"
     "${PARSER_DIR}/metadef/register/register_pass.cpp"
@@ -185,8 +185,10 @@ include_directories(${CMAKE_BINARY_DIR}/proto/ge)
 include_directories(${PARSER_DIR}/metadef)
 include_directories(${PARSER_DIR}/metadef/graph)
 include_directories(${PARSER_DIR}/metadef/inc)
+include_directories(${PARSER_DIR}/metadef/inc/graph)
 include_directories(${PARSER_DIR}/metadef/inc/external)
 include_directories(${PARSER_DIR}/metadef/inc/register)
+include_directories(${PARSER_DIR}/metadef/register/op_tiling)
 include_directories(${PARSER_DIR}/metadef/third_party/fwkacllib/inc)
 include_directories(${PARSER_DIR}/metadef/third_party/graphengine/inc)
 include_directories(${PARSER_DIR}/metadef/third_party/graphengine/inc/external)

tests/ut/parser/CMakeLists.txt

@@ -167,8 +167,8 @@ set(REGISTER_SRC_FILES
     "${PARSER_DIR}/metadef/register/infer_data_slice_registry.cc"
     "${PARSER_DIR}/metadef/register/ops_kernel_builder_registry.cc"
     "${PARSER_DIR}/metadef/register/op_kernel_registry.cpp"
-    "${PARSER_DIR}/metadef/register/op_tiling.cpp"
-    "${PARSER_DIR}/metadef/register/op_tiling_registry.cpp"
+    "${PARSER_DIR}/metadef/register/op_tiling/op_tiling.cc"
+    "${PARSER_DIR}/metadef/register/op_tiling/op_tiling_registry.cc"
     "${PARSER_DIR}/metadef/register/register.cpp"
     "${PARSER_DIR}/metadef/register/register_format_transfer.cc"
     "${PARSER_DIR}/metadef/register/register_pass.cpp"
@@ -187,8 +187,10 @@ include_directories(${CMAKE_BINARY_DIR}/proto/ge)
 include_directories(${PARSER_DIR}/metadef)
 include_directories(${PARSER_DIR}/metadef/graph)
 include_directories(${PARSER_DIR}/metadef/inc)
+include_directories(${PARSER_DIR}/metadef/inc/graph)
 include_directories(${PARSER_DIR}/metadef/inc/external)
 include_directories(${PARSER_DIR}/metadef/inc/register)
+include_directories(${PARSER_DIR}/metadef/register/op_tiling)
 include_directories(${PARSER_DIR}/metadef/third_party/fwkacllib/inc)
 include_directories(${PARSER_DIR}/metadef/third_party/graphengine/inc)
 include_directories(${PARSER_DIR}/metadef/third_party/graphengine/inc/external)