diff --git a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc index 7280ecb7564..59f7e0f4018 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc +++ b/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 { diff --git a/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc index e6079c768f8..238d3573d0f 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc +++ b/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 { diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc index b567d41f75b..dfde9336b2b 100644 --- a/mindspore/ccsrc/backend/session/session_basic.cc +++ b/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" diff --git a/mindspore/ccsrc/debug/CMakeLists.txt b/mindspore/ccsrc/debug/CMakeLists.txt index 9ed24ec25b5..1f44c5e7082 100644 --- a/mindspore/ccsrc/debug/CMakeLists.txt +++ b/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" ) diff --git a/mindspore/ccsrc/debug/anf_ir_utils.cc b/mindspore/ccsrc/debug/anf_ir_utils.cc index 0be250878df..6c7e1b4d646 100644 --- a/mindspore/ccsrc/debug/anf_ir_utils.cc +++ b/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" diff --git a/mindspore/ccsrc/debug/draw.cc b/mindspore/ccsrc/debug/draw.cc index 6855fd8bd50..da0bd7021b0 100644 --- a/mindspore/ccsrc/debug/draw.cc +++ b/mindspore/ccsrc/debug/draw.cc @@ -23,7 +23,6 @@ #include #include -#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 diff --git a/mindspore/ccsrc/debug/trace.h b/mindspore/ccsrc/debug/trace.h index 7cf45abe30a..19add258766 100644 --- a/mindspore/ccsrc/debug/trace.h +++ b/mindspore/ccsrc/debug/trace.h @@ -23,8 +23,8 @@ #include #include -#include "debug/trace_base.h" -#include "debug/info.h" +#include "utils/trace_base.h" +#include "utils/info.h" #include "ir/anf.h" #include "ir/func_graph.h" #include "pipeline/jit/static_analysis/static_analysis.h" diff --git a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc index b9342f80498..ac792e41b0a 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc +++ b/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/func_graph_cloner.h" +#include "utils/info.h" +#include "ir/func_graph_cloner.h" #include "ir/manager.h" #include "pipeline/jit/resource.h" #include "pipeline/jit/parse/parse.h" diff --git a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h index 165d1f6c0b9..0a25d3e3969 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h +++ b/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" diff --git a/mindspore/ccsrc/frontend/optimizer/ad/grad.cc b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc index 5bc90e444f0..f8ab08acc07 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/grad.cc +++ b/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" diff --git a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc index 607b3a4e545..59b661740cb 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc +++ b/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" diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc index 6c2e9ad921b..dc580f6b633 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc @@ -21,7 +21,7 @@ #include #include "ir/func_graph.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h index 56a3c63cd85..72a6a4df9fa 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h @@ -21,7 +21,7 @@ #include #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" diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h index 407b9d8d99a..1fee007a88f 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h @@ -24,7 +24,7 @@ #include #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" diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc index 7146cd97347..89500844370 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc +++ b/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 { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h index 1bb6b552ff2..d9040044d9f 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h +++ b/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 { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h index 1872858dcc9..ccfef5bcfb2 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h +++ b/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 { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h index b033b6de2a0..9c02df6b2fb 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h @@ -24,7 +24,7 @@ #include #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" diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/inline.h b/mindspore/ccsrc/frontend/optimizer/irpass/inline.h index dabd4d8bbd9..0be228f44b9 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/inline.h +++ b/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 { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h b/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h index 899f44342e0..6cb93120288 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h +++ b/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 { diff --git a/mindspore/ccsrc/frontend/parallel/context.h b/mindspore/ccsrc/frontend/parallel/context.h index 072e32013e3..34363726411 100644 --- a/mindspore/ccsrc/frontend/parallel/context.h +++ b/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 { diff --git a/mindspore/ccsrc/pipeline/jit/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc index 3a8461d50d9..9fb3dc59d91 100644 --- a/mindspore/ccsrc/pipeline/jit/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -23,7 +23,7 @@ #include #include -#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" diff --git a/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc b/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc index 13f6b73c369..ae68bf97c79 100644 --- a/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc +++ b/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" diff --git a/mindspore/ccsrc/pipeline/jit/parse/function_block.cc b/mindspore/ccsrc/pipeline/jit/parse/function_block.cc index 52bc1e05880..e424c9c2f7b 100644 --- a/mindspore/ccsrc/pipeline/jit/parse/function_block.cc +++ b/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" diff --git a/mindspore/ccsrc/pipeline/jit/pass.cc b/mindspore/ccsrc/pipeline/jit/pass.cc index eb25728a7b2..5e669149f4f 100644 --- a/mindspore/ccsrc/pipeline/jit/pass.cc +++ b/mindspore/ccsrc/pipeline/jit/pass.cc @@ -24,7 +24,7 @@ #include #include -#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" diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc index 7db68cc56ef..eb50974e548 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc @@ -19,7 +19,7 @@ #include #include -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "abstract/utils.h" #include "debug/trace.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h index 7519eddf487..2c08ea00ef7 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h @@ -28,7 +28,7 @@ #include #include "ir/anf.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "pipeline/jit/static_analysis/evaluator.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc index 34299df00ae..da71f3996c0 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc @@ -26,7 +26,7 @@ #include "frontend/operator/ops.h" #include "utils/symbolic.h" #include "ir/tensor.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "./common.h" #include "pipeline/jit/parse/data_converter.h" #include "debug/draw.h" diff --git a/mindspore/ccsrc/utils/primitive_py.h b/mindspore/ccsrc/utils/primitive_py.h index 539dead78ba..f519b1a0806 100644 --- a/mindspore/ccsrc/utils/primitive_py.h +++ b/mindspore/ccsrc/utils/primitive_py.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CORE_IR_PRIMITIVE_PY_H_ -#define MINDSPORE_CORE_IR_PRIMITIVE_PY_H_ +#ifndef MINDSPORE_CCSRC_UTILS_PRIMITIVE_PY_H_ +#define MINDSPORE_CCSRC_UTILS_PRIMITIVE_PY_H_ #include #include @@ -77,4 +77,4 @@ class PrimitivePy : public Primitive { using PrimitivePyPtr = std::shared_ptr; } // namespace mindspore -#endif // MINDSPORE_CORE_IR_PRIMITIVE_PY_H_ +#endif // MINDSPORE_CCSRC_UTILS_PRIMITIVE_PY_H_ diff --git a/mindspore/ccsrc/utils/tensor_py.h b/mindspore/ccsrc/utils/tensor_py.h index 230fbbc75a1..0a54530487d 100644 --- a/mindspore/ccsrc/utils/tensor_py.h +++ b/mindspore/ccsrc/utils/tensor_py.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CORE_IR_TENSOR_PY_H_ -#define MINDSPORE_CORE_IR_TENSOR_PY_H_ +#ifndef MINDSPORE_CCSRC_UTILS_TENSOR_PY_H_ +#define MINDSPORE_CCSRC_UTILS_TENSOR_PY_H_ #include #include @@ -108,4 +108,4 @@ class TensorPy { } // namespace tensor } // namespace mindspore -#endif // MINDSPORE_CORE_IR_TENSOR_PY_H_ +#endif // MINDSPORE_CCSRC_UTILS_TENSOR_PY_H_ diff --git a/mindspore/ccsrc/vm/segment_runner.cc b/mindspore/ccsrc/vm/segment_runner.cc index ba27c460865..151c20a5355 100644 --- a/mindspore/ccsrc/vm/segment_runner.cc +++ b/mindspore/ccsrc/vm/segment_runner.cc @@ -30,7 +30,7 @@ #include "utils/log_adapter.h" #include "utils/utils.h" #include "ir/manager.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/vm/vmimpl.cc b/mindspore/ccsrc/vm/vmimpl.cc index 56cc9b32071..530e6ba040f 100644 --- a/mindspore/ccsrc/vm/vmimpl.cc +++ b/mindspore/ccsrc/vm/vmimpl.cc @@ -29,7 +29,7 @@ #include "ir/tensor.h" #include "frontend/operator/ops.h" #include "ir/manager.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "utils/primitive_py.h" #include "utils/convert_utils.h" #include "utils/primitive_utils.h" diff --git a/mindspore/core/abstract/analysis_context.cc b/mindspore/core/abstract/analysis_context.cc index 1ae6125838e..228ddf0f54a 100644 --- a/mindspore/core/abstract/analysis_context.cc +++ b/mindspore/core/abstract/analysis_context.cc @@ -19,7 +19,7 @@ #include #include "utils/symbolic.h" -#include "debug/trace.h" +#include "utils/trace_base.h" namespace mindspore { namespace abstract { diff --git a/mindspore/core/base/base_ref_utils.h b/mindspore/core/base/base_ref_utils.h index 7ec0628a7fe..8ced9134b67 100644 --- a/mindspore/core/base/base_ref_utils.h +++ b/mindspore/core/base/base_ref_utils.h @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#ifndef MINDSPORE_CORE_BASE_BASE_REF_UTILS_H +#define MINDSPORE_CORE_BASE_BASE_REF_UTILS_H #include #include @@ -21,9 +22,7 @@ #include "ir/tensor.h" #include "base/base_ref.h" -#ifndef MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H -#define MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H namespace mindspore { std::vector TransformVectorRefToMultiTensor(const VectorRef &base_ref); } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H +#endif // MINDSPORE_CORE_BASE_BASE_REF_UTILS_H diff --git a/mindspore/core/ir/anf.h b/mindspore/core/ir/anf.h index 82f02a55f88..4a9e16731d9 100644 --- a/mindspore/core/ir/anf.h +++ b/mindspore/core/ir/anf.h @@ -30,7 +30,7 @@ #include "base/user_data.h" #include "ir/kernel_info_dev.h" #include "ir/scope.h" -#include "debug/info.h" +#include "utils/info.h" // A MindSpore ANF IR defined here. // with BNF followed: diff --git a/mindspore/core/ir/anf_extends.cc b/mindspore/core/ir/anf_extends.cc index c50ae910342..08e4a3194ca 100644 --- a/mindspore/core/ir/anf_extends.cc +++ b/mindspore/core/ir/anf_extends.cc @@ -24,7 +24,6 @@ #include "ir/visitor.h" #include "ir/func_graph.h" #include "base/core_ops.h" -#include "debug/label.h" namespace mindspore { // namespace to support intermediate representation definition diff --git a/mindspore/core/ir/func_graph.cc b/mindspore/core/ir/func_graph.cc index c552bd64b2d..e8992fda8ab 100644 --- a/mindspore/core/ir/func_graph.cc +++ b/mindspore/core/ir/func_graph.cc @@ -22,7 +22,7 @@ #include #include -#include "debug/trace_base.h" +#include "utils/trace_base.h" #include "ir/manager.h" #include "utils/flags.h" #include "utils/ordered_set.h" diff --git a/mindspore/core/ir/func_graph.h b/mindspore/core/ir/func_graph.h index cfc6ec4163f..b8ea6f8f329 100644 --- a/mindspore/core/ir/func_graph.h +++ b/mindspore/core/ir/func_graph.h @@ -33,6 +33,7 @@ #include "utils/ordered_set.h" #include "utils/ordered_map.h" #include "base/base_ref.h" +#include "ir/func_graph_cloner.h" namespace mindspore { using BaseRefCounterMap = OrderedMap; @@ -420,8 +421,6 @@ size_t NewFgSeenGeneration(); std::shared_ptr> FindRoots(const std::vector &segment); // Find the leaf cnodes of a segment of cnodes. std::shared_ptr> FindLeaves(const std::vector &segment); - -FuncGraphPtr BasicClone(const FuncGraphPtr &func_graph); } // namespace mindspore #endif // MINDSPORE_CORE_IR_FUNC_GRAPH_H_ diff --git a/mindspore/ccsrc/utils/func_graph_cloner.cc b/mindspore/core/ir/func_graph_cloner.cc similarity index 99% rename from mindspore/ccsrc/utils/func_graph_cloner.cc rename to mindspore/core/ir/func_graph_cloner.cc index 29fab5d3d10..fa4c903270c 100644 --- a/mindspore/ccsrc/utils/func_graph_cloner.cc +++ b/mindspore/core/ir/func_graph_cloner.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include @@ -23,7 +23,6 @@ #include "base/core_ops.h" #include "utils/convert_utils_base.h" #include "utils/log_adapter.h" -#include "utils/profile.h" #include "utils/context/ms_context.h" #include "ir/graph_utils.h" diff --git a/mindspore/ccsrc/utils/func_graph_cloner.h b/mindspore/core/ir/func_graph_cloner.h similarity index 96% rename from mindspore/ccsrc/utils/func_graph_cloner.h rename to mindspore/core/ir/func_graph_cloner.h index da9773a2b76..6d75c8d13c0 100644 --- a/mindspore/ccsrc/utils/func_graph_cloner.h +++ b/mindspore/core/ir/func_graph_cloner.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ -#define MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ +#ifndef MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ +#define MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ #include #include @@ -128,6 +128,7 @@ ClonerPtr SpecializerClone(const FuncGraphPtr &func_graph, const TraceInfoPtr &r FuncGraphPtr TransformableClone(const FuncGraphPtr &func_graph, const TraceInfoPtr &relation = std::make_shared()); +FuncGraphPtr BasicClone(const FuncGraphPtr &func_graph); } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ +#endif // MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ diff --git a/mindspore/core/ir/func_graph_extends.cc b/mindspore/core/ir/func_graph_extends.cc index fad7d5413d5..ea20a1b80dc 100644 --- a/mindspore/core/ir/func_graph_extends.cc +++ b/mindspore/core/ir/func_graph_extends.cc @@ -23,9 +23,8 @@ #include "base/core_ops.h" #include "utils/ordered_set.h" #include "abstract/abstract_value.h" -#include "debug/trace.h" +#include "abstract/abstract_function.h" #include "debug/draw.h" -#include "debug/label.h" namespace mindspore { using mindspore::abstract::AbstractFunction; diff --git a/mindspore/core/ir/graph_utils.cc b/mindspore/core/ir/graph_utils.cc index a2d28cf6de9..9558560340e 100644 --- a/mindspore/core/ir/graph_utils.cc +++ b/mindspore/core/ir/graph_utils.cc @@ -28,7 +28,6 @@ #include #include -#include "debug/label.h" #include "ir/func_graph.h" #include "utils/log_adapter.h" #include "utils/context/ms_context.h" diff --git a/mindspore/core/ir/graph_utils.h b/mindspore/core/ir/graph_utils.h index 8eb75f67993..1e915db47ce 100644 --- a/mindspore/core/ir/graph_utils.h +++ b/mindspore/core/ir/graph_utils.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_GRAPH_UTILS_H_ -#define MINDSPORE_CCSRC_UTILS_GRAPH_UTILS_H_ +#ifndef MINDSPORE_CORE_IR_GRAPH_UTILS_H_ +#define MINDSPORE_CORE_IR_GRAPH_UTILS_H_ #include #include @@ -32,7 +32,7 @@ #include "ir/primitive.h" #include "ir/scalar.h" #include "ir/tensor.h" -#include "debug/label.h" +#include "utils/label.h" namespace mindspore { @@ -94,4 +94,4 @@ class FuncGraphIndex { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_GRAPH_UTILS_H_ +#endif // MINDSPORE_CORE_IR_GRAPH_UTILS_H_ diff --git a/mindspore/core/ir/graph_utils_extends.cc b/mindspore/core/ir/graph_utils_extends.cc index 647728bf0ee..e9f8f3e2d6d 100644 --- a/mindspore/core/ir/graph_utils_extends.cc +++ b/mindspore/core/ir/graph_utils_extends.cc @@ -28,7 +28,7 @@ #include "ir/visitor.h" #include "ir/manager.h" #include "ir/func_graph.h" -#include "debug/label.h" +#include "utils/label.h" #include "utils/log_adapter.h" #include "common/utils.h" diff --git a/mindspore/core/utils/any.h b/mindspore/core/utils/any.h index d5da5b2938b..20a20ed0063 100644 --- a/mindspore/core/utils/any.h +++ b/mindspore/core/utils/any.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_ANY_H_ -#define MINDSPORE_CCSRC_UTILS_ANY_H_ +#ifndef MINDSPORE_CORE_UTILS_ANY_H_ +#define MINDSPORE_CORE_UTILS_ANY_H_ #include #include @@ -211,4 +211,4 @@ bool AnyIsLiteral(const Any &any); } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_ANY_H_ +#endif // MINDSPORE_CORE_UTILS_ANY_H_ diff --git a/mindspore/core/utils/convert_utils_base.h b/mindspore/core/utils/convert_utils_base.h index b9a38f997f5..ade7c3a9678 100644 --- a/mindspore/core/utils/convert_utils_base.h +++ b/mindspore/core/utils/convert_utils_base.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_CONVERT_UTILS_BASE_H_ -#define MINDSPORE_CCSRC_UTILS_CONVERT_UTILS_BASE_H_ +#ifndef MINDSPORE_CORE_UTILS_CONVERT_UTILS_BASE_H_ +#define MINDSPORE_CORE_UTILS_CONVERT_UTILS_BASE_H_ #include #include @@ -129,4 +129,4 @@ inline uint8_t *AddressOffset(void *address, size_t offset) { } } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_CONVERT_UTILS_BASE_H_ +#endif // MINDSPORE_CORE_UTILS_CONVERT_UTILS_BASE_H_ diff --git a/mindspore/core/utils/hashing.h b/mindspore/core/utils/hashing.h index cc8cc5b9914..c0eb7531362 100644 --- a/mindspore/core/utils/hashing.h +++ b/mindspore/core/utils/hashing.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_HASHING_H_ -#define MINDSPORE_CCSRC_UTILS_HASHING_H_ +#ifndef MINDSPORE_CORE_UTILS_HASHING_H_ +#define MINDSPORE_CORE_UTILS_HASHING_H_ #include @@ -33,4 +33,4 @@ inline std::size_t hash_combine(const std::initializer_list &hash_v return hash_sum; } } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_HASHING_H_ +#endif // MINDSPORE_CORE_UTILS_HASHING_H_ diff --git a/mindspore/ccsrc/debug/info.cc b/mindspore/core/utils/info.cc similarity index 99% rename from mindspore/ccsrc/debug/info.cc rename to mindspore/core/utils/info.cc index f58522cf330..06aa1e2de85 100644 --- a/mindspore/ccsrc/debug/info.cc +++ b/mindspore/core/utils/info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "debug/info.h" +#include "utils/info.h" #include #include #include diff --git a/mindspore/ccsrc/debug/info.h b/mindspore/core/utils/info.h similarity index 98% rename from mindspore/ccsrc/debug/info.h rename to mindspore/core/utils/info.h index a08a69a9dd0..4ab0ad8a284 100644 --- a/mindspore/ccsrc/debug/info.h +++ b/mindspore/core/utils/info.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_IR_INFO_H_ -#define MINDSPORE_CCSRC_IR_INFO_H_ +#ifndef MINDSPORE_CORE_UTILS_INFO_H_ +#define MINDSPORE_CORE_UTILS_INFO_H_ #include #include @@ -25,7 +25,7 @@ #include #include "base/base.h" -#include "debug/trace_info.h" +#include "utils/trace_info.h" namespace mindspore { // namespace to support intermediate representation definition @@ -232,4 +232,4 @@ class GraphDebugInfo : public DebugInfo { using GraphDebugInfoPtr = std::shared_ptr; } // namespace mindspore -#endif // MINDSPORE_CCSRC_IR_INFO_H_ +#endif // MINDSPORE_CORE_UTILS_INFO_H_ diff --git a/mindspore/ccsrc/debug/label.cc b/mindspore/core/utils/label.cc similarity index 98% rename from mindspore/ccsrc/debug/label.cc rename to mindspore/core/utils/label.cc index d8c4986482b..ef4ce9ee3cb 100644 --- a/mindspore/ccsrc/debug/label.cc +++ b/mindspore/core/utils/label.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "debug/label.h" +#include "utils/label.h" #include #include #include -#include "debug/info.h" +#include "utils/info.h" #include "ir/func_graph.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/label.h b/mindspore/core/utils/label.h similarity index 100% rename from mindspore/ccsrc/debug/label.h rename to mindspore/core/utils/label.h diff --git a/mindspore/core/utils/log_adapter.h b/mindspore/core/utils/log_adapter.h index 96906fbcdab..d354f96e68d 100644 --- a/mindspore/core/utils/log_adapter.h +++ b/mindspore/core/utils/log_adapter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_LOG_ADAPTER_H_ -#define MINDSPORE_CCSRC_UTILS_LOG_ADAPTER_H_ +#ifndef MINDSPORE_CORE_UTILS_LOG_ADAPTER_H_ +#define MINDSPORE_CORE_UTILS_LOG_ADAPTER_H_ #include #include @@ -201,4 +201,4 @@ class LogWriter { #define MS_ASSERT(f) ((void)0) #endif -#endif // MINDSPORE_CCSRC_UTILS_LOG_ADAPTER_H_ +#endif // MINDSPORE_CORE_UTILS_LOG_ADAPTER_H_ diff --git a/mindspore/core/utils/misc.h b/mindspore/core/utils/misc.h index be83b2999ce..9fae5abbcf5 100644 --- a/mindspore/core/utils/misc.h +++ b/mindspore/core/utils/misc.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_MISC_H_ -#define MINDSPORE_CCSRC_UTILS_MISC_H_ +#ifndef MINDSPORE_CORE_UTILS_MISC_H_ +#define MINDSPORE_CORE_UTILS_MISC_H_ #include #include @@ -35,4 +35,4 @@ extern const int RET_BREAK; extern std::string demangle(const char *name); } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_MISC_H_ +#endif // MINDSPORE_CORE_UTILS_MISC_H_ diff --git a/mindspore/core/utils/ordered_map.h b/mindspore/core/utils/ordered_map.h index 50be0971280..1152990e461 100644 --- a/mindspore/core/utils/ordered_map.h +++ b/mindspore/core/utils/ordered_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_ORDERED_MAP_H_ -#define MINDSPORE_CCSRC_UTILS_ORDERED_MAP_H_ +#ifndef MINDSPORE_CORE_UTILS_ORDERED_MAP_H_ +#define MINDSPORE_CORE_UTILS_ORDERED_MAP_H_ #include #include @@ -198,4 +198,4 @@ class OrderedMap { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_ORDERED_MAP_H_ +#endif // MINDSPORE_CORE_UTILS_ORDERED_MAP_H_ diff --git a/mindspore/core/utils/ordered_set.h b/mindspore/core/utils/ordered_set.h index 8d2f7af15c3..ee3aef46f38 100644 --- a/mindspore/core/utils/ordered_set.h +++ b/mindspore/core/utils/ordered_set.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_ORDERED_SET_H_ -#define MINDSPORE_CCSRC_UTILS_ORDERED_SET_H_ +#ifndef MINDSPORE_CORE_UTILS_ORDERED_SET_H_ +#define MINDSPORE_CORE_UTILS_ORDERED_SET_H_ #include #include @@ -280,4 +280,4 @@ class OrderedSet { } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_ORDERED_SET_H_ +#endif // MINDSPORE_CORE_UTILS_ORDERED_SET_H_ diff --git a/mindspore/core/utils/overload.h b/mindspore/core/utils/overload.h index be3a42b77b8..baeb1346977 100644 --- a/mindspore/core/utils/overload.h +++ b/mindspore/core/utils/overload.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_OVERLOAD_H_ -#define MINDSPORE_CCSRC_UTILS_OVERLOAD_H_ +#ifndef MINDSPORE_CORE_UTILS_OVERLOAD_H_ +#define MINDSPORE_CORE_UTILS_OVERLOAD_H_ #include #include @@ -135,4 +135,4 @@ std::string ToString(const std::map &map) { } } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_OVERLOAD_H_ +#endif // MINDSPORE_CORE_UTILS_OVERLOAD_H_ diff --git a/mindspore/core/utils/signal.h b/mindspore/core/utils/signal.h index 9a43e23814d..a47e54b1173 100644 --- a/mindspore/core/utils/signal.h +++ b/mindspore/core/utils/signal.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_SIGNAL_H_ -#define MINDSPORE_CCSRC_UTILS_SIGNAL_H_ +#ifndef MINDSPORE_CORE_UTILS_SIGNAL_H_ +#define MINDSPORE_CORE_UTILS_SIGNAL_H_ #include #include @@ -66,4 +66,4 @@ class Signal { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_EVENT_H_ +#endif // MINDSPORE_CORE_UTILS_EVENT_H_ diff --git a/mindspore/core/utils/symbolic.h b/mindspore/core/utils/symbolic.h index 7ac04530915..903d25794ea 100644 --- a/mindspore/core/utils/symbolic.h +++ b/mindspore/core/utils/symbolic.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_SYMBOLIC_H_ -#define MINDSPORE_CCSRC_UTILS_SYMBOLIC_H_ +#ifndef MINDSPORE_CORE_UTILS_SYMBOLIC_H_ +#define MINDSPORE_CORE_UTILS_SYMBOLIC_H_ #include #include @@ -171,4 +171,4 @@ extern std::shared_ptr newenv; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_SYMBOLIC_H_ +#endif // MINDSPORE_CORE_UTILS_SYMBOLIC_H_ diff --git a/mindspore/ccsrc/debug/trace_base.cc b/mindspore/core/utils/trace_base.cc similarity index 99% rename from mindspore/ccsrc/debug/trace_base.cc rename to mindspore/core/utils/trace_base.cc index b2f591a3283..aa9fde6f5bd 100644 --- a/mindspore/ccsrc/debug/trace_base.cc +++ b/mindspore/core/utils/trace_base.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "debug/trace_base.h" +#include "utils/trace_base.h" #include #include diff --git a/mindspore/ccsrc/debug/trace_base.h b/mindspore/core/utils/trace_base.h similarity index 87% rename from mindspore/ccsrc/debug/trace_base.h rename to mindspore/core/utils/trace_base.h index 774931cc09f..0807789faac 100644 --- a/mindspore/ccsrc/debug/trace_base.h +++ b/mindspore/core/utils/trace_base.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_DEBUG_TRACE_BASE_H_ -#define MINDSPORE_CCSRC_DEBUG_TRACE_BASE_H_ +#ifndef MINDSPORE_CORE_UTILS_TRACE_BASE_H_ +#define MINDSPORE_CORE_UTILS_TRACE_BASE_H_ #include #include @@ -23,7 +23,7 @@ #include #include -#include "debug/info.h" +#include "utils/info.h" #include "ir/anf.h" #include "ir/func_graph.h" #include "utils/any.h" @@ -36,4 +36,4 @@ std::string GetDebugInfo(const DebugInfoPtr &info, const std::string &prefix, } // namespace trace } // namespace mindspore -#endif // MINDSPORE_CCSRC_DEBUG_TRACE_BASE_H_ +#endif // MINDSPORE_CORE_UTILS_TRACE_BASE_H_ diff --git a/mindspore/ccsrc/debug/trace_info.cc b/mindspore/core/utils/trace_info.cc similarity index 97% rename from mindspore/ccsrc/debug/trace_info.cc rename to mindspore/core/utils/trace_info.cc index 048bf2bdf07..26bcb8e7ce4 100644 --- a/mindspore/ccsrc/debug/trace_info.cc +++ b/mindspore/core/utils/trace_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "debug/trace_info.h" +#include "utils/trace_info.h" #include #include #include diff --git a/mindspore/ccsrc/debug/trace_info.h b/mindspore/core/utils/trace_info.h similarity index 99% rename from mindspore/ccsrc/debug/trace_info.h rename to mindspore/core/utils/trace_info.h index 62908cb449e..fea2cb3ea89 100644 --- a/mindspore/ccsrc/debug/trace_info.h +++ b/mindspore/core/utils/trace_info.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_DEBUG_TRACE_INFO_H_ -#define MINDSPORE_CCSRC_DEBUG_TRACE_INFO_H_ +#ifndef MINDSPORE_CORE_UTILS_TRACE_INFO_H_ +#define MINDSPORE_CORE_UTILS_TRACE_INFO_H_ #include #include @@ -414,4 +414,4 @@ class TraceCombileLikeGraphs : public TraceInfo { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_DEBUG_TRACE_INFO_H_ +#endif // MINDSPORE_CORE_UTILS_TRACE_INFO_H_ diff --git a/mindspore/core/utils/visible.h b/mindspore/core/utils/visible.h index 96395230f93..b206876d3ef 100644 --- a/mindspore/core/utils/visible.h +++ b/mindspore/core/utils/visible.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_VISIBLE_H_ -#define MINDSPORE_CCSRC_UTILS_VISIBLE_H_ +#ifndef MINDSPORE_CORE_UTILS_VISIBLE_H_ +#define MINDSPORE_CORE_UTILS_VISIBLE_H_ namespace mindspore { // refer to https://gcc.gnu.org/wiki/Visibility @@ -41,4 +41,4 @@ namespace mindspore { } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_VISIBLE_H_ +#endif // MINDSPORE_CORE_UTILS_VISIBLE_H_ diff --git a/tests/ut/cpp/ir/clone_test.cc b/tests/ut/cpp/ir/clone_test.cc index ac32cc7f39d..1929cf599e8 100644 --- a/tests/ut/cpp/ir/clone_test.cc +++ b/tests/ut/cpp/ir/clone_test.cc @@ -20,7 +20,7 @@ #include "ir/manager.h" #include "utils/log_adapter.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" #include "ir/graph_utils.h" #include "debug/draw.h" diff --git a/tests/ut/cpp/ir/manager_test.cc b/tests/ut/cpp/ir/manager_test.cc index 3284a1e06f2..060151109d4 100644 --- a/tests/ut/cpp/ir/manager_test.cc +++ b/tests/ut/cpp/ir/manager_test.cc @@ -17,12 +17,12 @@ #include "common/py_func_graph_fetcher.h" #include "ir/dtype.h" #include "ir/manager.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" #include "frontend/operator/ops.h" #include "utils/log_adapter.h" #include "debug/draw.h" -#include "debug/label.h" +#include "utils/label.h" #include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/optimizer/ad/ad_test.cc b/tests/ut/cpp/optimizer/ad/ad_test.cc index effc3d3b1af..0cd1f1d705e 100644 --- a/tests/ut/cpp/optimizer/ad/ad_test.cc +++ b/tests/ut/cpp/optimizer/ad/ad_test.cc @@ -21,7 +21,7 @@ #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" #include "ir/value.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "utils/log_adapter.h" #include "ir/graph_utils.h" #include "pipeline/jit/resource.h" diff --git a/tests/ut/cpp/optimizer/cconv_test.cc b/tests/ut/cpp/optimizer/cconv_test.cc index d98905955f6..c0044090580 100644 --- a/tests/ut/cpp/optimizer/cconv_test.cc +++ b/tests/ut/cpp/optimizer/cconv_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "utils/log_adapter.h" #include "pipeline/jit/parse/parse.h" #include "debug/draw.h" diff --git a/tests/ut/cpp/optimizer/lib_test.cc b/tests/ut/cpp/optimizer/lib_test.cc index 84bc0d8b75d..48865a10d24 100644 --- a/tests/ut/cpp/optimizer/lib_test.cc +++ b/tests/ut/cpp/optimizer/lib_test.cc @@ -21,7 +21,7 @@ #include "common/py_func_graph_fetcher.h" #include "ir/anf.h" #include "ir/func_graph.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "ir/manager.h" #include "ir/value.h" #include "frontend/operator/ops.h" diff --git a/tests/ut/cpp/optimizer/opt_test.cc b/tests/ut/cpp/optimizer/opt_test.cc index d5eaf98eabd..df1996d3e5d 100644 --- a/tests/ut/cpp/optimizer/opt_test.cc +++ b/tests/ut/cpp/optimizer/opt_test.cc @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "ir/visitor.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "frontend/optimizer/opt.h" #include "frontend/optimizer/anf_visitor.h" #include "frontend/optimizer/irpass.h" diff --git a/tests/ut/cpp/vm/segment_runner_test.cc b/tests/ut/cpp/vm/segment_runner_test.cc index 3b9d5d52daf..22d3e6857d5 100644 --- a/tests/ut/cpp/vm/segment_runner_test.cc +++ b/tests/ut/cpp/vm/segment_runner_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" #include "utils/log_adapter.h" -#include "utils/func_graph_cloner.h" +#include "ir/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" #include "ir/graph_utils.h" #include "pipeline/jit/resource.h"