!3779 decoupling core and debug

Merge pull request !3779 from liubuyu/master

mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc

@@ -32,7 +32,7 @@
 #include "vm/segment_runner.h"
 #include "debug/draw.h"
 #include "debug/anf_ir_dump.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc

@@ -33,7 +33,7 @@
 #include "vm/segment_runner.h"
 #include "debug/draw.h"
 #include "debug/anf_ir_dump.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/session/session_basic.cc

@@ -33,7 +33,7 @@
 #include "common/utils.h"
 #include "ir/dtype.h"
 #include "ir/anf.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #if (ENABLE_CPU && (ENABLE_D || ENABLE_GPU))
 #include "frontend/parallel/ps/worker.h"
 #include "frontend/parallel/ps/common.h"

mindspore/ccsrc/debug/CMakeLists.txt

@@ -3,10 +3,6 @@ set(_DEBUG_SRC_LIST
     "${CMAKE_CURRENT_SOURCE_DIR}/anf_ir_utils.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/draw.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/dump_proto.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/info.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/label.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/trace_info.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/trace_base.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/trace.cc"
 )
 

mindspore/ccsrc/debug/anf_ir_utils.cc

@@ -36,7 +36,7 @@
 #include "utils/ordered_set.h"
 #include "utils/utils.h"
 #include "debug/trace.h"
-#include "debug/label.h"
+#include "utils/label.h"
 #include "utils/context/ms_context.h"
 #include "frontend/operator/ops.h"
 

mindspore/ccsrc/debug/draw.cc

@@ -23,7 +23,6 @@
 #include <vector>
 #include <string>
 
-#include "pybind11/pybind11.h"
 #include "ir/meta_func_graph.h"
 #include "ir/param_value.h"
 #include "ir/primitive.h"
@@ -32,8 +31,6 @@
 #include "frontend/operator/composite/composite.h"
 #include "ir/tensor.h"
 
-namespace py = pybind11;
-
 namespace mindspore {
 
 // namespace to support debug utils

mindspore/ccsrc/debug/trace.h

@@ -23,8 +23,8 @@
 #include <utility>
 #include <stack>
 
-#include "debug/trace_base.h"
+#include "utils/trace_base.h"
-#include "debug/info.h"
+#include "utils/info.h"
 #include "ir/anf.h"
 #include "ir/func_graph.h"
 #include "pipeline/jit/static_analysis/static_analysis.h"

mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc

@@ -22,8 +22,8 @@
 
 #include "ir/anf.h"
 #include "ir/meta_func_graph.h"
-#include "debug/info.h"
+#include "utils/info.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "ir/manager.h"
 #include "pipeline/jit/resource.h"
 #include "pipeline/jit/parse/parse.h"

mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h

@@ -27,7 +27,7 @@
 
 #include "ir/anf.h"
 #include "ir/meta_func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "pipeline/jit/resource.h"
 #include "frontend/optimizer/ad/adjoint.h"
 #include "frontend/operator/ops.h"

mindspore/ccsrc/frontend/optimizer/ad/grad.cc

@@ -16,7 +16,7 @@
 
 #include "frontend/optimizer/ad/grad.h"
 #include "frontend/optimizer/ad/dfunctor.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "utils/context/ms_context.h"
 #include "utils/symbolic.h"
 #include "ir/graph_utils.h"

mindspore/ccsrc/frontend/optimizer/ad/kprim.cc

@@ -22,7 +22,7 @@
 #include "ir/anf.h"
 #include "utils/primitive_py.h"
 #include "ir/meta_func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "ir/manager.h"
 #include "pipeline/jit/resource.h"
 #include "pipeline/jit/parse/parse.h"
@@ -33,7 +33,7 @@
 #include "utils/symbolic.h"
 #include "utils/primitive_utils.h"
 #include "utils/context/ms_context.h"
-#include "debug/info.h"
+#include "utils/info.h"
 #include "debug/trace.h"
 
 #include "./common.h"

mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc

@@ -21,7 +21,7 @@
 #include <unordered_map>
 
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/operator/ops.h"
 
 namespace mindspore {

mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h

@@ -21,7 +21,7 @@
 #include <algorithm>
 
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/optimizer/optimizer_caller.h"
 #include "ir/pattern_matcher.h"
 #include "frontend/operator/ops.h"

mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/optimizer/optimizer_caller.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "frontend/operator/ops.h"

mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc

@@ -26,7 +26,7 @@
 #include "frontend/optimizer/optimizer.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h

@@ -28,7 +28,7 @@
 #include "frontend/optimizer/optimizer.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h

@@ -26,7 +26,7 @@
 #include "frontend/optimizer/optimizer.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/operator/ops.h"
 
 namespace mindspore {

mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/optimizer/optimizer_caller.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "frontend/operator/ops.h"

mindspore/ccsrc/frontend/optimizer/irpass/inline.h

@@ -25,7 +25,7 @@
 #include "frontend/optimizer/optimizer.h"
 #include "frontend/optimizer/anf_visitor.h"
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/operator/ops.h"
 
 namespace mindspore {

mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h

@@ -29,7 +29,7 @@
 #include "frontend/optimizer/anf_visitor.h"
 #include "ir/manager.h"
 #include "ir/func_graph.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "frontend/operator/ops.h"
 
 namespace mindspore {

mindspore/ccsrc/frontend/parallel/context.h

@@ -28,7 +28,7 @@
 #include "utils/convert_utils.h"
 #include "ir/anf.h"
 #include "ir/func_graph.h"
-#include "debug/info.h"
+#include "utils/info.h"
 #include "abstract/abstract_value.h"
 
 namespace mindspore {

mindspore/ccsrc/pipeline/jit/action.cc

@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <functional>
 
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "ir/param_value.h"
 #include "frontend/parallel/costmodel_context.h"
 #include "frontend/parallel/context.h"

mindspore/ccsrc/pipeline/jit/parse/data_converter.cc

@@ -28,7 +28,7 @@
 #include "pipeline/jit/parse/python_adapter.h"
 #include "frontend/operator/ops.h"
 #include "frontend/operator/composite/composite.h"
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "utils/symbolic.h"
 #include "utils/context/ms_context.h"
 #include "debug/trace.h"

mindspore/ccsrc/pipeline/jit/parse/function_block.cc

@@ -23,7 +23,7 @@
 #include "pipeline/jit/parse/resolve.h"
 #include "pipeline/jit/parse/parse.h"
 #include "frontend/operator/ops.h"
-#include "debug/info.h"
+#include "utils/info.h"
 #include "debug/trace.h"
 #include "pybind11/pybind11.h"
 

mindspore/ccsrc/pipeline/jit/pass.cc

@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <functional>
 
-#include "utils/func_graph_cloner.h"
+#include "ir/func_graph_cloner.h"
 #include "debug/anf_ir_utils.h"
 #include "pipeline/jit/parse/parse_base.h"
 #include "pipeline/jit/parse/data_converter.h"