!1822 Normalize include files ...

From: @zhangxiaokun9
Reviewed-by: @xchu42,@xchu42,@wqtshg
Signed-off-by: @wqtshg

ge/CMakeLists.txt

@@ -754,22 +754,15 @@ target_compile_options(ge_runner PRIVATE
 
 target_include_directories(ge_runner SYSTEM PRIVATE
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/analyzer
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
-    ${GE_CODE_DIR}/inc/framework/common
-    ${METADEF_DIR}
     ${METADEF_DIR}/inc
-    ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
-    ${GE_CODE_DIR}/../inc/external
-    ${GE_CODE_DIR}/../inc/cce
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     ${GE_CODE_DIR}/../abl/adump/external
     #### blue zone
@@ -835,22 +828,15 @@ target_compile_options(ge_compiler PRIVATE
 
 target_include_directories(ge_compiler SYSTEM PRIVATE
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/analyzer
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
-    ${GE_CODE_DIR}/inc/framework/common
-    ${METADEF_DIR}
     ${METADEF_DIR}/inc
-    ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
-    ${GE_CODE_DIR}/../inc/external
-    ${GE_CODE_DIR}/../inc/cce
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     ${GE_CODE_DIR}/../abl/adump/external
     #### blue zone ####
@@ -1000,18 +986,14 @@ set_target_properties(atc_stub_ge_compiler PROPERTIES
 )
 
 target_include_directories(atc_stub_ge_compiler PRIVATE
-    ${GE_CODE_DIR}
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/analyzer
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/framework
-    ${GE_CODE_DIR}/inc/framework/common
     ${GE_CODE_DIR}/inc/external
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
+    ${METADEF_DIR}/inc
     #### yellow zone ####
-    ${GE_CODE_DIR}/../inc/cce
+    ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     ${GE_CODE_DIR}/../abl/adump/external
     #### blue zone ####
@@ -1041,18 +1023,14 @@ set_target_properties(fwk_stub_ge_runner PROPERTIES
 )
 
 target_include_directories(fwk_stub_ge_runner PRIVATE
-    ${GE_CODE_DIR}
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/analyzer
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
-    ${GE_CODE_DIR}/inc/framework/common
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
+    ${METADEF_DIR}/inc
     #### yellow zone ####
-    ${GE_CODE_DIR}/../inc/cce
+    ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     ${GE_CODE_DIR}/../abl/adump/external
     #### blue zone ####

ge/analyzer/analyzer.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "analyzer.h"
+#include "analyzer/analyzer.h"
 
 #include <cstdlib>
 #include <cstdio>

ge/client/ge_api.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "ge/ge_api.h"
+#include "external/ge/ge_api.h"
 #include <iostream>
 #include <malloc.h>
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "framework/common/debug/ge_log.h"
 #include "common/ge/datatype_util.h"
 #include "proto/ge_api.pb.h"

ge/common/CMakeLists.txt

@@ -72,20 +72,15 @@ target_compile_options(ge_common PRIVATE
 
 target_include_directories(ge_common PRIVATE
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/common
-    ${GE_CODE_DIR}/ge/common/op
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc>
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc/cce>
     #### blue zone ####
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain>
@@ -141,20 +136,15 @@ target_compile_options(ge_common_static PRIVATE
 
 target_include_directories(ge_common_static PRIVATE
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/common
-    ${GE_CODE_DIR}/ge/common/op
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc>
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc/cce>
     #### blue zone ####
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain>
@@ -200,15 +190,11 @@ target_compile_options(ge_common PRIVATE
 
 target_include_directories(ge_common PRIVATE
     ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/ge/common
-    ${GE_CODE_DIR}/ge/common/op
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     ${GE_CODE_DIR}/third_party/fwkacllib/inc

ge/common/base64.h

@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <string>
 
-#include "debug/ge_log.h"
-#include "ge_error_codes.h"
+#include "framework/common/debug/ge_log.h"
+#include "external/ge/ge_error_codes.h"
 
 namespace ge {
 namespace {

ge/common/dump/dump_manager.h

@@ -20,7 +20,7 @@
 #include <mutex>
 
 #include "common/dump/dump_properties.h"
-#include "common/ge_types.h"
+#include "framework/common/ge_types.h"
 
 namespace ge {
 class DumpManager {

ge/common/dump/dump_op.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/properties_manager.h"
 #include "proto/op_mapping.pb.h"
 #include "runtime/stream.h"

ge/common/dump/dump_properties.cc

@@ -20,7 +20,7 @@
 #include <string>
 
 #include "common/ge/ge_util.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/debug/log.h"
 #include "framework/common/ge_types.h"

ge/common/dump/opdebug_register.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "opdebug_register.h"
+#include "common/dump/opdebug_register.h"
 
 namespace {
 const size_t kOpDebugMemorySize = 2048UL;

ge/common/dump/opdebug_register.h

@@ -18,8 +18,8 @@
 #define GE_COMMON_DUMP_OPDEBUG_REGISTER_H_
 
 #include <map>
-#include "common/debug/ge_log.h"
-#include "common/debug/log.h"
+#include "framework/common/debug/ge_log.h"
+#include "framework/common/debug/log.h"
 #include "graph/load/model_manager/data_dumper.h"
 
 namespace ge {

ge/common/formats/format_transfers/format_transfer_fractal_z.cc

@@ -19,7 +19,7 @@
 #include <securec.h>
 #include <memory>
 
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/formats/utils/formats_definitions.h"
 #include "common/formats/utils/formats_trans_utils.h"
 #include "framework/common/debug/ge_log.h"

ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc

@@ -23,7 +23,7 @@
 
 #include "common/formats/utils/formats_definitions.h"
 #include "common/formats/utils/formats_trans_utils.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/utils/type_utils.h"
 

ge/common/ge/datatype_util.h

@@ -20,7 +20,7 @@
 #include <map>
 #include <vector>
 
-#include "graph/types.h"
+#include "external/graph/types.h"
 
 namespace ge {
 static const int32_t kGeSizeFloat = sizeof(float);

ge/common/ge/plugin_manager.h

@@ -26,8 +26,8 @@
 #include <typeinfo>
 #include <vector>
 
-#include "common/ge_inner_error_codes.h"
-#include "engine/dnnengine.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/engine/dnnengine.h"
 #include "framework/common/debug/ge_log.h"
 #include "mmpa/mmpa_api.h"
 

ge/common/ge_format_util.cc

@@ -15,7 +15,7 @@
  */
 
 #include "framework/common/ge_format_util.h"
-#include "formats/formats.h"
+#include "common/formats/formats.h"
 
 namespace ge {
 GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status GeFormatUtil::TransShape(const TensorDesc &src_desc,

ge/common/helper/model_cache_helper.h

@@ -21,7 +21,7 @@
 #include <set>
 #include <string>
 
-#include "ge/ge_api_error_codes.h"
+#include "external/ge/ge_api_error_codes.h"
 #include "graph/compute_graph.h"
 #include "graph/manager/graph_var_manager.h"
 #include "model/ge_model.h"

ge/common/math/fp16_math.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "fp16_math.h"
+#include "common/math/fp16_math.h"
 #include "external/register/register_types.h"
 
 namespace ge {

ge/common/model_parser/model_parser.cc

@@ -20,7 +20,7 @@
 #include <string>
 
 #include "securec.h"
-#include "common/helper/model_helper.h"
+#include "framework/common/helper/model_helper.h"
 
 namespace ge {
 FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelParserBase::ModelParserBase() {}

ge/common/op/attr_value_util.cc

@@ -17,7 +17,7 @@
 #include "framework/common/op/attr_value_util.h"
 #include "framework/common/debug/log.h"
 #include "framework/common/util.h"
-#include "register/register_types.h"
+#include "external/register/register_types.h"
 
 namespace ge {
 #define DEFINE_SET_ATTR_VALUE_ONE(ARG_TYPE, FIELD)                        \

ge/common/profiling/ge_profiling.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "common/profiling/ge_profiling.h"
+#include "framework/common/profiling/ge_profiling.h"
 #include "runtime/base.h"
 #include "common/profiling/profiling_manager.h"
 #include "framework/common/debug/ge_log.h"

ge/common/profiling/ge_runner_profiling.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "common/profiling/ge_runner_profiling.h"
+#include "framework/common/profiling/ge_runner_profiling.h"
 #include "init/gelib.h"
 
 bool IsInitialize() {

ge/common/profiling/profiling_manager.cc

@@ -21,7 +21,7 @@
 #include "framework/common/string_util.h"
 #include "graph/ge_context.h"
 #include "graph/utils/type_utils.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 #include "runtime/base.h"
 #include "graph/load/model_manager/davinci_model.h"
 #include "mmpa/mmpa_api.h"

ge/common/properties_manager.cc

@@ -21,7 +21,7 @@
 #include <fstream>
 
 #include "common/ge/ge_util.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/debug/log.h"
 #include "framework/common/ge_types.h"

ge/common/properties_manager.h

@@ -25,7 +25,7 @@
 
 #include "common/dump/dump_properties.h"
 #include "graph/op_desc.h"
-#include "common/ge_compiler_options.h"
+#include "framework/common/ge_compiler_options.h"
 
 namespace ge {
 // Configuration property management

ge/common/thread_pool.cc

@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include "register/register_types.h"
+#include "external/register/register_types.h"
 
 namespace ge {
 FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ThreadPool::ThreadPool(uint32_t size) : is_stoped_(false) {

ge/common/thread_pool.h

@@ -31,7 +31,7 @@
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/ge_inner_error_codes.h"
 #include "external/ge/ge_api_error_codes.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 #include "common/ge/ge_util.h"
 
 namespace ge {

ge/common/types.cc

@@ -15,7 +15,7 @@
  */
 
 #include "framework/common/types.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 
 namespace ge {
 // dump

ge/engine_manager/dnnengine_manager.cc

@@ -22,7 +22,7 @@
 #include <map>
 #include <utility>
 
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/ge/ge_util.h"
 #include "common/util/error_manager/error_manager.h"
 #include "framework/common/debug/ge_log.h"

ge/engine_manager/dnnengine_manager.h

@@ -26,9 +26,9 @@
 #include "nlohmann/json.hpp"
 
 #include "common/ge/plugin_manager.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/opskernel/ops_kernel_info_types.h"
-#include "engine/dnnengine.h"
+#include "framework/engine/dnnengine.h"
 #include "graph/op_desc.h"
 #include "graph/node.h"
 

ge/executor/CMakeLists.txt

@@ -182,13 +182,10 @@ target_include_directories(ge_executor SYSTEM PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc>
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc/cce>
     #### blue zone ####
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain>
@@ -236,13 +233,10 @@ target_include_directories(ge_executor_shared PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc>
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:${GE_DEPEND_DIR}/inc/cce>
     #### blue zone ####
     $<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
 )

ge/executor/ge_executor.cc

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "executor/ge_executor.h"
+#include "framework/executor/ge_executor.h"
 #include <cce/cce.h>
 #include <ctime>
 #include <iostream>
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/ge/ge_util.h"
-#include "common/helper/model_helper.h"
+#include "framework/common/helper/model_helper.h"
 #include "common/profiling/profiling_manager.h"
 #include "common/dump/dump_manager.h"
 #include "graph/execute/graph_execute.h"

ge/ge_local_engine/CMakeLists.txt

@@ -41,8 +41,6 @@ target_include_directories(ge_local_engine PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
@@ -91,8 +89,6 @@ target_include_directories(atc_ge_local_engine PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
@@ -146,8 +142,6 @@ target_include_directories(ge_local_opskernel_builder PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
@@ -197,8 +191,6 @@ target_include_directories(atc_ge_local_opskernel_builder PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
@@ -254,8 +246,6 @@ target_include_directories(ge_local_opskernel_builder_static PRIVATE
     ${GE_CODE_DIR}/inc/framework
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####

ge/ge_local_engine/engine/ge_local_engine.cc

@@ -19,10 +19,10 @@
 #include <memory>
 #include <string>
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
-#include "common/constant/constant.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "ge_local_engine/common/constant/constant.h"
 #include "common/ge/ge_util.h"
-#include "ops_kernel_store/ge_local_ops_kernel_info.h"
+#include "ge_local_engine/ops_kernel_store/ge_local_ops_kernel_info.h"
 
 namespace ge {
 namespace ge_local {

ge/ge_local_engine/engine/host_cpu_engine.cc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "host_cpu_engine.h"
+#include "ge_local_engine/engine/host_cpu_engine.h"
 #include "graph/common/omg_util.h"
 #include "graph/utils/op_desc_utils.h"
 #include "graph/utils/tensor_adapter.h"

ge/ge_local_engine/engine/host_cpu_engine.h

@@ -33,7 +33,7 @@
 #include <mutex>
 #include "framework/common/ge_inner_error_codes.h"
 #include "graph/node.h"
-#include "graph/operator.h"
+#include "external/graph/operator.h"
 #include "external/../register/register.h"
 
 namespace ge {

ge/ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "ge_local_ops_kernel_builder.h"
+#include "ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.h"
 #include <memory>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/ge/ge_util.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/utils/node_utils.h"

ge/ge_local_engine/ops_kernel_store/ge_local_ops_kernel_info.cc

@@ -16,14 +16,14 @@
 
 #include "ge_local_engine/ops_kernel_store/ge_local_ops_kernel_info.h"
 #include <memory>
-#include "common/constant/constant.h"
+#include "ge_local_engine/common/constant/constant.h"
 #include "common/ge/ge_util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/utils/node_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "graph/utils/type_utils.h"
-#include "op/op_factory.h"
+#include "ge_local_engine/ops_kernel_store/op/op_factory.h"
 #include "proto/task.pb.h"
 
 namespace ge {

ge/ge_local_engine/ops_kernel_store/op/ge_deleted_op.cc

@@ -16,7 +16,7 @@
 
 #include "ge_local_engine/ops_kernel_store/op/ge_deleted_op.h"
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "ge_local_engine/ops_kernel_store/op/op_factory.h"
 
 namespace ge {

ge/ge_local_engine/ops_kernel_store/op/no_op.cc

@@ -16,7 +16,7 @@
 
 #include "ge_local_engine/ops_kernel_store/op/no_op.h"
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "ge_local_engine/ops_kernel_store/op/op_factory.h"
 
 namespace ge {

ge/ge_local_engine/ops_kernel_store/op/op.cc

@@ -16,7 +16,7 @@
 
 #include "ge_local_engine/ops_kernel_store/op/op.h"
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/op_desc.h"
 #include "graph/utils/anchor_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/ge_local_engine/ops_kernel_store/op/op.h

@@ -20,7 +20,7 @@
 #include <climits>
 #include <string>
 #include <vector>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/node.h"
 
 namespace ge {

ge/ge_local_engine/ops_kernel_store/op/op_factory.cc

@@ -16,7 +16,7 @@
 
 #include "ge_local_engine/ops_kernel_store/op/op_factory.h"
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/op_desc.h"
 
 namespace ge {

ge/ge_runtime/CMakeLists.txt

@@ -34,21 +34,13 @@ target_compile_definitions(ge_runtime PRIVATE
 
 target_include_directories(ge_runtime PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
-    ${GE_CODE_DIR}
     ${GE_CODE_DIR}/ge
     ${GE_CODE_DIR}/inc
-    ${GE_CODE_DIR}/inc/graph
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
-    ${GE_CODE_DIR}/inc/framework/common
-    ${GE_CODE_DIR}/inc/framework/ge_runtime
-    ${GE_CODE_DIR}/inc/cce
     ${GE_CODE_DIR}/third_party/fwkacllib/inc
-    ${METADEF_DIR}
     ${METADEF_DIR}/inc
-    ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/ge
 )

ge/ge_runtime/model_runner.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "ge_runtime/model_runner.h"
-#include "./runtime_model.h"
+#include "framework/ge_runtime/model_runner.h"
+#include "ge_runtime/runtime_model.h"
 #include "framework/common/debug/ge_log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/ge/ge_util.h"
-#include "ge_runtime/davinci_model.h"
+#include "framework/ge_runtime/davinci_model.h"
 #include "graph/op_desc.h"
 
 namespace ge {

ge/ge_runtime/output.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ge_runtime/output.h"
-#include "common/ge_inner_error_codes.h"
-#include "common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 
 namespace ge {

ge/ge_runtime/output.h

@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <vector>
-#include "ge_runtime/davinci_model.h"
-#include "common/ge_types.h"
+#include "framework/ge_runtime/davinci_model.h"
+#include "framework/common/ge_types.h"
 
 namespace ge {
 namespace model_runner {

ge/ge_runtime/runtime_model.cc

@@ -16,15 +16,15 @@
 
 #include "ge_runtime/runtime_model.h"
 #include <set>
-#include "./model_context.h"
-#include "./task/task.h"
-#include "common/ge_inner_error_codes.h"
-#include "common/types.h"
-#include "common/util.h"
+#include "ge_runtime/model_context.h"
+#include "ge_runtime/task/task.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/op/op_parser_util.h"
-#include "graph/types.h"
-#include "task/task_factory.h"
+#include "external/graph/types.h"
+#include "ge_runtime/task/task_factory.h"
 #include "ge/common/math/math_util.h"
 
 namespace ge {

ge/ge_runtime/runtime_model.h

@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "ge_runtime/davinci_model.h"
-#include "common/ge_types.h"
+#include "framework/ge_runtime/davinci_model.h"
+#include "framework/common/ge_types.h"
 #include "runtime/base.h"
 #include "runtime/rt_model.h"
 

ge/ge_runtime/task/task.h

@@ -23,7 +23,7 @@
 #include <string>
 #include "runtime/rt_model.h"
 #include "ge_runtime/model_context.h"
-#include "ge_runtime/task_info.h"
+#include "framework/ge_runtime/task_info.h"
 #include "external/runtime/rt_error_codes.h"
 
 namespace ge {

ge/ge_runtime/task/task_factory.h

@@ -21,9 +21,9 @@
 #include <map>
 #include <memory>
 #include <unordered_map>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/debug/ge_log.h"
-#include "ge_runtime/task_info.h"
+#include "framework/ge_runtime/task_info.h"
 
 namespace ge {
 namespace model_runner {

ge/generator/ge_generator.cc

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#include "generator/ge_generator.h"
+#include "framework/generator/ge_generator.h"
 
 #include <atomic>
 
 #include "common/ge/ge_util.h"
 #include "common/ge/plugin_manager.h"
-#include "common/helper/model_helper.h"
-#include "common/helper/om_file_helper.h"
-#include "common/util.h"
+#include "framework/common/helper/model_helper.h"
+#include "framework/common/helper/om_file_helper.h"
+#include "framework/common/util.h"
 #include "common/util/error_manager/error_manager.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/debug/log.h"
-#include "ge/ge_api.h"
+#include "external/ge/ge_api.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/ge_context.h"
 #include "graph/manager/graph_manager.h"

ge/generator/generator_api.cc

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "generator/generator_api.h"
+#include "framework/generator/generator_api.h"
 #include "common/ge/ge_util.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
-#include "generator/ge_generator.h"
+#include "framework/generator/ge_generator.h"
 #include "graph/ge_attr_value.h"
 #include "graph/ge_tensor.h"
 #include "graph/op_desc.h"

ge/graph/build/graph_builder.cc

@@ -17,7 +17,7 @@
 #include "graph/build/graph_builder.h"
 #include "graph/build/memory/graph_mem_assigner.h"
 #include "common/ge/ge_util.h"
-#include "common/helper/model_helper.h"
+#include "framework/common/helper/model_helper.h"
 #include "graph/build/logical_stream_allocator.h"
 #include "graph/build/run_context.h"
 #include "graph/build/stream_graph_optimizer.h"

ge/graph/build/graph_builder.h

@@ -22,16 +22,16 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/debug/memory_dumper.h"
 #include "common/properties_manager.h"
-#include "common/string_util.h"
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/string_util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "graph/build/model_builder.h"
 #include "graph/build/task_generator.h"
 #include "graph/compute_graph.h"
-#include "graph/graph.h"
+#include "external/graph/graph.h"
 #include "graph/manager/graph_manager_utils.h"
 #include "graph/model.h"
 #include "graph/node.h"

ge/graph/build/label_allocator.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "label_allocator.h"
+#include "graph/build/label_allocator.h"
 
 #include "framework/common/types.h"
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/label/label_maker.h"

ge/graph/build/memory/block_mem_assigner.cc

@@ -24,7 +24,7 @@
 #include "graph/buffer.h"
 #include "graph/ge_attr_value.h"
 #include "graph/ge_context.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 #include "graph/node.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/node_utils.h"
@@ -36,7 +36,7 @@
 
 #include "graph/common/local_context.h"
 #include "graph/optimize/common/params.h"
-#include "omg/omg_inner_types.h"
+#include "framework/omg/omg_inner_types.h"
 #include "runtime/mem.h"
 
 using std::map;

ge/graph/build/memory/block_mem_assigner.h

@@ -24,9 +24,9 @@
 #include <utility>
 #include <vector>
 #include <list>
-#include "common/ge_inner_error_codes.h"
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "graph/build/memory/mem_assigner.h"
 #include "graph/compute_graph.h"
 #include "graph/utils/graph_utils.h"

ge/graph/build/memory/hybrid_mem_assigner.h

@@ -22,8 +22,8 @@
 #include "graph/build/memory/block_mem_assigner.h"
 #include "graph/compute_graph.h"
 
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 
 namespace ge {
 using BlockMemAssignerPtr = std::shared_ptr<BlockMemAssigner>;

ge/graph/build/memory/mem_assigner.h

@@ -17,8 +17,8 @@
 #ifndef GE_GRAPH_BUILD_MEMORY_MEM_ASSIGNER_H_
 #define GE_GRAPH_BUILD_MEMORY_MEM_ASSIGNER_H_
 
-#include "common/ge_inner_error_codes.h"
-#include "memory/memory_assigner.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/memory/memory_assigner.h"
 namespace ge {
 static const int64_t kInvalidOffset = -1;
 

ge/graph/build/memory/memory_assigner.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "memory/memory_assigner.h"
+#include "framework/memory/memory_assigner.h"
 #include <memory>
 #include "framework/common/debug/ge_log.h"
 #include "graph/build/memory/graph_mem_assigner.h"

ge/graph/build/memory/var_mem_assign_util.cc

@@ -16,14 +16,14 @@
 
 #include "graph/build/memory/var_mem_assign_util.h"
 #include <vector>
-#include "common/types.h"
+#include "framework/common/types.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/common/transop_util.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/manager/graph_mem_allocator.h"
 #include "graph/manager/graph_var_manager.h"
-#include "graph/tensor.h"
-#include "graph/types.h"
+#include "external/graph/tensor.h"
+#include "external/graph/types.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/graph/build/memory/var_mem_assign_util.h

@@ -17,8 +17,8 @@
 #ifndef GE_GRAPH_BUILD_MEMORY_VAR_MEM_ASSIGN_UTIL_H_
 #define GE_GRAPH_BUILD_MEMORY_VAR_MEM_ASSIGN_UTIL_H_
 #include <string>
-#include "common/debug/log.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/utils/node_utils.h"
 
 namespace ge {

ge/graph/build/model_builder.cc

@@ -22,7 +22,7 @@
 #include "common/dump/dump_manager.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/anchor.h"
-#include "graph/attr_value.h"
+#include "external/graph/attr_value.h"
 #include "graph/buffer.h"
 #include "graph/build/stream_allocator.h"
 #include "graph/common/omg_util.h"
@@ -31,11 +31,11 @@
 #include "graph/debug/ge_attr_define.h"
 #include "graph/ge_attr_value.h"
 #include "graph/ge_context.h"
-#include "graph/ge_error_codes.h"
+#include "external/graph/ge_error_codes.h"
 #include "graph/manager/graph_mem_allocator.h"
 #include "graph/manager/graph_var_manager.h"
 #include "graph/optimize/common/params.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/node_utils.h"
@@ -43,8 +43,8 @@
 #include "graph/utils/tensor_utils.h"
 #include "graph/utils/type_utils.h"
 #include "init/gelib.h"
-#include "memory/memory_assigner.h"
-#include "omg/version.h"
+#include "framework/memory/memory_assigner.h"
+#include "framework/omg/version.h"
 #include "register/op_registry.h"
 #include "graph/passes/set_input_output_offset_pass.h"
 #include "graph/build/memory/block_mem_assigner.h"

ge/graph/build/model_builder.h

@@ -23,17 +23,17 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "common/op/ge_op_utils.h"
+#include "framework/common/op/ge_op_utils.h"
 #include "common/tbe_kernel_store.h"
 #include "common/cust_aicpu_kernel_store.h"
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "graph/compute_graph.h"
 #include "graph/manager/graph_manager_utils.h"
 #include "graph/model.h"
 #include "graph/node.h"
 #include "model/ge_model.h"
-#include "omg/omg_inner_types.h"
+#include "framework/omg/omg_inner_types.h"
 
 namespace ge {
 class ModelBuilder {

ge/graph/build/run_context.cc

@@ -15,7 +15,7 @@
  */
 #include "graph/build/run_context.h"
 
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/common/omg_util.h"

ge/graph/build/run_context.h

@@ -18,7 +18,7 @@
 #define GE_GRAPH_BUILD_RUN_CONTEXT_H_
 
 #include <vector>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/opskernel/ops_kernel_info_types.h"
 #include "framework/common/types.h"
 #include "graph/compute_graph.h"

ge/graph/build/stream_allocator.cc

@@ -27,7 +27,7 @@
 #include "graph/ge_context.h"
 #include "graph/utils/graph_utils.h"
 #include "init/gelib.h"
-#include "common/string_util.h"
+#include "framework/common/string_util.h"
 #include "common/util/error_manager/error_manager.h"
 
 using std::map;

ge/graph/build/stream_graph_optimizer.cc

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "stream_graph_optimizer.h"
+#include "graph/build/stream_graph_optimizer.h"
 
 #include <securec.h>
 
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/utils/node_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/graph/build/stream_graph_optimizer.h

@@ -18,7 +18,7 @@
 #define GE_GRAPH_BUILD_OPTIMIZE_STREAM_GRAPH_H_
 
 #include <vector>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/opskernel/ops_kernel_info_types.h"
 #include "framework/common/types.h"
 #include "graph/compute_graph.h"

ge/graph/build/task_generator.cc

@@ -18,8 +18,8 @@
 #include <string>
 #include <utility>
 #include "common/profiling/profiling_manager.h"
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 
 #include "graph/debug/ge_attr_define.h"
@@ -32,7 +32,7 @@
 #include "graph/common/ge_call_wrapper.h"
 #include "init/gelib.h"
 #include "graph/ge_local_context.h"
-#include "ge/ge_api_types.h"
+#include "external/ge/ge_api_types.h"
 #include "opskernel_manager/ops_kernel_builder_manager.h"
 
 using domi::LogTimeStampDef;

ge/graph/build/task_generator.h

@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "common/opskernel/ops_kernel_info_types.h"
 #include "framework/common/types.h"
 #include "graph/compute_graph.h"

ge/graph/common/bcast.cc

@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "common/math_util.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 
 using domi::Status;
 

ge/graph/common/bcast.h

@@ -21,11 +21,11 @@
 #include <functional>
 #include <vector>
 
-#include "common/debug/log.h"
-#include "common/types.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/types.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/ge_inner_error_codes.h"
-#include "graph/attr_value.h"
+#include "external/graph/attr_value.h"
 #include "graph/ge_tensor.h"
 #include "graph/utils/tensor_adapter.h"
 

ge/graph/common/local_context.cc

@@ -16,9 +16,9 @@
 
 #include "graph/common/local_context.h"
 
-#include "common/ge_inner_error_codes.h"
-#include "common/debug/ge_log.h"
-#include "omg/omg_inner_types.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/debug/ge_log.h"
+#include "framework/omg/omg_inner_types.h"
 
 namespace ge {
 namespace {

ge/graph/common/local_context.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_COMMON_LOCAL_CONTEXT_H_
 #define GE_GRAPH_COMMON_LOCAL_CONTEXT_H_
 
-#include "omg/omg_inner_types.h"
+#include "framework/omg/omg_inner_types.h"
 
 namespace ge {
 void SetLocalOmgContext(OmgContext &context);

ge/graph/common/omg_util.h

@@ -22,8 +22,8 @@
 #include <utility>
 #include <vector>
 
-#include "common/types.h"
-#include "common/util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
 #include "graph/node.h"
 
 namespace ge {

ge/graph/common/transop_util.cc

@@ -16,7 +16,7 @@
 
 #include "graph/common/transop_util.h"
 
-#include "common/types.h"
+#include "framework/common/types.h"
 #include "graph/utils/type_utils.h"
 #include "framework/common/debug/ge_log.h"
 

ge/graph/execute/graph_execute.h

@@ -24,14 +24,14 @@
 #include <memory>
 #include <vector>
 
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/debug/memory_dumper.h"
-#include "common/ge_types.h"
+#include "framework/common/ge_types.h"
 #include "common/properties_manager.h"
-#include "common/string_util.h"
-#include "common/types.h"
-#include "common/util.h"
-#include "ge/ge_api_types.h"
+#include "framework/common/string_util.h"
+#include "framework/common/types.h"
+#include "framework/common/util.h"
+#include "external/ge/ge_api_types.h"
 #include "graph/compute_graph.h"
 #include "graph/manager/graph_context.h"
 #include "graph/manager/graph_manager_utils.h"

ge/graph/label/case_label_maker.cc

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "case_label_maker.h"
+#include "graph/label/case_label_maker.h"
 
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/types.h"
 #include "framework/common/op/ge_op_utils.h"
 #include "graph/debug/ge_attr_define.h"

ge/graph/label/if_label_maker.cc

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "if_label_maker.h"
+#include "graph/label/if_label_maker.h"
 
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/types.h"
 #include "framework/common/op/ge_op_utils.h"
 #include "graph/debug/ge_attr_define.h"

ge/graph/label/label_maker.cc

@@ -16,8 +16,8 @@
 
 #include "graph/label/label_maker.h"
 
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/types.h"
 #include "framework/common/op/ge_op_utils.h"
 #include "graph/debug/ge_attr_define.h"

ge/graph/label/partitioned_call_label_maker.cc

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "partitioned_call_label_maker.h"
+#include "graph/label/partitioned_call_label_maker.h"
 
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/types.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/utils/graph_utils.h"

ge/graph/label/while_label_maker.cc

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "while_label_maker.h"
+#include "graph/label/while_label_maker.h"
 
-#include "common/util.h"
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/util.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "framework/common/types.h"
 #include "framework/common/op/ge_op_utils.h"
 #include "graph/debug/ge_attr_define.h"

ge/graph/load/graph_loader.cc

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "common/helper/model_helper.h"
+#include "framework/common/helper/model_helper.h"
 #include "common/model_parser/model_parser.h"
 #include "graph/ge_context.h"
 #include "graph/load/model_manager/model_manager.h"

ge/graph/load/graph_loader.h

@@ -21,9 +21,9 @@
 #include <string>
 #include <vector>
 
-#include "common/debug/log.h"
-#include "common/fmk_types.h"
-#include "common/ge_types.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/fmk_types.h"
+#include "framework/common/ge_types.h"
 #include "graph/compute_graph.h"
 #include "graph/manager/graph_manager_utils.h"
 #include "graph/model.h"

ge/graph/load/model_manager/aipp_utils.cc

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "common/debug/log.h"
-#include "common/op/ge_op_utils.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/op/ge_op_utils.h"
 #include "framework/common/util.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/utils/attr_utils.h"

ge/graph/load/model_manager/aipp_utils.h

@@ -19,8 +19,8 @@
 
 #include <vector>
 
-#include "common/ge_inner_error_codes.h"
-#include "common/ge_types.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/ge_types.h"
 #include "graph/op_desc.h"
 #include "proto/insert_op.pb.h"
 

ge/graph/load/model_manager/cpu_queue_schedule.cc

@@ -15,8 +15,8 @@
  */
 
 #include "graph/load/model_manager/cpu_queue_schedule.h"
-#include "common/debug/ge_log.h"
-#include "common/debug/log.h"
+#include "framework/common/debug/ge_log.h"
+#include "framework/common/debug/log.h"
 
 namespace {
 const uint32_t kCoreDim = 1;  // for rtCpuKernelLaunch

ge/graph/load/model_manager/cpu_queue_schedule.h

@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "common/ge_inner_error_codes.h"
+#include "framework/common/ge_inner_error_codes.h"
 #include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/load/model_manager/zero_copy_offset.h"
 #include "runtime/kernel.h"

ge/graph/load/model_manager/data_dumper.cc

@@ -24,7 +24,7 @@
 
 #include "common/debug/memory_dumper.h"
 #include "common/properties_manager.h"
-#include "common/util.h"
+#include "framework/common/util.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/util.h"
 #include "graph/anchor.h"

ge/graph/load/model_manager/data_dumper.h

@@ -29,7 +29,7 @@
 #include "proto/ge_ir.pb.h"
 #include "proto/op_mapping.pb.h"
 #include "runtime/mem.h"
-#include "task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "framework/common/ge_types.h"
 #include "runtime/base.h"
 

ge/graph/load/model_manager/data_inputer.cc

@@ -18,9 +18,9 @@
 
 #include <securec.h>
 
-#include "common/debug/log.h"
-#include "common/scope_guard.h"
-#include "common/types.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/scope_guard.h"
+#include "framework/common/types.h"
 
 namespace ge {
 domi::Status InputDataWrapper::Init(const InputData &input, const OutputData &output) {

ge/graph/load/model_manager/data_inputer.h

@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "common/blocking_queue.h"
-#include "common/ge_types.h"
-#include "common/types.h"
+#include "framework/common/ge_types.h"
+#include "framework/common/types.h"
 
 namespace ge {
 ///

ge/graph/load/model_manager/davinci_model.cc

@@ -21,14 +21,14 @@
 #include <map>
 #include <utility>
 
-#include "common/debug/log.h"
+#include "framework/common/debug/log.h"
 #include "common/formats/formats.h"
 #include "common/formats/utils/formats_trans_utils.h"
 #include "common/math/math_util.h"
-#include "common/op/ge_op_utils.h"
+#include "framework/common/op/ge_op_utils.h"
 #include "common/profiling/profiling_manager.h"
 #include "common/properties_manager.h"
-#include "common/scope_guard.h"
+#include "framework/common/scope_guard.h"
 #include "common/thread_pool.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/util.h"
@@ -36,7 +36,7 @@
 #include "graph/compute_graph.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/ge_context.h"
-#include "graph/graph.h"
+#include "external/graph/graph.h"
 #include "graph/load/model_manager/cpu_queue_schedule.h"
 #include "graph/load/model_manager/model_manager.h"
 #include "graph/load/model_manager/tbe_handle_store.h"

ge/graph/load/model_manager/davinci_model.h

@@ -24,14 +24,14 @@
 #include <thread>
 #include <vector>
 
-#include "common/ge_types.h"
-#include "common/helper/model_helper.h"
-#include "common/helper/om_file_helper.h"
+#include "framework/common/ge_types.h"
+#include "framework/common/helper/model_helper.h"
+#include "framework/common/helper/om_file_helper.h"
 #include "common/opskernel/ge_task_info.h"
 #include "common/properties_manager.h"
 #include "common/dump/exception_dumper.h"
 #include "common/dump/opdebug_register.h"
-#include "common/types.h"
+#include "framework/common/types.h"
 #include "framework/common/util.h"
 #include "graph/debug/ge_attr_define.h"
 #include "graph/load/model_manager/aipp_utils.h"
@@ -43,12 +43,12 @@
 #include "graph/model.h"
 #include "graph/node.h"
 #include "graph/op_desc.h"
-#include "graph/operator.h"
+#include "external/graph/operator.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "mmpa/mmpa_api.h"
 #include "proto/task.pb.h"
-#include "task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/common/local_context.h"
 
 using std::mutex;

ge/graph/load/model_manager/model_manager.cc

@@ -21,7 +21,7 @@
 #include "aicpu/aicpu_schedule/aicpu_op_type_list.h"
 #include "common/model_parser/model_parser.h"
 #include "common/dump/dump_manager.h"
-#include "common/l2_cache_optimize.h"
+#include "framework/common/l2_cache_optimize.h"
 #include "common/profiling/profiling_manager.h"
 #include "graph/common/ge_call_wrapper.h"
 #include "graph/load/model_manager/davinci_model.h"

ge/graph/load/model_manager/model_manager.h

@@ -26,13 +26,13 @@
 #include <string>
 #include <vector>
 #include "cce/aicpu_engine_struct.h"
-#include "common/ge_inner_error_codes.h"
-#include "common/ge_types.h"
-#include "common/helper/model_helper.h"
-#include "common/helper/om_file_helper.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/ge_types.h"
+#include "framework/common/helper/model_helper.h"
+#include "framework/common/helper/om_file_helper.h"
 #include "common/properties_manager.h"
-#include "common/types.h"
-#include "ge/ge_api_types.h"
+#include "framework/common/types.h"
+#include "external/ge/ge_api_types.h"
 #include "graph/ge_context.h"
 #include "graph/model.h"
 #include "hybrid/hybrid_davinci_model.h"

ge/graph/load/model_manager/model_utils.cc

@@ -16,11 +16,11 @@
 
 #include "graph/load/model_manager/model_utils.h"
 #include <string>
-#include "common/debug/log.h"
-#include "common/op/ge_op_utils.h"
+#include "framework/common/debug/log.h"
+#include "framework/common/op/ge_op_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "graph/manager/graph_var_manager.h"
-#include "graph/types.h"
+#include "external/graph/types.h"
 #include "graph/build/memory/block_mem_assigner.h"
 #include "common/math/math_util.h"
 

ge/graph/load/model_manager/model_utils.h

@@ -19,8 +19,8 @@
 
 #include <vector>
 
-#include "common/ge_inner_error_codes.h"
-#include "common/types.h"
+#include "framework/common/ge_inner_error_codes.h"
+#include "framework/common/types.h"
 #include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 #include "graph/utils/tensor_adapter.h"

ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc

@@ -23,7 +23,7 @@
 #include "common/properties_manager.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/fmk_error_codes.h"
-#include "graph/attr_value.h"
+#include "external/graph/attr_value.h"
 #include "graph/load/model_manager/davinci_model.h"
 #include "graph/load/model_manager/model_manager.h"
 #include "hybrid/node_executor/aicpu/aicpu_ext_info.h"