!108 sync yellow zone src code from 20201020

Merge pull request !108 from taoxiangdong/master

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 project (GraphEngine[CXX])
 
 set(GE_CODE_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
 
 if (NOT BUILD_PATH)
     set(BUILD_PATH "${CMAKE_SOURCE_DIR}/build")
@@ -64,19 +65,38 @@ if (ENABLE_OPEN_SRC)
         set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
         set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
         set(ASCEND_ACL_DIR ${ASCEND_DIR}/acllib/lib64)
-        find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
-        find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
-        find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR})
-        find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR})
-        find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
-        find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
-        find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
-        find_module(resource libresource.so ${ASCEND_RUNTIME_DIR})
-        find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
-        find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
-        find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR})
-        find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR})
-        find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR})
+        if(PLATFORM STREQUAL "train")
+            find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
+            find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
+            find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR})
+            find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR})
+            find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
+            find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
+            find_module(resource libresource.so ${ASCEND_RUNTIME_DIR})
+            find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
+            find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR})
+            find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
+            if(PRODUCT STREQUAL "flr3")
+                message(FATAL_ERROR "This platform is not supported in train mode, build terminated")
+            endif()
+        elseif(PLATFORM STREQUAL "inference")
+            find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
+            find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
+            find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR})
+            find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR})
+            find_module(runtime libruntime.so ${ASCEND_ACL_DIR})
+            find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
+            find_module(resource libresource.so ${ASCEND_ACL_DIR})
+            find_module(error_manager liberror_manager.so ${ASCEND_ACL_DIR})
+            find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR})
+            find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR})
+            find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR})
+            if(NOT PRODUCT STREQUAL "flr3")
+                find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
+            endif()
+        else()
+             message(FATAL_ERROR "Mode param is invalid, should be train or inference, build terminated")
+        endif()
     endif()
 
     set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef)

build.sh

@@ -23,7 +23,7 @@ export BUILD_PATH="${BASEPATH}/build/"
 usage()
 {
   echo "Usage:"
-  echo "sh build.sh [-j[n]] [-h] [-v] [-s] [-t] [-u] [-c]"
+  echo "sh build.sh [-j[n]] [-h] [-v] [-s] [-t] [-u] [-c] [-p]"
   echo ""
   echo "Options:"
   echo "    -h Print usage"
@@ -32,6 +32,7 @@ usage()
   echo "    -j[n] Set the number of threads used for building GraphEngine, default is 8"
   echo "    -t Build and execute ut"
   echo "    -c Build ut with coverage tag"
+  echo "    -p Build inference or train"
   echo "    -v Display build command"
   echo "to be continued ..."
 }
@@ -46,8 +47,10 @@ checkopts()
   ENABLE_GE_ST="off"
   ENABLE_GE_COV="off"
   GE_ONLY="on"
+  PLATFORM="inference"
+  PRODUCT="normal"
   # Process the options
-  while getopts 'ustchj:v' opt
+  while getopts 'ustchj:p:g:v' opt
   do
     OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]')
     case "${opt}" in
@@ -77,6 +80,12 @@ checkopts()
       v)
         VERBOSE="VERBOSE=1"
         ;;
+      p)
+        PLATFORM=$OPTARG
+        ;;
+      g)
+        PRODUCT=$OPTARG
+        ;;
       *)
         echo "Undefined option: ${opt}"
         usage
@@ -117,15 +126,35 @@ build_graphengine()
     CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GE_ST=ON"
   fi
 
-  CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True -DCMAKE_INSTALL_PREFIX=${OUTPUT_PATH}"
+  CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True -DCMAKE_INSTALL_PREFIX=${OUTPUT_PATH} -DPLATFORM=${PLATFORM} -DPRODUCT=${PRODUCT}"
   echo "${CMAKE_ARGS}"
   cmake ${CMAKE_ARGS} ..
-  make ${VERBOSE} -j${THREAD_NUM} && make install
+  if [ $? -ne 0 ]
+  then
+    echo "execute command: cmake ${CMAKE_ARGS} .. failed."
+    return 1
+  fi
+  COMMON_TARGET="ge_common engine fmk_parser parser_common _caffe_parser fmk_onnx_parser graph register "
+  TARGET=${COMMON_TARGET}
+  if [ "x${PLATFORM}" = "xtrain" ]
+  then
+    TARGET="ge_runner ge_local_engine ge_local_opskernel_builder host_cpu_engine host_cpu_opskernel_builder ${TARGET}"
+  elif [ "x${PLATFORM}" = "xinference" ]
+  then
+    TARGET="ge_compiler atc_ge_local_engine atc_ge_local_opskernel_builder atc_host_cpu_engine atc_host_cpu_opskernel_builder atc opensrc_ascendcl ${TARGET}"
+  fi
+  
+  make ${VERBOSE} ${TARGET} -j${THREAD_NUM} && make install
+  if [ $? -ne 0 ]
+  then
+    echo "execute command: make ${VERBOSE} -j${THREAD_NUM} && make install failed."
+    return 1
+  fi
   echo "GraphEngine build success!"
 }
 g++ -v
 mk_dir ${OUTPUT_PATH}
-build_graphengine
+build_graphengine || { echo "GraphEngine build failed."; return; }
 echo "---------------- GraphEngine build finished ----------------"
 #cp -rf "${BUILD_PATH}/graphengine/"*.so "${OUTPUT_PATH}"
 #rm -rf "${OUTPUT_PATH}/"libproto*

ge/CMakeLists.txt

@@ -138,6 +138,7 @@ set(TRAIN_SRC_LIST
     "graph/passes/mark_same_addr_pass.cc"
     "graph/passes/mark_graph_unknown_status_pass.cc"
     "graph/partition/dynamic_shape_partition.cc"
+    "graph/partition/stage_partition.cc"
     "graph/passes/base_pass.cc"
     "graph/passes/bitcast_pass.cc"
     "graph/passes/cast_remove_pass.cc"
@@ -270,6 +271,7 @@ set(TRAIN_SRC_LIST
     "model/ge_root_model.cc"
     "omm/csa_interact.cc"
     "opskernel_manager/ops_kernel_manager.cc"
+    "opskernel_manager/ops_kernel_builder_manager.cc"
     "session/inner_session.cc"
     "session/session_manager.cc"
     "single_op/single_op.cc"
@@ -356,6 +358,7 @@ target_include_directories(ge_runner PRIVATE
     ${CMAKE_BINARY_DIR}/proto/ge
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
+    ${GE_CODE_DIR}/../inc/external
     ${GE_CODE_DIR}/../inc/cce
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     #### blue zone
@@ -369,6 +372,7 @@ target_link_libraries(ge_runner
     $<BUILD_INTERFACE:intf_pub>
     ge_memory
     adump_server
+    msprofiler
     -Wl,--no-as-needed
     graph
     ge_common
@@ -426,6 +430,7 @@ set(INFER_SRC_LIST
     "session/session_manager.cc"
     "engine_manager/dnnengine_manager.cc"
     "opskernel_manager/ops_kernel_manager.cc"
+    "opskernel_manager/ops_kernel_builder_manager.cc"
     "graph/manager/graph_manager.cc"
     "graph/manager/graph_manager_utils.cc"
     "graph/manager/graph_context.cc"
@@ -678,6 +683,7 @@ target_include_directories(ge_compiler PRIVATE
     ${CMAKE_BINARY_DIR}/proto/ge
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
+    ${GE_CODE_DIR}/../inc/external
     ${GE_CODE_DIR}/../inc/cce
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     #### blue zone

ge/analyzer/analyzer.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/analyzer/analyzer.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/client/ge_prof.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/client/proto/ge_api.proto

@@ -1 +0,0 @@
-../../proto/ge_api.proto

ge/client/proto/ge_api.proto

@@ -0,0 +1 @@
+../../proto/ge_api.proto

ge/client/proto/ge_ir.proto

@@ -1 +0,0 @@
-../../proto/ge_ir.proto

ge/client/proto/ge_ir.proto

@@ -0,0 +1,190 @@
+syntax = "proto3";
+
+package ge.proto;
+
+enum DataType
+{
+    DT_UNDEFINED = 0;  // Used to indicate a DataType field has not been set.
+    DT_FLOAT     = 1;  // float type
+    DT_FLOAT16   = 2;  // fp16 type
+    DT_INT8      = 3;  // int8 type
+    DT_UINT8     = 4;  // uint8 type
+    DT_INT16     = 5;  // int16 type
+    DT_UINT16    = 6;  // uint16 type
+    DT_INT32     = 7;  //
+    DT_INT64     = 8;  // int64 type
+    DT_UINT32    = 9;  // unsigned int32
+    DT_UINT64    = 10;  // unsigned int64
+    DT_BOOL      = 11;  // bool type
+    DT_DOUBLE    = 12; // double type
+    DT_STRING = 13;            // string type
+    DT_DUAL_SUB_INT8 = 14;    /**< dual output int8 type */
+    DT_DUAL_SUB_UINT8 = 15;    /**< dual output uint8 type */
+    DT_COMPLEX64 = 16;         // complex64 type
+    DT_COMPLEX128 = 17;        // complex128 type
+    DT_QINT8 = 18;             // qint8 type
+    DT_QINT16 = 19;            // qint16 type
+    DT_QINT32 = 20;            // qint32 type
+    DT_QUINT8 = 21;            // quint8 type
+    DT_QUINT16 = 22;           // quint16 type
+    DT_RESOURCE  = 23;         // resource type
+    DT_STRING_REF = 24;        // string_ref type
+    DT_DUAL      = 25;              /**< dual output type */
+}
+
+message AttrDef
+{
+    message ListValue
+    {
+        enum ListValueType{
+          VT_LIST_NONE = 0;
+          VT_LIST_STRING = 1;
+          VT_LIST_INT = 2;
+          VT_LIST_FLOAT = 3;
+          VT_LIST_BOOL = 4;
+          VT_LIST_BYTES = 5;
+          VT_LIST_TENSOR_DESC = 6;
+          VT_LIST_TENSOR = 7;
+          VT_LIST_GRAPH = 8;
+          VT_LIST_NAMED_ATTRS = 9;
+          VT_LIST_DATA_TYPE = 10;
+        }
+        repeated bytes s             = 2;                    // "list(string)"
+        repeated int64 i             = 3;  // "list(int)"
+        repeated float f             = 4;   // "list(float)"
+        repeated bool  b             = 5;  // "list(bool)"
+        repeated bytes bt            = 7;
+        repeated TensorDescriptor td = 8;
+        repeated TensorDef t         = 9;
+        repeated GraphDef g          = 10;
+	    repeated NamedAttrs na       = 11;
+	    repeated int64 dt            = 12; // list ge::DataType
+
+	    ListValueType val_type       = 20;
+    }
+
+    message ListListInt{
+        message ListInt{
+            repeated int64 list_i             = 1; // list int
+        }
+        repeated ListInt list_list_i             = 1; // list list int
+    }
+
+    oneof value
+    {
+        bytes            s    = 2;  // "string"
+        int64            i    = 3;  // "int"
+        float            f    = 4;  // "float"
+        bool             b    = 5;  // "bool"
+        bytes            bt   = 7;
+        ListValue        list = 1;   // any "list(...)"
+        NamedAttrs       func = 10;  // Used to support attr nesting
+        TensorDescriptor td   = 11;  // GeTensorDesc type
+        TensorDef        t    = 12;  // GeTensor type
+        GraphDef         g    = 13;  // Graph type
+        ListListInt      list_list_int  = 14;  // List List Int type
+        int64            dt   = 15; // ge::DataType
+    }
+}
+
+// A list of attr names and their values. The whole list is attached
+// with a string name.  E.g., MatMul[T=float].
+message NamedAttrs
+{
+    string               name = 1;
+    map<string, AttrDef> attr = 2;
+}
+
+// Shape / dimension description, using row-major order
+message ShapeDef
+{
+    repeated int64 dim = 1;  // Size of each dimension
+}
+
+// Multidimensional data description
+message TensorDescriptor
+{
+    string   name   = 1;  // Optional parameter, tensor name
+
+    DataType dtype  = 2;  // tensor datatype
+    ShapeDef shape  = 3;  // Shape / dimension
+    string   layout = 4;  // Tensor format, eg: "NCHW", "NHWC", "CHW", "ND"
+
+    bool has_out_attr = 9;
+    int64 size = 10;
+    int64 weight_size = 11;
+    bool reuse_input = 12;
+    bool output_tensor = 13;
+    string device_type = 14;
+    bool input_tensor =15;
+    int64 real_dim_cnt = 16;
+    int64 reuse_input_index = 17;
+    int64 data_offset = 18;
+    int64 cmps_size = 19;
+    string cmps_tab = 20;
+    int64 cmps_tab_offset = 21;
+
+	map<string, AttrDef> attr = 5;  // Set of extra parameter fields
+}
+
+// GeTensor definition
+message TensorDef
+{
+    TensorDescriptor desc = 1;  // Tensor description
+    bytes            data = 2;  // Tensor data
+}
+
+
+// Operator description
+message OpDef
+{
+    string name = 1;  // name
+    string type = 2;  // type
+
+    repeated string input = 5;  // input original op name + outgoing index. op_name：index
+
+    map<string, AttrDef> attr = 10;  // Set of operator parameter fields
+
+    bool has_out_attr = 20;
+    int64 id = 21;
+    int64 stream_id =22;
+    repeated string input_name = 23;
+    repeated string src_name = 24;
+    repeated int64 src_index = 25;
+    repeated string dst_name = 26;
+    repeated int64 dst_index = 27;
+    repeated int64 input_i = 28;
+    repeated int64 output_i = 29;
+    repeated int64 workspace = 30;
+    repeated int64 workspace_bytes = 31;
+    repeated bool is_input_const = 32;
+    repeated TensorDescriptor input_desc = 33;
+    repeated TensorDescriptor output_desc = 34;
+    repeated string subgraph_name = 35;
+}
+
+// Graph definition
+message GraphDef
+{
+    string name   = 1;   //  name
+
+    repeated string input  = 4;  // Graph input
+    repeated string output = 5;  // Graph output
+
+    repeated OpDef op      = 6;  // List of operators
+
+	map<string, AttrDef> attr = 11;  // Extended field
+}
+
+// model definition
+message ModelDef
+{
+	string name         = 1;  // name
+	uint32 version      = 2;  // IR Proto verion
+	string custom_version = 3;  // User model version number, passed in by user
+
+    repeated GraphDef graph = 7;  // Graph definition，graph[0] represents the main diagram in modeldef
+
+    map<string, AttrDef> attr = 11;  // Extended field
+}
+

ge/client/proto/insert_op.proto

@@ -1 +0,0 @@
-../../proto/insert_op.proto

ge/client/proto/insert_op.proto

@@ -0,0 +1,136 @@
+syntax = "proto3";
+
+package domi;
+
+message InsertNewOps {
+	repeated AippOpParams aipp_op = 1;
+	repeated MultiShapeOpParams multi_shape_op = 2;
+}
+
+message AippOpParams {
+	enum InputFormat {
+		UNDEFINED = 0;
+		YUV420SP_U8 = 1;
+		XRGB8888_U8 = 2;
+		RGB888_U8   = 3;
+		YUV400_U8   = 4;
+		NC1HWC0DI_FP16 = 5;
+		NC1HWC0DI_S8 = 6;
+		ARGB8888_U8 = 7;
+		YUYV_U8 = 8;
+		YUV422SP_U8 = 9;
+		AYUV444_U8 = 10;
+		RAW10 = 11;
+		RAW12 = 12;
+		RAW16 = 13;
+		RAW24 = 14;
+		RGB16 = 15;
+		RGB20 = 16;
+		RGB24 = 17;
+		RGB8_IR = 18;
+		RGB16_IR = 19;
+		RGB24_IR = 20;
+	}
+
+	enum AippMode {
+		undefined = 0;
+		static = 1;
+		dynamic = 2;
+	}
+
+	// AIPP模式，区分静态AIPP和动态AIPP
+	AippMode aipp_mode = 1;
+
+	// related_input_rank参数为必填，类型为整型，配置范围>=0, <=输入Data算子的个数，默认值为0。
+	// 标识对模型的第几个输入做AIPP处理，例如模型有两个输入，需要对第2个输入做AIPP，则配置related_input_rank为1。
+	uint32 related_input_rank = 2;
+
+	// input_edge_idx参数为可选，类型为整型，配置范围为>=0。
+	// 配置该参数的作用，在于对Data算子不同的输出做不同的AIPP处理，如果该参数没有配置，默认对related_input_rank指定的模型输入的所有输出边做AIPP。
+	// 配置值 <= Data算子输出边的个数。
+	repeated uint32 input_edge_idx = 3;
+
+	// [Begin] 动态AIPP参数，配置静态AIPP时无效
+	uint32 max_src_image_size = 4;
+
+	// 是否支持旋转。默认不支持，开启支持旋转时，会有额外的空间和性能损失
+	bool support_rotation = 5;
+
+	// [End] 动态AIPP参数
+
+
+	// [Begin] 静态AIPP参数，配置动态AIPP时无效
+	InputFormat input_format = 51;
+	bool csc_switch = 52;
+	float cpadding_value = 53;
+	bool rbuv_swap_switch = 54;
+	bool ax_swap_switch = 55;
+	bool single_line_mode = 56;
+
+	int32 src_image_size_w = 57;
+	int32 src_image_size_h = 58;
+
+	bool crop = 59;
+	int32 load_start_pos_w = 60;
+	int32 load_start_pos_h = 61;
+	int32 crop_size_w = 62;
+	int32 crop_size_h = 63;
+
+	bool resize = 64;
+	int32 resize_output_w = 65;
+	int32 resize_output_h = 66;
+
+	bool padding = 67;
+	int32 left_padding_size = 68;
+	int32 right_padding_size = 69;
+	int32 top_padding_size = 70;
+	int32 bottom_padding_size = 71;
+
+	int32 mean_chn_0 = 10;
+	int32 mean_chn_1 = 11;
+	int32 mean_chn_2 = 12;
+	int32 mean_chn_3 = 19;
+	float min_chn_0 = 13;
+	float min_chn_1 = 14;
+	float min_chn_2 = 15;
+	float min_chn_3 = 20;
+	repeated float var_reci_chn_0 = 16;
+	repeated float var_reci_chn_1 = 17;
+	repeated float var_reci_chn_2 = 18;
+	repeated float var_reci_chn_3 = 21;
+
+	repeated int32 matrix_r0c0 = 30;
+	repeated int32 matrix_r0c1 = 31;
+	repeated int32 matrix_r0c2 = 32;
+	repeated int32 matrix_r1c0 = 33;
+	repeated int32 matrix_r1c1 = 34;
+	repeated int32 matrix_r1c2 = 35;
+	repeated int32 matrix_r2c0 = 36;
+	repeated int32 matrix_r2c1 = 37;
+	repeated int32 matrix_r2c2 = 38;
+	repeated int32 output_bias_0 = 39;
+	repeated int32 output_bias_1 = 40;
+	repeated int32 output_bias_2 = 41;
+	repeated int32 input_bias_0 = 42;
+	repeated int32 input_bias_1 = 43;
+	repeated int32 input_bias_2 = 44;
+
+	// [End] 静态AIPP参数
+
+       // The n number that is used for raw/rgbir data into f16 transformation.
+       // The transformation equation is x/(2^n). If set to 0, no transform is performed.
+       uint32 raw_rgbir_to_f16_n = 45;
+}
+
+message MultiShapeOpParams {
+	enum MultiShapeMode {
+		batch      = 0;             //动态batch
+		resolution = 1;             //动态分辨率，扩展用
+	}
+
+	MultiShapeMode    mode                      = 1;        //算子模式
+	uint32            related_input_rank        = 2;        //新增算子插入到哪个输入
+
+
+	repeated uint32 batch_list   = 11; //batch_list值，batch_list的个数是2到8之间
+}

ge/client/proto/task.proto

@@ -1 +0,0 @@
-../../proto/task.proto

ge/client/proto/task.proto

@@ -0,0 +1,165 @@
+/* Copyright (C) 2018. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the Apache License Version 2.0.You may not use this file except in compliance with the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Apache License for more details at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+syntax = "proto3";
+
+package domi;
+
+message ModelTaskDef {
+    string version = 1;
+
+    map<string, string> attr = 9; // Extended field
+    repeated TaskDef task = 10;
+
+    uint64 memory_size = 11;
+    uint32 stream_num = 12;
+    uint32 event_num = 13;
+    uint64 weight_size = 14;
+
+    repeated bytes op = 15; // input/output opdef in bytes
+
+    uint64 base_addr = 16;    // base addr
+    uint64 weight_addr = 17;  // weight addr
+    uint32 batch_num = 18;
+}
+
+
+message TaskDef {
+    uint32 id = 1;
+    uint32 type = 2;
+
+    uint32 stream_id = 10;
+    uint32 event_id = 11;
+
+    KernelDef kernel = 20;
+    KernelExDef kernel_ex = 21;
+    KernelHcclDef kernel_hccl = 25;
+    EventExDef event_ex = 26;
+    LogTimeStampDef log_timestamp = 28;
+
+    uint32 label_id = 30;
+
+    MemcpyAsyncDef memcpy_async = 31;
+    StreamSwitchDef stream_switch = 32;
+    StreamActiveDef stream_active = 33;
+    bytes private_def = 34;
+    uint64 ops_kernel_store_ptr = 35;      // adjustments to other fields in the future
+    StreamSwitchNDef stream_switch_n = 36;
+
+    LabelSetDef label_set = 37;
+    LabelGotoExDef label_goto_ex = 38;
+    LabelSwitchByIndexDef label_switch_by_index = 39;
+}
+
+message KernelDef {
+    KernelContext context = 1;
+
+    string stub_func = 10;
+    uint32 block_dim = 11;
+    uint32 args_size = 12;
+    bytes args = 13;
+    bytes sm_desc = 14;
+    bytes flowtable = 15;
+    string so_name = 16;
+    string kernel_name = 17;
+    bytes kernel_ext_info = 18;
+    uint32 kernel_ext_info_size = 19;
+}
+
+message KernelContext {
+    uint32 kernel_type = 1;
+    uint32 op_id = 2;                              // OP type in CCE
+    uint32 kernel_func_id = 3;
+    uint32 op_index = 4;                           // TE/Custom operator
+    bool is_flowtable = 5;                         // Identify whether args is a flowtable structure
+    bytes args_offset = 6;                         // args offset information
+    uint32 args_count = 7;                         // args count
+    repeated uint32 origin_op_index = 8;
+}
+
+
+message KernelExDef {
+    uint32 flags = 1;
+
+    uint32 op_index = 4;
+    uint32 args_size = 12;
+    bytes args = 13;
+    bytes task_info = 14;                 // serialized nodeDef, funcDef, inputoutput
+    uint32 task_info_size = 15;
+    bytes kernel_ext_info = 16;
+    uint32 kernel_ext_info_size = 17;
+}
+
+
+message KernelHcclDef {
+    uint32 op_index = 8;
+    string hccl_type = 9;
+}
+
+
+message EventExDef {
+    uint32 op_index = 1;
+    uint32 event_type = 2;
+}
+
+message LogTimeStampDef {
+    uint64 logid = 1;
+    bool notify = 2;
+    uint32 flat = 3;
+}
+
+message MemcpyAsyncDef {
+    uint64 dst = 1;
+    uint64 dst_max = 2;
+    uint64 src = 3;
+    uint64 count = 4;
+    uint32 kind = 5;
+    uint32 op_index = 6;
+}
+
+message StreamSwitchDef {
+    uint32 op_index = 1;
+    uint32 true_stream_id = 2;
+    int64 value = 3;
+    uint64 value_ptr = 4;
+    uint32 data_type = 5;
+}
+
+message StreamActiveDef {
+    uint32 op_index = 1;
+    uint32 active_stream_id = 2;
+}
+
+message StreamSwitchNDef {
+    uint32 op_index = 1;
+    uint32 size = 2;
+    repeated int64 target_value = 3;
+    repeated uint32 true_stream_id = 4;
+    uint32 element_size = 5;
+    uint32 data_type = 6;
+}
+
+message LabelSetDef {
+    uint32 op_index = 1;
+    uint32 label_id = 2;
+    uint32 model_id = 3;
+}
+
+message LabelGotoExDef {
+    uint32 op_index = 1;
+    uint32 label_id = 2;
+    uint32 model_id = 3;
+}
+
+message LabelSwitchByIndexDef {
+    uint32 op_index = 1;
+    uint32 label_max = 2;
+}

ge/common/auth/file_saver.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/auth/file_saver.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/base64.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/context/ctx.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/cust_aicpu_kernel_store.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/cust_aicpu_kernel_store.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/debug/memory_dumper.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/debug/memory_dumper.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_op.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_properties.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_properties.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/dump/dump_server.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/fmk_error_codes.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/datatype_transfer.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/datatype_transfer.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include "common/formats/format_transfers/format_transfer_dhwcn_fracz3D.h"
 
 #include <securec.h>

ge/common/formats/format_transfers/format_transfer_dhwcn_fracz3D.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef GE_COMMON_FORMATS_FORMAT_TRANSFERS_FORMAT_TRANSFER_DHWCN_FRACTAL_Z_3D_H_
 #define GE_COMMON_FORMATS_FORMAT_TRANSFERS_FORMAT_TRANSFER_DHWCN_FRACTAL_Z_3D_H_
 

ge/common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include "common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.h"
 
 #include <securec.h>

ge/common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef GE_COMMON_FORMATS_FORMAT_TRANSFERS_FORMAT_TRANSFER_DHWNC_FRACTAL_Z_3D_TRANSPOSE_H_
 #define GE_COMMON_FORMATS_FORMAT_TRANSFERS_FORMAT_TRANSFER_DHWNC_FRACTAL_Z_3D_TRANSPOSE_H_
 

ge/common/formats/format_transfers/format_transfer_fractal_nz.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fractal_nz.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fractal_z.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fractal_z.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fractal_zz.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2019 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fractal_zz.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2019 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_hwcn.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_hwcn.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_nchw.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_nchw.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_nhwc.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_fracz_nhwc.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nc1hwc0_nchw.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nchw_nc1hwc0.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_transpose.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/format_transfers/format_transfer_transpose.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/formats.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2019 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/formats.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/utils/formats_definitions.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2019 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/utils/formats_trans_utils.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/formats/utils/formats_trans_utils.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2019 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/fp16_t.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/fp16_t.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/datatype_util.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/datatype_util.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/ge_util.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/op_tiling_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/op_tiling_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/plugin_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/plugin_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/tbe_plugin_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge/tbe_plugin_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/ge_common.mk

@@ -71,7 +71,10 @@ GE_COMMON_LOCAL_C_INCLUDES := \
     $(TOPDIR)third_party/openssl/include/x86/include \
     $(TOPDIR)framework/domi \
     $(TOPDIR)framework/domi/common \
-    $(TOPDIR)framework/domi/common/op
+    $(TOPDIR)framework/domi/common/op \
+    $(TOPDIR)graphengine/ge   \
+    $(TOPDIR)graphengine/ge/common   \
+    $(TOPDIR)graphengine/ge/common/op   \
 
 #compile host libge_common
 include $(CLEAR_VARS)

ge/common/helper/model_helper.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/helper/om_file_helper.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/kernel_store.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/kernel_store.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/math/fp16_math.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/math/fp16_math.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/math/math_util.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/math_util.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/model_parser/base.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/model_parser/base.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/model_saver.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/model_saver.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/op/attr_value_util.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/op/ge_op_utils.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/profiling/profiling_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/profiling/profiling_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/properties_manager.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/properties_manager.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Huawei Technologies Co., Ltd
+ * Copyright 2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ge/common/proto/ge_ir.proto

@@ -1 +0,0 @@
-../../../../inc/common/proto/ge_ir.proto

ge/common/proto/ge_ir.proto

@@ -0,0 +1,190 @@
+syntax = "proto3";
+
+package ge.proto;
+
+enum DataType
+{
+    DT_UNDEFINED = 0;  // Used to indicate a DataType field has not been set.
+    DT_FLOAT     = 1;  // float type
+    DT_FLOAT16   = 2;  // fp16 type
+    DT_INT8      = 3;  // int8 type
+    DT_UINT8     = 4;  // uint8 type
+    DT_INT16     = 5;  // int16 type
+    DT_UINT16    = 6;  // uint16 type
+    DT_INT32     = 7;  //
+    DT_INT64     = 8;  // int64 type
+    DT_UINT32    = 9;  // unsigned int32
+    DT_UINT64    = 10;  // unsigned int64
+    DT_BOOL      = 11;  // bool type
+    DT_DOUBLE    = 12; // double type
+    DT_STRING = 13;            // string type
+    DT_DUAL_SUB_INT8 = 14;    /**< dual output int8 type */
+    DT_DUAL_SUB_UINT8 = 15;    /**< dual output uint8 type */
+    DT_COMPLEX64 = 16;         // complex64 type
+    DT_COMPLEX128 = 17;        // complex128 type
+    DT_QINT8 = 18;             // qint8 type
+    DT_QINT16 = 19;            // qint16 type
+    DT_QINT32 = 20;            // qint32 type
+    DT_QUINT8 = 21;            // quint8 type
+    DT_QUINT16 = 22;           // quint16 type
+    DT_RESOURCE  = 23;         // resource type
+    DT_STRING_REF = 24;        // string_ref type
+    DT_DUAL      = 25;              /**< dual output type */
+}
+
+message AttrDef
+{
+    message ListValue
+    {
+        enum ListValueType{
+          VT_LIST_NONE = 0;
+          VT_LIST_STRING = 1;
+          VT_LIST_INT = 2;
+          VT_LIST_FLOAT = 3;
+          VT_LIST_BOOL = 4;
+          VT_LIST_BYTES = 5;
+          VT_LIST_TENSOR_DESC = 6;
+          VT_LIST_TENSOR = 7;
+          VT_LIST_GRAPH = 8;
+          VT_LIST_NAMED_ATTRS = 9;
+          VT_LIST_DATA_TYPE = 10;
+        }
+        repeated bytes s             = 2;                    // "list(string)"
+        repeated int64 i             = 3;  // "list(int)"
+        repeated float f             = 4;   // "list(float)"
+        repeated bool  b             = 5;  // "list(bool)"
+        repeated bytes bt            = 7;
+        repeated TensorDescriptor td = 8;
+        repeated TensorDef t         = 9;
+        repeated GraphDef g          = 10;
+	    repeated NamedAttrs na       = 11;
+	    repeated int64 dt            = 12; // list ge::DataType
+
+	    ListValueType val_type       = 20;
+    }
+
+    message ListListInt{
+        message ListInt{
+            repeated int64 list_i             = 1; // list int
+        }
+        repeated ListInt list_list_i             = 1; // list list int
+    }
+
+    oneof value
+    {
+        bytes            s    = 2;  // "string"
+        int64            i    = 3;  // "int"
+        float            f    = 4;  // "float"
+        bool             b    = 5;  // "bool"
+        bytes            bt   = 7;
+        ListValue        list = 1;   // any "list(...)"
+        NamedAttrs       func = 10;  // Used to support attr nesting
+        TensorDescriptor td   = 11;  // GeTensorDesc type
+        TensorDef        t    = 12;  // GeTensor type
+        GraphDef         g    = 13;  // Graph type
+        ListListInt      list_list_int  = 14;  // List List Int type
+        int64            dt   = 15; // ge::DataType
+    }
+}
+
+// A list of attr names and their values. The whole list is attached
+// with a string name.  E.g., MatMul[T=float].
+message NamedAttrs
+{
+    string               name = 1;
+    map<string, AttrDef> attr = 2;
+}
+
+// Shape / dimension description, using row-major order
+message ShapeDef
+{
+    repeated int64 dim = 1;  // Size of each dimension
+}
+
+// Multidimensional data description
+message TensorDescriptor
+{
+    string   name   = 1;  // Optional parameter, tensor name
+
+    DataType dtype  = 2;  // tensor datatype
+    ShapeDef shape  = 3;  // Shape / dimension
+    string   layout = 4;  // Tensor format, eg: "NCHW", "NHWC", "CHW", "ND"
+
+    bool has_out_attr = 9;
+    int64 size = 10;
+    int64 weight_size = 11;
+    bool reuse_input = 12;
+    bool output_tensor = 13;
+    string device_type = 14;
+    bool input_tensor =15;
+    int64 real_dim_cnt = 16;
+    int64 reuse_input_index = 17;
+    int64 data_offset = 18;
+    int64 cmps_size = 19;
+    string cmps_tab = 20;
+    int64 cmps_tab_offset = 21;
+
+	map<string, AttrDef> attr = 5;  // Set of extra parameter fields
+}
+
+// GeTensor definition
+message TensorDef
+{
+    TensorDescriptor desc = 1;  // Tensor description
+    bytes            data = 2;  // Tensor data
+}
+
+
+// Operator description
+message OpDef
+{
+    string name = 1;  // name
+    string type = 2;  // type
+
+    repeated string input = 5;  // input original op name + outgoing index. op_name：index
+
+    map<string, AttrDef> attr = 10;  // Set of operator parameter fields
+
+    bool has_out_attr = 20;
+    int64 id = 21;
+    int64 stream_id =22;
+    repeated string input_name = 23;
+    repeated string src_name = 24;
+    repeated int64 src_index = 25;
+    repeated string dst_name = 26;
+    repeated int64 dst_index = 27;
+    repeated int64 input_i = 28;
+    repeated int64 output_i = 29;
+    repeated int64 workspace = 30;
+    repeated int64 workspace_bytes = 31;
+    repeated bool is_input_const = 32;
+    repeated TensorDescriptor input_desc = 33;
+    repeated TensorDescriptor output_desc = 34;
+    repeated string subgraph_name = 35;
+}
+
+// Graph definition
+message GraphDef
+{
+    string name   = 1;   //  name
+
+    repeated string input  = 4;  // Graph input
+    repeated string output = 5;  // Graph output
+
+    repeated OpDef op      = 6;  // List of operators
+
+	map<string, AttrDef> attr = 11;  // Extended field
+}
+
+// model definition
+message ModelDef
+{
+	string name         = 1;  // name
+	uint32 version      = 2;  // IR Proto verion
+	string custom_version = 3;  // User model version number, passed in by user
+
+    repeated GraphDef graph = 7;  // Graph definition，graph[0] represents the main diagram in modeldef
+
+    map<string, AttrDef> attr = 11;  // Extended field
+}
+