From f4bc0bc9fec81ea6597b5a2f40c0edc4ce40c43e Mon Sep 17 00:00:00 2001 From: liubuyu Date: Tue, 21 Jul 2020 08:27:44 +0800 Subject: [PATCH] move the dependency of utils to core --- include/infer_log.h | 2 +- mindspore/ccsrc/CMakeLists.txt | 4 ++- .../kernel_compiler/akg/akg_kernel_build.h | 1 + .../backend/kernel_compiler/common_utils.cc | 2 +- .../backend/kernel_compiler/oplib/oplib.h | 1 + .../ccsrc/backend/optimizer/common/helper.cc | 2 +- .../backend/optimizer/common/optimizer.h | 2 +- .../backend/optimizer/common/pattern_engine.h | 2 +- .../ccsrc/backend/optimizer/common/visit.h | 2 +- .../optimizer/pass/add_atomic_clean.cc | 2 +- .../optimizer/pass/communication_op_fusion.cc | 2 +- .../convert_const_input_to_tensor_input.cc | 2 +- .../convert_const_input_to_tensor_input.h | 1 + .../pass/convert_const_scalar_to_tensor.cc | 3 +- .../backend/optimizer/pass/fuse_basic.cc | 4 +-- .../optimizer/pass/fuse_graph_kernel.cc | 4 +-- .../backend/session/ascend_control_parser.h | 2 +- .../ccsrc/backend/session/infer_session.cc | 2 +- .../ccsrc/backend/session/kernel_graph.h | 2 +- .../ccsrc/backend/session/session_basic.cc | 2 +- mindspore/ccsrc/debug/anf_ir_dump.cc | 2 +- mindspore/ccsrc/debug/anf_ir_utils.cc | 4 +-- .../ccsrc/debug/debugger/proto_exporter.cc | 2 +- mindspore/ccsrc/debug/draw.cc | 2 +- mindspore/ccsrc/debug/dump_proto.cc | 2 +- mindspore/ccsrc/debug/info.h | 5 ---- mindspore/ccsrc/debug/trace.cc | 2 +- mindspore/ccsrc/debug/trace_base.cc | 2 +- .../frontend/operator/prim_structures.cc | 2 +- .../ccsrc/frontend/optimizer/ad/dfunctor.cc | 2 +- .../ccsrc/frontend/optimizer/ad/dfunctor.h | 2 +- mindspore/ccsrc/frontend/optimizer/ad/grad.cc | 4 +-- .../ccsrc/frontend/optimizer/ad/kprim.cc | 4 +-- .../frontend/optimizer/graph_kernel_reuse.cc | 2 +- .../optimizer/irpass/branch_culling.cc | 2 +- .../optimizer/irpass/branch_culling.h | 2 +- .../optimizer/irpass/env_item_eliminate.h | 2 +- .../optimizer/irpass/grad_var_prepare.cc | 2 +- .../optimizer/irpass/grad_var_prepare.h | 2 +- .../optimizer/irpass/incorporate_call.h | 2 +- .../optimizer/irpass/incorporate_getitem.h | 2 +- .../ccsrc/frontend/optimizer/irpass/inline.h | 2 +- .../optimizer/irpass/mark_interface_fusion.h | 2 +- .../optimizer/irpass/specialize_transform.h | 2 +- .../frontend/optimizer/py_pass_manager.h | 4 +-- .../parallel/graph_util/graph_info.cc | 2 +- mindspore/ccsrc/pipeline/jit/action.cc | 2 +- .../pipeline/jit/parse/data_converter.cc | 2 +- mindspore/ccsrc/pipeline/jit/pass.cc | 2 +- mindspore/ccsrc/pipeline/jit/resource.cc | 2 +- .../pipeline/jit/static_analysis/evaluator.cc | 2 +- .../jit/static_analysis/program_specialize.cc | 2 +- .../jit/static_analysis/program_specialize.h | 2 +- .../jit/static_analysis/static_analysis.cc | 2 +- .../jit/static_analysis/static_analysis.h | 2 +- mindspore/ccsrc/pipeline/pynative/base.h | 2 +- .../pipeline/pynative/pynative_execute.cc | 2 +- .../pipeline/pynative/pynative_execute_ge.cc | 2 +- mindspore/ccsrc/pybind_api/export_flags.cc | 10 ------- mindspore/ccsrc/pybind_api/export_flags.h | 9 +----- .../ccsrc/runtime/device/kernel_runtime.h | 1 + mindspore/ccsrc/transform/graph_ir/convert.cc | 2 +- mindspore/{core/ir => ccsrc/utils}/anf_py.cc | 0 mindspore/ccsrc/utils/base_ref_extends.h | 2 +- mindspore/ccsrc/utils/convert_utils.h | 2 +- .../{core/ir => ccsrc/utils}/dtype_py.cc | 2 +- .../ir => ccsrc/utils}/func_graph_cloner.cc | 6 ++-- .../ir => ccsrc/utils}/func_graph_cloner.h | 8 ++---- .../{core/ir => ccsrc/utils}/func_graph_py.cc | 0 .../ir => ccsrc/utils}/param_value_py.cc | 0 .../{core/ir => ccsrc/utils}/primitive_py.cc | 3 +- .../{core/ir => ccsrc/utils}/primitive_py.h | 0 mindspore/ccsrc/utils/primitive_utils.h | 3 +- .../{core/ir => ccsrc/utils}/signature_py.cc | 0 .../{core/ir => ccsrc/utils}/tensor_py.cc | 2 +- .../{core/ir => ccsrc/utils}/tensor_py.h | 0 mindspore/ccsrc/utils/tensorprint_utils.cc | 3 ++ .../{core/ir => ccsrc/utils}/value_py.cc | 0 mindspore/ccsrc/vm/segment_runner.cc | 2 +- mindspore/ccsrc/vm/transform.cc | 2 +- mindspore/ccsrc/vm/vmimpl.cc | 4 +-- mindspore/core/abstract/abstract_value.h | 1 + mindspore/core/abstract/utils.h | 1 - mindspore/core/base/base.h | 5 ++++ .../{ccsrc/utils => core/base}/base_ref.cc | 2 +- .../{ccsrc/utils => core/base}/base_ref.h | 6 ++-- .../utils => core/base}/base_ref_utils.cc | 6 ++-- .../utils => core/base}/base_ref_utils.h | 4 ++- mindspore/core/ir/func_graph.cc | 3 +- mindspore/core/ir/func_graph.h | 4 ++- mindspore/core/ir/func_graph_extends.cc | 3 -- .../{ccsrc/utils => core/ir}/graph_utils.cc | 4 +-- .../{ccsrc/utils => core/ir}/graph_utils.h | 0 .../utils => core/ir}/graph_utils_extends.cc | 4 +-- mindspore/core/ir/manager.cc | 3 -- mindspore/core/ir/manager.h | 4 +-- mindspore/core/ir/meta_tensor.h | 2 +- mindspore/core/utils/CMakeLists.txt | 3 ++ mindspore/{ccsrc => core}/utils/any.cc | 0 mindspore/{ccsrc => core}/utils/any.h | 0 .../utils/convert_utils_base.h | 0 mindspore/{ccsrc => core}/utils/counter.h | 6 ++-- mindspore/core/utils/flags.cc | 26 +++++++++++++++++ mindspore/core/utils/flags.h | 28 +++++++++++++++++++ mindspore/{ccsrc => core}/utils/hashing.h | 0 .../{ccsrc => core}/utils/log_adapter.cc | 0 mindspore/{ccsrc => core}/utils/log_adapter.h | 4 +-- mindspore/{ccsrc => core}/utils/misc.cc | 1 - mindspore/{ccsrc => core}/utils/misc.h | 1 - mindspore/{ccsrc => core}/utils/ordered_map.h | 0 mindspore/{ccsrc => core}/utils/ordered_set.h | 0 mindspore/{ccsrc => core}/utils/overload.h | 2 -- mindspore/{ccsrc => core}/utils/signal.h | 0 mindspore/{ccsrc => core}/utils/symbolic.cc | 0 mindspore/{ccsrc => core}/utils/symbolic.h | 1 - mindspore/{ccsrc => core}/utils/visible.h | 0 tests/ut/cpp/CMakeLists.txt | 1 + tests/ut/cpp/ir/clone_test.cc | 4 +-- tests/ut/cpp/ir/manager_test.cc | 2 +- tests/ut/cpp/ir/meta_tensor_test.cc | 2 +- tests/ut/cpp/operator/ops_test.cc | 2 +- tests/ut/cpp/optimizer/ad/ad_test.cc | 4 +-- tests/ut/cpp/optimizer/cconv_test.cc | 2 +- tests/ut/cpp/optimizer/lib_test.cc | 2 +- tests/ut/cpp/optimizer/opt_test.cc | 3 +- .../static_analysis/specialize_test.cc | 2 +- .../common/pattern_engine_test.cc | 2 +- tests/ut/cpp/transform/graph_runner_test.cc | 2 +- tests/ut/cpp/transform/transform_base_test.cc | 2 +- tests/ut/cpp/utils/baseref_test.cc | 2 +- tests/ut/cpp/utils/graph_utils_test.cc | 4 +-- tests/ut/cpp/vm/segment_runner_test.cc | 4 +-- 132 files changed, 198 insertions(+), 158 deletions(-) rename mindspore/{core/ir => ccsrc/utils}/anf_py.cc (100%) rename mindspore/{core/ir => ccsrc/utils}/dtype_py.cc (99%) rename mindspore/{core/ir => ccsrc/utils}/func_graph_cloner.cc (99%) rename mindspore/{core/ir => ccsrc/utils}/func_graph_cloner.h (96%) rename mindspore/{core/ir => ccsrc/utils}/func_graph_py.cc (100%) rename mindspore/{core/ir => ccsrc/utils}/param_value_py.cc (100%) rename mindspore/{core/ir => ccsrc/utils}/primitive_py.cc (99%) rename mindspore/{core/ir => ccsrc/utils}/primitive_py.h (100%) rename mindspore/{core/ir => ccsrc/utils}/signature_py.cc (100%) rename mindspore/{core/ir => ccsrc/utils}/tensor_py.cc (99%) rename mindspore/{core/ir => ccsrc/utils}/tensor_py.h (100%) rename mindspore/{core/ir => ccsrc/utils}/value_py.cc (100%) rename mindspore/{ccsrc/utils => core/base}/base_ref.cc (99%) rename mindspore/{ccsrc/utils => core/base}/base_ref.h (98%) rename mindspore/{ccsrc/utils => core/base}/base_ref_utils.cc (98%) rename mindspore/{ccsrc/utils => core/base}/base_ref_utils.h (97%) rename mindspore/{ccsrc/utils => core/ir}/graph_utils.cc (99%) rename mindspore/{ccsrc/utils => core/ir}/graph_utils.h (100%) rename mindspore/{ccsrc/utils => core/ir}/graph_utils_extends.cc (97%) create mode 100644 mindspore/core/utils/CMakeLists.txt rename mindspore/{ccsrc => core}/utils/any.cc (100%) rename mindspore/{ccsrc => core}/utils/any.h (100%) rename mindspore/{ccsrc => core}/utils/convert_utils_base.h (100%) rename mindspore/{ccsrc => core}/utils/counter.h (95%) create mode 100644 mindspore/core/utils/flags.cc create mode 100644 mindspore/core/utils/flags.h rename mindspore/{ccsrc => core}/utils/hashing.h (100%) rename mindspore/{ccsrc => core}/utils/log_adapter.cc (100%) rename mindspore/{ccsrc => core}/utils/log_adapter.h (98%) rename mindspore/{ccsrc => core}/utils/misc.cc (99%) rename mindspore/{ccsrc => core}/utils/misc.h (99%) rename mindspore/{ccsrc => core}/utils/ordered_map.h (100%) rename mindspore/{ccsrc => core}/utils/ordered_set.h (100%) rename mindspore/{ccsrc => core}/utils/overload.h (99%) rename mindspore/{ccsrc => core}/utils/signal.h (100%) rename mindspore/{ccsrc => core}/utils/symbolic.cc (100%) rename mindspore/{ccsrc => core}/utils/symbolic.h (99%) rename mindspore/{ccsrc => core}/utils/visible.h (100%) diff --git a/include/infer_log.h b/include/infer_log.h index e3607e5500..541b6fdd26 100644 --- a/include/infer_log.h +++ b/include/infer_log.h @@ -25,7 +25,7 @@ #include #ifndef ENABLE_ACL -#include "mindspore/ccsrc/utils/log_adapter.h" +#include "mindspore/core/utils/log_adapter.h" namespace mindspore::inference { #define MSI_LOG(level) MS_LOG(level) diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 04cc9f092d..d2d19ec0af 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -154,9 +154,11 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/base base) list(APPEND SUB_OBJECTS_SRC $) add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/abstract abstract) list(APPEND SUB_OBJECTS_SRC $) +add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/utils util) +list(APPEND SUB_OBJECTS_SRC $) add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/ir ir) list(APPEND SUB_OBJECTS_SRC $) -add_dependencies(_mindspore_base_obj _mindspore_ir_obj _mindspore_abstract_obj proto_input flat_input) +add_dependencies(_mindspore_core_utils_obj _mindspore_base_obj _mindspore_ir_obj _mindspore_abstract_obj proto_input flat_input) set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME) add_library(mindspore STATIC ${SUB_OBJECTS_SRC}) diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h index 3ba6e3303f..41073007bc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h @@ -24,6 +24,7 @@ #include #include "backend/kernel_compiler/kernel.h" #include "ir/dtype.h" +#include "ir/primitive.h" #include #include "backend/kernel_compiler/common_utils.h" #include "backend/kernel_compiler/oplib/oplib.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc index ef2f75ee6e..1e029f9891 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc @@ -29,7 +29,7 @@ #include "ir/meta_tensor.h" #include "ir/func_graph.h" #include "frontend/operator/ops.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h index 832f365c39..ed647be342 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h @@ -20,6 +20,7 @@ #include #include #include +#include "common/utils.h" #include "backend/kernel_compiler/oplib/opinfo.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.cc b/mindspore/ccsrc/backend/optimizer/common/helper.cc index 577cec3a59..695e180099 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.cc +++ b/mindspore/ccsrc/backend/optimizer/common/helper.cc @@ -23,7 +23,7 @@ #include #include #include "utils/utils.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/optimizer.h b/mindspore/ccsrc/backend/optimizer/common/optimizer.h index 34d65c3047..86822e3549 100644 --- a/mindspore/ccsrc/backend/optimizer/common/optimizer.h +++ b/mindspore/ccsrc/backend/optimizer/common/optimizer.h @@ -26,7 +26,7 @@ #include "ir/primitive.h" #include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/common/pattern_engine.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "common/utils.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h index 55f00241bc..e461916c05 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h +++ b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h @@ -36,7 +36,7 @@ #include "backend/optimizer/common/visit.h" #include "base/base.h" #include "utils/log_adapter.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" namespace mindspore { class CondVar; diff --git a/mindspore/ccsrc/backend/optimizer/common/visit.h b/mindspore/ccsrc/backend/optimizer/common/visit.h index 21158a5b9f..53316f714b 100644 --- a/mindspore/ccsrc/backend/optimizer/common/visit.h +++ b/mindspore/ccsrc/backend/optimizer/common/visit.h @@ -27,7 +27,7 @@ #include #include "base/base.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" // namespace to support utils definition namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc index 900dd0d563..1bdf464d26 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc @@ -20,7 +20,7 @@ #include #include "frontend/operator/ops.h" #include "utils/utils.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/log_adapter.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/kernel_graph.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc index eafb2bb59d..8c2aaa85dd 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc @@ -19,7 +19,7 @@ #include #include -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "frontend/operator/ops.h" #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc index d15205f790..c4e3f38bef 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc @@ -19,7 +19,7 @@ #include #include -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/kernel_graph.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h index eb714f796e..b2854ba300 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h @@ -18,6 +18,7 @@ #include #include "ir/anf.h" +#include "utils/convert_utils.h" #include "backend/optimizer/common/optimizer.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc index a8c2bbdf22..61825854bc 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc @@ -19,7 +19,8 @@ #include #include -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" +#include "utils/convert_utils.h" #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/kernel_graph.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc index 32655f1ec2..7280ecb756 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc @@ -26,13 +26,13 @@ #include "frontend/operator/ops.h" #include "utils/utils.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" #include "vm/segment_runner.h" #include "debug/draw.h" #include "debug/anf_ir_dump.h" -#include "ir/func_graph_cloner.h" +#include "utils/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 e04110d8a0..e6079c768f 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc @@ -27,13 +27,13 @@ #include "frontend/operator/ops.h" #include "utils/utils.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" #include "vm/segment_runner.h" #include "debug/draw.h" #include "debug/anf_ir_dump.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/session/ascend_control_parser.h b/mindspore/ccsrc/backend/session/ascend_control_parser.h index 193e4ee688..3c370fa500 100644 --- a/mindspore/ccsrc/backend/session/ascend_control_parser.h +++ b/mindspore/ccsrc/backend/session/ascend_control_parser.h @@ -23,7 +23,7 @@ #include #include #include "backend/session/kernel_graph.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" #include "utils/contract.h" #include "utils/union_find_set.h" diff --git a/mindspore/ccsrc/backend/session/infer_session.cc b/mindspore/ccsrc/backend/session/infer_session.cc index 0eef030565..5de815b8f7 100644 --- a/mindspore/ccsrc/backend/session/infer_session.cc +++ b/mindspore/ccsrc/backend/session/infer_session.cc @@ -21,7 +21,7 @@ #include "utils/load_onnx/anf_converter.h" #include "backend/session/session_basic.h" #include "backend/session/session_factory.h" -#include "utils/base_ref_utils.h" +#include "base/base_ref_utils.h" #include "backend/kernel_compiler/oplib/oplib.h" #ifdef ENABLE_D diff --git a/mindspore/ccsrc/backend/session/kernel_graph.h b/mindspore/ccsrc/backend/session/kernel_graph.h index 1576a4c31d..25cea907fb 100644 --- a/mindspore/ccsrc/backend/session/kernel_graph.h +++ b/mindspore/ccsrc/backend/session/kernel_graph.h @@ -27,7 +27,7 @@ #include #include "ir/func_graph.h" #include "ir/anf.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/contract.h" #include "runtime/device/kernel_info.h" diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc index d0cf4cee8c..0a76806690 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 "ir/func_graph_cloner.h" +#include "utils/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/anf_ir_dump.cc b/mindspore/ccsrc/debug/anf_ir_dump.cc index 563000cd1f..75e7df1882 100644 --- a/mindspore/ccsrc/debug/anf_ir_dump.cc +++ b/mindspore/ccsrc/debug/anf_ir_dump.cc @@ -25,7 +25,7 @@ #include "ir/primitive.h" #include "ir/func_graph.h" #include "runtime/device/kernel_info.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/debug/anf_ir_utils.cc b/mindspore/ccsrc/debug/anf_ir_utils.cc index 580f243ebe..0be250878d 100644 --- a/mindspore/ccsrc/debug/anf_ir_utils.cc +++ b/mindspore/ccsrc/debug/anf_ir_utils.cc @@ -23,11 +23,11 @@ #include #include -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/symbolic.h" #include "ir/meta_func_graph.h" #include "ir/param_value.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" #include "pipeline/jit/parse/python_adapter.h" #include "pipeline/jit/parse/resolve.h" #include "frontend/operator/composite/composite.h" diff --git a/mindspore/ccsrc/debug/debugger/proto_exporter.cc b/mindspore/ccsrc/debug/debugger/proto_exporter.cc index b4b4de9d99..35e7d906ed 100644 --- a/mindspore/ccsrc/debug/debugger/proto_exporter.cc +++ b/mindspore/ccsrc/debug/debugger/proto_exporter.cc @@ -24,7 +24,7 @@ #include "debug/debugger/debugger.h" #include "proto/debug_graph.pb.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/draw.cc b/mindspore/ccsrc/debug/draw.cc index 6e42277d4e..eee5394dad 100644 --- a/mindspore/ccsrc/debug/draw.cc +++ b/mindspore/ccsrc/debug/draw.cc @@ -27,7 +27,7 @@ #include "ir/meta_func_graph.h" #include "ir/param_value.h" #include "ir/primitive.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/utils.h" #include "frontend/operator/composite/composite.h" #include "ir/tensor.h" diff --git a/mindspore/ccsrc/debug/dump_proto.cc b/mindspore/ccsrc/debug/dump_proto.cc index 9172d11471..df8b9bb888 100644 --- a/mindspore/ccsrc/debug/dump_proto.cc +++ b/mindspore/ccsrc/debug/dump_proto.cc @@ -24,7 +24,7 @@ #include "debug/anf_ir_utils.h" #include "proto/anf_ir.pb.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/info.h b/mindspore/ccsrc/debug/info.h index 39475a4606..a08a69a9dd 100644 --- a/mindspore/ccsrc/debug/info.h +++ b/mindspore/ccsrc/debug/info.h @@ -63,11 +63,6 @@ class Location { }; class TraceContext; using TraceContextPtr = std::shared_ptr; -class FuncGraph; -using FuncGraphPtr = std::shared_ptr; -using FuncGraphWeakPtr = std::weak_ptr; -class AnfNode; -using AnfNodeWeakPtr = std::weak_ptr; class TraceManager { public: diff --git a/mindspore/ccsrc/debug/trace.cc b/mindspore/ccsrc/debug/trace.cc index b8d3f0a7c7..7ceb368290 100644 --- a/mindspore/ccsrc/debug/trace.cc +++ b/mindspore/ccsrc/debug/trace.cc @@ -28,7 +28,7 @@ #include #include "ir/meta_func_graph.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "frontend/operator/composite/composite.h" #include "ir/tensor.h" #include "debug/anf_ir_utils.h" diff --git a/mindspore/ccsrc/debug/trace_base.cc b/mindspore/ccsrc/debug/trace_base.cc index 6cd41d7f2d..b2f591a328 100644 --- a/mindspore/ccsrc/debug/trace_base.cc +++ b/mindspore/ccsrc/debug/trace_base.cc @@ -27,7 +27,7 @@ #include #include -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" namespace mindspore { // namespace to support debug trace infomation diff --git a/mindspore/ccsrc/frontend/operator/prim_structures.cc b/mindspore/ccsrc/frontend/operator/prim_structures.cc index b602b07a0c..1d1e6376d0 100644 --- a/mindspore/ccsrc/frontend/operator/prim_structures.cc +++ b/mindspore/ccsrc/frontend/operator/prim_structures.cc @@ -21,7 +21,7 @@ #include "abstract/param_validator.h" #include "frontend/operator/ops.h" #include "utils/convert_utils.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" using mindspore::tensor::TensorPy; diff --git a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc index 681bd90eb1..b9342f8049 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc @@ -23,7 +23,7 @@ #include "ir/anf.h" #include "ir/meta_func_graph.h" #include "debug/info.h" -#include "ir/func_graph_cloner.h" +#include "utils/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 0a25d3e396..165d1f6c0b 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 "ir/func_graph_cloner.h" +#include "utils/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 ef2d7d400a..5bc90e444f 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/grad.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc @@ -16,10 +16,10 @@ #include "frontend/optimizer/ad/grad.h" #include "frontend/optimizer/ad/dfunctor.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "utils/context/ms_context.h" #include "utils/symbolic.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" namespace mindspore { namespace ad { diff --git a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc index 105840874a..607b3a4e54 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc @@ -20,9 +20,9 @@ #include #include #include "ir/anf.h" -#include "ir/primitive_py.h" +#include "utils/primitive_py.h" #include "ir/meta_func_graph.h" -#include "ir/func_graph_cloner.h" +#include "utils/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/graph_kernel_reuse.cc b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc index c157777040..ef526559e5 100644 --- a/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc +++ b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc @@ -19,7 +19,7 @@ #include #include #include "./common.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc index dc580f6b63..6c2e9ad921 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 "ir/func_graph_cloner.h" +#include "utils/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 bcc6bf311f..0eea40dfab 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 "ir/func_graph_cloner.h" +#include "utils/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 1fee007a88..407b9d8d99 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 "ir/func_graph_cloner.h" +#include "utils/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 8950084437..7146cd9734 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 "ir/func_graph_cloner.h" +#include "utils/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 d9040044d9..1bb6b552ff 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 "ir/func_graph_cloner.h" +#include "utils/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 ccfef5bcfb..1872858dcc 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 "ir/func_graph_cloner.h" +#include "utils/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 9c02df6b2f..b033b6de2a 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 "ir/func_graph_cloner.h" +#include "utils/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 0be228f44b..dabd4d8bbd 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 "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h b/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h index 1f38fc758b..ffa383cc7a 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h @@ -26,7 +26,7 @@ #include "frontend/optimizer/irpass.h" #include "frontend/optimizer/anf_visitor.h" #include "frontend/operator/ops.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "frontend/operator/composite/composite.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h b/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h index 6cb9312028..899f44342e 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 "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h index acc17626e3..1016b81020 100644 --- a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h +++ b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h @@ -23,8 +23,8 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "ir/primitive_py.h" -#include "utils/graph_utils.h" +#include "utils/primitive_py.h" +#include "ir/graph_utils.h" #include "common/utils.h" #include "pipeline/jit/parse/resolve.h" diff --git a/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc index 45a88c3a23..d7c346e6ec 100644 --- a/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc @@ -20,7 +20,7 @@ #include "debug/draw.h" #include "ir/func_graph.h" #include "utils/context/ms_context.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/pipeline/jit/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc index 9fb3dc59d9..3a8461d50d 100644 --- a/mindspore/ccsrc/pipeline/jit/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -23,7 +23,7 @@ #include #include -#include "ir/func_graph_cloner.h" +#include "utils/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 ae68bf97c7..13f6b73c36 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 "ir/func_graph_cloner.h" +#include "utils/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/pass.cc b/mindspore/ccsrc/pipeline/jit/pass.cc index 27108380d9..ee2e910c07 100644 --- a/mindspore/ccsrc/pipeline/jit/pass.cc +++ b/mindspore/ccsrc/pipeline/jit/pass.cc @@ -24,7 +24,7 @@ #include #include -#include "ir/func_graph_cloner.h" +#include "utils/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/resource.cc b/mindspore/ccsrc/pipeline/jit/resource.cc index 16d4a00346..f31ab2159d 100644 --- a/mindspore/ccsrc/pipeline/jit/resource.cc +++ b/mindspore/ccsrc/pipeline/jit/resource.cc @@ -24,7 +24,7 @@ #include "ir/dtype.h" #include "pipeline/jit/parse/data_converter.h" #include "frontend/operator/ops.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "frontend/optimizer/ad/dfunctor.h" #include "vm/segment_runner.h" diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc index eb50974e54..7db68cc56e 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 "ir/func_graph_cloner.h" +#include "utils/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.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc index 32c775bacd..25b34d3681 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc @@ -24,7 +24,7 @@ #include "frontend/operator/ops.h" #include "frontend/operator/composite/do_signature.h" #include "abstract/abstract_function.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/log_adapter.h" #include "utils/profile.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h index 2c08ea00ef..7519eddf48 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 "ir/func_graph_cloner.h" +#include "utils/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 da71f3996c..34299df00a 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 "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "./common.h" #include "pipeline/jit/parse/data_converter.h" #include "debug/draw.h" diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h index e2837a7da0..59b4a33b51 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h @@ -33,7 +33,7 @@ #include "utils/log_adapter.h" #include "ir/anf.h" -#include "ir/primitive_py.h" +#include "utils/primitive_py.h" #include "abstract/analysis_context.h" #include "abstract/abstract_function.h" #include "pipeline/jit/parse/parse.h" diff --git a/mindspore/ccsrc/pipeline/pynative/base.h b/mindspore/ccsrc/pipeline/pynative/base.h index 2739b6036e..12664b4c85 100644 --- a/mindspore/ccsrc/pipeline/pynative/base.h +++ b/mindspore/ccsrc/pipeline/pynative/base.h @@ -27,7 +27,7 @@ #include "pybind11/pybind11.h" #include "ir/anf.h" -#include "ir/primitive_py.h" +#include "utils/primitive_py.h" #include "abstract/abstract_value.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc index e77cfb233d..21b00e6098 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc @@ -23,7 +23,7 @@ #include #include "debug/trace.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" #include "ir/param_value.h" #include "utils/any.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc index 897c21fc90..0b7f096b2e 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc @@ -28,7 +28,7 @@ #include "pipeline/jit/parse/data_converter.h" #include "pipeline/jit/static_analysis/prim.h" #include "backend/session/session_factory.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" const char SINGLE_OP_GRAPH[] = "single_op_graph"; diff --git a/mindspore/ccsrc/pybind_api/export_flags.cc b/mindspore/ccsrc/pybind_api/export_flags.cc index a9953debdc..c8f988d4ef 100644 --- a/mindspore/ccsrc/pybind_api/export_flags.cc +++ b/mindspore/ccsrc/pybind_api/export_flags.cc @@ -16,18 +16,8 @@ #include "pybind_api/export_flags.h" namespace mindspore { - const char PYTHON_PRIMITIVE_FLAG[] = "__primitive_flag__"; const char PYTHON_CELL_AS_LIST[] = "__cell_as_list__"; const char PYTHON_DATACLASS_FIELDS[] = "__dataclass_fields__"; const char PYTHON_CLASS_MEMBER_NAMESPACE[] = "__class_member_namespace__"; - -// flag names -const char GRAPH_FLAG_MIX_PRECISION_FP16[] = "fp16"; -const char GRAPH_FLAG_MIX_PRECISION_FP32[] = "fp32"; -const char GRAPH_FLAG_HAS_EFFECT[] = "has_effect"; -const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[] = "_effect_patial_order"; -const char GRAPH_FLAG_RANDOM_EFFECT[] = "_random_effect"; -const char GRAPH_FLAG_SIDE_EFFECT[] = "_side_effect"; - } // namespace mindspore diff --git a/mindspore/ccsrc/pybind_api/export_flags.h b/mindspore/ccsrc/pybind_api/export_flags.h index eb2348d88d..56e0a87ead 100644 --- a/mindspore/ccsrc/pybind_api/export_flags.h +++ b/mindspore/ccsrc/pybind_api/export_flags.h @@ -17,19 +17,12 @@ #ifndef PYBIND_API_EXPORT_FLAGS_H_ #define PYBIND_API_EXPORT_FLAGS_H_ +#include "utils/flags.h" namespace mindspore { - extern const char PYTHON_PRIMITIVE_FLAG[]; extern const char PYTHON_CELL_AS_LIST[]; extern const char PYTHON_DATACLASS_FIELDS[]; extern const char PYTHON_CLASS_MEMBER_NAMESPACE[]; - -extern const char GRAPH_FLAG_MIX_PRECISION_FP16[]; -extern const char GRAPH_FLAG_MIX_PRECISION_FP32[]; -extern const char GRAPH_FLAG_HAS_EFFECT[]; -extern const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[]; -extern const char GRAPH_FLAG_RANDOM_EFFECT[]; -extern const char GRAPH_FLAG_SIDE_EFFECT[]; } // namespace mindspore #endif // PYBIND_API_EXPORT_FLAGS_H_ diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime.h b/mindspore/ccsrc/runtime/device/kernel_runtime.h index 3405d6d591..d368b3eedf 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.h @@ -23,6 +23,7 @@ #include "runtime/device/device_address.h" #include "ir/tensor.h" +#include "utils/convert_utils.h" #include "predict/generator/utils/ir_model_util.h" #ifdef ENABLE_DUMP_E2E #include "debug/e2e_dump.h" diff --git a/mindspore/ccsrc/transform/graph_ir/convert.cc b/mindspore/ccsrc/transform/graph_ir/convert.cc index e05f3e01a0..74de7eae65 100644 --- a/mindspore/ccsrc/transform/graph_ir/convert.cc +++ b/mindspore/ccsrc/transform/graph_ir/convert.cc @@ -23,7 +23,7 @@ #include "frontend/operator/ops.h" #include "utils/log_adapter.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/symbolic.h" #include "utils/config_manager.h" #include "utils/convert_utils.h" diff --git a/mindspore/core/ir/anf_py.cc b/mindspore/ccsrc/utils/anf_py.cc similarity index 100% rename from mindspore/core/ir/anf_py.cc rename to mindspore/ccsrc/utils/anf_py.cc diff --git a/mindspore/ccsrc/utils/base_ref_extends.h b/mindspore/ccsrc/utils/base_ref_extends.h index 5aa603bfe9..18d51c2611 100644 --- a/mindspore/ccsrc/utils/base_ref_extends.h +++ b/mindspore/ccsrc/utils/base_ref_extends.h @@ -20,7 +20,7 @@ #include #include "utils/base_ref_py.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" namespace mindspore { class PyObjectRef : public BaseRef { diff --git a/mindspore/ccsrc/utils/convert_utils.h b/mindspore/ccsrc/utils/convert_utils.h index 55953bb80c..3216726214 100644 --- a/mindspore/ccsrc/utils/convert_utils.h +++ b/mindspore/ccsrc/utils/convert_utils.h @@ -28,7 +28,7 @@ #include "pybind11/pybind11.h" #include "utils/convert_utils_base.h" #include "utils/any.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" #include "base/base.h" #include "ir/anf.h" diff --git a/mindspore/core/ir/dtype_py.cc b/mindspore/ccsrc/utils/dtype_py.cc similarity index 99% rename from mindspore/core/ir/dtype_py.cc rename to mindspore/ccsrc/utils/dtype_py.cc index db02cb3257..f7cece948a 100644 --- a/mindspore/core/ir/dtype_py.cc +++ b/mindspore/ccsrc/utils/dtype_py.cc @@ -35,7 +35,7 @@ REGISTER_PYBIND_DEFINE( "dump_type", [](const TypePtr &t) { return t->type_id(); }, "dump type"); (void)m_sub.def("str_to_type", &StringToType, "string to typeptr"); (void)py::class_>(m_sub, "Type") - .def("__eq__", + .def("__eq__", [](const TypePtr &t1, const py::object &other) { if (!py::isinstance(other)) { return false; diff --git a/mindspore/core/ir/func_graph_cloner.cc b/mindspore/ccsrc/utils/func_graph_cloner.cc similarity index 99% rename from mindspore/core/ir/func_graph_cloner.cc rename to mindspore/ccsrc/utils/func_graph_cloner.cc index a06710c485..29fab5d3d1 100644 --- a/mindspore/core/ir/func_graph_cloner.cc +++ b/mindspore/ccsrc/utils/func_graph_cloner.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include @@ -25,7 +25,7 @@ #include "utils/log_adapter.h" #include "utils/profile.h" #include "utils/context/ms_context.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" // namespace to support intermediate representation definition namespace mindspore { @@ -412,7 +412,7 @@ void Cloner::Lift() { auto sorted = BroadFirstSearchGraphUsed(*(manager_->roots().begin())); for (auto r_iter = sorted.rbegin(); r_iter != sorted.rend(); ++r_iter) { auto func_graph = *r_iter; - auto iter = repl_func_graph_params_.find(func_graph); + auto iter = repl_func_graph_params_.find(func_graph); if (iter != repl_func_graph_params_.end()) { auto ¶ms = iter->second; for (auto &cnode : func_graph->func_graph_cnodes_index()) { diff --git a/mindspore/core/ir/func_graph_cloner.h b/mindspore/ccsrc/utils/func_graph_cloner.h similarity index 96% rename from mindspore/core/ir/func_graph_cloner.h rename to mindspore/ccsrc/utils/func_graph_cloner.h index cdf9a8698b..da9773a2b7 100644 --- a/mindspore/core/ir/func_graph_cloner.h +++ b/mindspore/ccsrc/utils/func_graph_cloner.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ -#define MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ +#ifndef MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ +#define MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ #include #include @@ -119,8 +119,6 @@ class Cloner { std::unordered_map repl_func_graph_params_; }; -FuncGraphPtr BasicClone(const FuncGraphPtr &func_graph); - AnfNodePtr InlineClone(const FuncGraphPtr &func_graph, const FuncGraphPtr &target_func_graph, const AnfNodePtrList &func_graph_args, const ScopePtr &scope = nullptr); @@ -132,4 +130,4 @@ FuncGraphPtr TransformableClone(const FuncGraphPtr &func_graph, const TraceInfoPtr &relation = std::make_shared()); } // namespace mindspore -#endif // MINDSPORE_CORE_IR_FUNC_GRAPH_CLONER_H_ +#endif // MINDSPORE_CCSRC_UTILS_FUNC_GRAPH_CLONER_H_ diff --git a/mindspore/core/ir/func_graph_py.cc b/mindspore/ccsrc/utils/func_graph_py.cc similarity index 100% rename from mindspore/core/ir/func_graph_py.cc rename to mindspore/ccsrc/utils/func_graph_py.cc diff --git a/mindspore/core/ir/param_value_py.cc b/mindspore/ccsrc/utils/param_value_py.cc similarity index 100% rename from mindspore/core/ir/param_value_py.cc rename to mindspore/ccsrc/utils/param_value_py.cc diff --git a/mindspore/core/ir/primitive_py.cc b/mindspore/ccsrc/utils/primitive_py.cc similarity index 99% rename from mindspore/core/ir/primitive_py.cc rename to mindspore/ccsrc/utils/primitive_py.cc index f8881f26cd..efaedcb419 100644 --- a/mindspore/core/ir/primitive_py.cc +++ b/mindspore/ccsrc/utils/primitive_py.cc @@ -14,9 +14,8 @@ * limitations under the License. */ -#include "ir/primitive_py.h" +#include "utils/primitive_py.h" #include -#include #include "ir/signature.h" #include "./common.h" #include "pipeline/jit/parse/python_adapter.h" diff --git a/mindspore/core/ir/primitive_py.h b/mindspore/ccsrc/utils/primitive_py.h similarity index 100% rename from mindspore/core/ir/primitive_py.h rename to mindspore/ccsrc/utils/primitive_py.h diff --git a/mindspore/ccsrc/utils/primitive_utils.h b/mindspore/ccsrc/utils/primitive_utils.h index 0faeca9c47..cb23e535b0 100644 --- a/mindspore/ccsrc/utils/primitive_utils.h +++ b/mindspore/ccsrc/utils/primitive_utils.h @@ -19,7 +19,8 @@ #include #include "pybind11/pybind11.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" +#include "utils/convert_utils.h" namespace py = pybind11; diff --git a/mindspore/core/ir/signature_py.cc b/mindspore/ccsrc/utils/signature_py.cc similarity index 100% rename from mindspore/core/ir/signature_py.cc rename to mindspore/ccsrc/utils/signature_py.cc diff --git a/mindspore/core/ir/tensor_py.cc b/mindspore/ccsrc/utils/tensor_py.cc similarity index 99% rename from mindspore/core/ir/tensor_py.cc rename to mindspore/ccsrc/utils/tensor_py.cc index b5b4fc0d69..d9875d374b 100644 --- a/mindspore/core/ir/tensor_py.cc +++ b/mindspore/ccsrc/utils/tensor_py.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" #include #include diff --git a/mindspore/core/ir/tensor_py.h b/mindspore/ccsrc/utils/tensor_py.h similarity index 100% rename from mindspore/core/ir/tensor_py.h rename to mindspore/ccsrc/utils/tensor_py.h diff --git a/mindspore/ccsrc/utils/tensorprint_utils.cc b/mindspore/ccsrc/utils/tensorprint_utils.cc index 08cd4e4291..5c81640206 100644 --- a/mindspore/ccsrc/utils/tensorprint_utils.cc +++ b/mindspore/ccsrc/utils/tensorprint_utils.cc @@ -21,6 +21,8 @@ #include #include #include "ir/tensor.h" +#include "pybind11/pybind11.h" +#include "common/utils.h" #include "runtime/device/convert_tensor_utils.h" #include "./securec.h" #ifndef NO_DLIB @@ -29,6 +31,7 @@ #include "tdt/data_common.h" #endif +namespace py = pybind11; namespace mindspore { const char kShapeSeperator[] = ","; const char kShapeScalar[] = "[0]"; diff --git a/mindspore/core/ir/value_py.cc b/mindspore/ccsrc/utils/value_py.cc similarity index 100% rename from mindspore/core/ir/value_py.cc rename to mindspore/ccsrc/utils/value_py.cc diff --git a/mindspore/ccsrc/vm/segment_runner.cc b/mindspore/ccsrc/vm/segment_runner.cc index 151c20a535..ba27c46086 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 "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/vm/transform.cc b/mindspore/ccsrc/vm/transform.cc index 495d5c4af7..bf39e4e2e7 100644 --- a/mindspore/ccsrc/vm/transform.cc +++ b/mindspore/ccsrc/vm/transform.cc @@ -30,7 +30,7 @@ #ifdef ENABLE_GE #include "transform/graph_ir/convert.h" #endif -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/context/ms_context.h" #include "debug/trace.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/vm/vmimpl.cc b/mindspore/ccsrc/vm/vmimpl.cc index 8ce65c3a26..56cc9b3207 100644 --- a/mindspore/ccsrc/vm/vmimpl.cc +++ b/mindspore/ccsrc/vm/vmimpl.cc @@ -29,8 +29,8 @@ #include "ir/tensor.h" #include "frontend/operator/ops.h" #include "ir/manager.h" -#include "ir/func_graph_cloner.h" -#include "ir/primitive_py.h" +#include "utils/func_graph_cloner.h" +#include "utils/primitive_py.h" #include "utils/convert_utils.h" #include "utils/primitive_utils.h" #include "debug/draw.h" diff --git a/mindspore/core/abstract/abstract_value.h b/mindspore/core/abstract/abstract_value.h index d74837d6d2..a66593b359 100644 --- a/mindspore/core/abstract/abstract_value.h +++ b/mindspore/core/abstract/abstract_value.h @@ -27,6 +27,7 @@ #include "utils/log_adapter.h" #include "utils/hashing.h" +#include "utils/any.h" #include "base/base.h" #include "ir/dtype.h" #include "ir/value.h" diff --git a/mindspore/core/abstract/utils.h b/mindspore/core/abstract/utils.h index 6f96a7a5c3..75ba63aa0b 100644 --- a/mindspore/core/abstract/utils.h +++ b/mindspore/core/abstract/utils.h @@ -26,7 +26,6 @@ #include "abstract/abstract_value.h" #include "utils/any.h" #include "utils/misc.h" -#include "utils/convert_utils.h" namespace mindspore { namespace abstract { diff --git a/mindspore/core/base/base.h b/mindspore/core/base/base.h index 84a23bbcb9..e43b042cfa 100644 --- a/mindspore/core/base/base.h +++ b/mindspore/core/base/base.h @@ -131,6 +131,11 @@ class AnfNode; using AnfNodePtr = std::shared_ptr; using AnfNodePtrList = std::vector; using AnfNodeSet = OrderedSet; +using AnfNodeWeakPtr = std::weak_ptr; + +class FuncGraph; +using FuncGraphPtr = std::shared_ptr; +using FuncGraphWeakPtr = std::weak_ptr; namespace abstract { class AbstractBase; diff --git a/mindspore/ccsrc/utils/base_ref.cc b/mindspore/core/base/base_ref.cc similarity index 99% rename from mindspore/ccsrc/utils/base_ref.cc rename to mindspore/core/base/base_ref.cc index b0d3564c1c..d7d6ea747c 100644 --- a/mindspore/ccsrc/utils/base_ref.cc +++ b/mindspore/core/base/base_ref.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "utils/base_ref.h" +#include "base/base_ref.h" namespace mindspore { iterator ConstIteratorCast(std::vector *v, const const_iterator iter) { diff --git a/mindspore/ccsrc/utils/base_ref.h b/mindspore/core/base/base_ref.h similarity index 98% rename from mindspore/ccsrc/utils/base_ref.h rename to mindspore/core/base/base_ref.h index 7c0b4b2f1c..05157a4020 100644 --- a/mindspore/ccsrc/utils/base_ref.h +++ b/mindspore/core/base/base_ref.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_BASE_REF_H_ -#define MINDSPORE_CCSRC_UTILS_BASE_REF_H_ +#ifndef MINDSPORE_CORE_UTILS_BASE_REF_H_ +#define MINDSPORE_CORE_UTILS_BASE_REF_H_ #include #include @@ -378,4 +378,4 @@ class RunFunctionRef : public BaseRef { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_NODE_REF_H_ +#endif // MINDSPORE_CORE_UTILS_BASE_REF_H_ diff --git a/mindspore/ccsrc/utils/base_ref_utils.cc b/mindspore/core/base/base_ref_utils.cc similarity index 98% rename from mindspore/ccsrc/utils/base_ref_utils.cc rename to mindspore/core/base/base_ref_utils.cc index 2c1223a13e..69051fa9fd 100644 --- a/mindspore/ccsrc/utils/base_ref_utils.cc +++ b/mindspore/core/base/base_ref_utils.cc @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include "base/base_ref_utils.h" #include #include -#include "utils/base_ref_utils.h" + #include "include/infer_tensor.h" #include "ir/tensor.h" namespace mindspore { - void IterateFindTensor(std::vector *msTensors, const VectorRef &ref_list) { for (size_t i = 0; i < ref_list.size(); ++i) { if (utils::isa(ref_list[i])) { @@ -51,5 +50,4 @@ std::vector TransformVectorRefToMultiTensor(const VectorRef & } return msTensors; } - } // namespace mindspore diff --git a/mindspore/ccsrc/utils/base_ref_utils.h b/mindspore/core/base/base_ref_utils.h similarity index 97% rename from mindspore/ccsrc/utils/base_ref_utils.h rename to mindspore/core/base/base_ref_utils.h index 04a6fcefda..c12f41fc2f 100644 --- a/mindspore/ccsrc/utils/base_ref_utils.h +++ b/mindspore/core/base/base_ref_utils.h @@ -16,9 +16,11 @@ #include #include -#include "utils/base_ref.h" + #include "include/infer_tensor.h" #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 diff --git a/mindspore/core/ir/func_graph.cc b/mindspore/core/ir/func_graph.cc index 93013b8d8d..c552bd64b2 100644 --- a/mindspore/core/ir/func_graph.cc +++ b/mindspore/core/ir/func_graph.cc @@ -22,8 +22,9 @@ #include #include -#include "debug/trace.h" +#include "debug/trace_base.h" #include "ir/manager.h" +#include "utils/flags.h" #include "utils/ordered_set.h" #include "utils/convert_utils_base.h" #include "abstract/abstract_function.h" diff --git a/mindspore/core/ir/func_graph.h b/mindspore/core/ir/func_graph.h index c6542bf3da..cfc6ec4163 100644 --- a/mindspore/core/ir/func_graph.h +++ b/mindspore/core/ir/func_graph.h @@ -32,7 +32,7 @@ #include "ir/manager.h" #include "utils/ordered_set.h" #include "utils/ordered_map.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" namespace mindspore { using BaseRefCounterMap = OrderedMap; @@ -420,6 +420,8 @@ 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/core/ir/func_graph_extends.cc b/mindspore/core/ir/func_graph_extends.cc index 4fa751a32f..fad7d5413d 100644 --- a/mindspore/core/ir/func_graph_extends.cc +++ b/mindspore/core/ir/func_graph_extends.cc @@ -18,14 +18,11 @@ #include #include -#include #include "ir/manager.h" -#include "ir/func_graph_cloner.h" #include "base/core_ops.h" #include "utils/ordered_set.h" #include "abstract/abstract_value.h" -#include "debug/anf_ir_dump.h" #include "debug/trace.h" #include "debug/draw.h" #include "debug/label.h" diff --git a/mindspore/ccsrc/utils/graph_utils.cc b/mindspore/core/ir/graph_utils.cc similarity index 99% rename from mindspore/ccsrc/utils/graph_utils.cc rename to mindspore/core/ir/graph_utils.cc index 213abdf903..a2d28cf6de 100644 --- a/mindspore/ccsrc/utils/graph_utils.cc +++ b/mindspore/core/ir/graph_utils.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include #include @@ -28,10 +28,10 @@ #include #include -#include "common/utils.h" #include "debug/label.h" #include "ir/func_graph.h" #include "utils/log_adapter.h" +#include "utils/context/ms_context.h" namespace mindspore { std::vector TopoSort(const AnfNodePtr &root, const SuccFunc &succ, const IncludeFunc &include) { diff --git a/mindspore/ccsrc/utils/graph_utils.h b/mindspore/core/ir/graph_utils.h similarity index 100% rename from mindspore/ccsrc/utils/graph_utils.h rename to mindspore/core/ir/graph_utils.h diff --git a/mindspore/ccsrc/utils/graph_utils_extends.cc b/mindspore/core/ir/graph_utils_extends.cc similarity index 97% rename from mindspore/ccsrc/utils/graph_utils_extends.cc rename to mindspore/core/ir/graph_utils_extends.cc index a6f2594cd1..647728bf0e 100644 --- a/mindspore/ccsrc/utils/graph_utils_extends.cc +++ b/mindspore/core/ir/graph_utils_extends.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include #include @@ -31,8 +31,6 @@ #include "debug/label.h" #include "utils/log_adapter.h" #include "common/utils.h" -#include "pipeline/jit/parse/function_block.h" -#include "pipeline/jit/parse/python_adapter.h" namespace mindspore { namespace { diff --git a/mindspore/core/ir/manager.cc b/mindspore/core/ir/manager.cc index 1b14f9184e..2970d22ee2 100644 --- a/mindspore/core/ir/manager.cc +++ b/mindspore/core/ir/manager.cc @@ -19,12 +19,9 @@ #include "ir/manager.h" #include -#include #include -#include "debug/trace_base.h" #include "ir/func_graph.h" -#include "utils/profile.h" #include "utils/convert_utils_base.h" #include "base/core_ops.h" diff --git a/mindspore/core/ir/manager.h b/mindspore/core/ir/manager.h index 9e804ab53a..d961e94ae5 100644 --- a/mindspore/core/ir/manager.h +++ b/mindspore/core/ir/manager.h @@ -34,10 +34,10 @@ #include "utils/signal.h" #include "utils/ordered_set.h" #include "utils/ordered_map.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/counter.h" #include "utils/hashing.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/core/ir/meta_tensor.h b/mindspore/core/ir/meta_tensor.h index 22bd5ad290..100c3cc59e 100644 --- a/mindspore/core/ir/meta_tensor.h +++ b/mindspore/core/ir/meta_tensor.h @@ -24,7 +24,7 @@ #include "base/base.h" #include "ir/dtype.h" -#include "utils/convert_utils.h" +#include "utils/convert_utils_base.h" #include "utils/hashing.h" // brief mindspore namespace. diff --git a/mindspore/core/utils/CMakeLists.txt b/mindspore/core/utils/CMakeLists.txt new file mode 100644 index 0000000000..b52a6591ff --- /dev/null +++ b/mindspore/core/utils/CMakeLists.txt @@ -0,0 +1,3 @@ +file(GLOB_RECURSE _UTIL_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +set_property(SOURCE ${_UTIL_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_IR) +add_library(_mindspore_core_utils_obj OBJECT ${_UTIL_ALL_SRC_FILES}) diff --git a/mindspore/ccsrc/utils/any.cc b/mindspore/core/utils/any.cc similarity index 100% rename from mindspore/ccsrc/utils/any.cc rename to mindspore/core/utils/any.cc diff --git a/mindspore/ccsrc/utils/any.h b/mindspore/core/utils/any.h similarity index 100% rename from mindspore/ccsrc/utils/any.h rename to mindspore/core/utils/any.h diff --git a/mindspore/ccsrc/utils/convert_utils_base.h b/mindspore/core/utils/convert_utils_base.h similarity index 100% rename from mindspore/ccsrc/utils/convert_utils_base.h rename to mindspore/core/utils/convert_utils_base.h diff --git a/mindspore/ccsrc/utils/counter.h b/mindspore/core/utils/counter.h similarity index 95% rename from mindspore/ccsrc/utils/counter.h rename to mindspore/core/utils/counter.h index ead0ad84f2..f70271d37f 100644 --- a/mindspore/ccsrc/utils/counter.h +++ b/mindspore/core/utils/counter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_COUNTER_H_ -#define MINDSPORE_CCSRC_UTILS_COUNTER_H_ +#ifndef MINDSPORE_CORE_UTILS_COUNTER_H_ +#define MINDSPORE_CORE_UTILS_COUNTER_H_ #include #include "utils/ordered_map.h" @@ -99,4 +99,4 @@ class Counter { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_COUNTER_H_ +#endif // MINDSPORE_CORE_UTILS_COUNTER_H_ diff --git a/mindspore/core/utils/flags.cc b/mindspore/core/utils/flags.cc new file mode 100644 index 0000000000..a36d0367d6 --- /dev/null +++ b/mindspore/core/utils/flags.cc @@ -0,0 +1,26 @@ +/** + * Copyright 2020 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "utils/flags.h" +namespace mindspore { +// flag names +const char GRAPH_FLAG_MIX_PRECISION_FP16[] = "fp16"; +const char GRAPH_FLAG_MIX_PRECISION_FP32[] = "fp32"; +const char GRAPH_FLAG_HAS_EFFECT[] = "has_effect"; +const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[] = "_effect_patial_order"; +const char GRAPH_FLAG_RANDOM_EFFECT[] = "_random_effect"; +const char GRAPH_FLAG_SIDE_EFFECT[] = "_side_effect"; +} // namespace mindspore diff --git a/mindspore/core/utils/flags.h b/mindspore/core/utils/flags.h new file mode 100644 index 0000000000..cc751aaa21 --- /dev/null +++ b/mindspore/core/utils/flags.h @@ -0,0 +1,28 @@ +/** + * Copyright 2020 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MINDSPORE_CORE_UTILS_FLAGS_H +#define MINDSPORE_CORE_UTILS_FLAGS_H +namespace mindspore { +extern const char GRAPH_FLAG_MIX_PRECISION_FP16[]; +extern const char GRAPH_FLAG_MIX_PRECISION_FP32[]; +extern const char GRAPH_FLAG_HAS_EFFECT[]; +extern const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[]; +extern const char GRAPH_FLAG_RANDOM_EFFECT[]; +extern const char GRAPH_FLAG_SIDE_EFFECT[]; +} + +#endif // MINDSPORE_CORE_UTILS_FLAGS_H diff --git a/mindspore/ccsrc/utils/hashing.h b/mindspore/core/utils/hashing.h similarity index 100% rename from mindspore/ccsrc/utils/hashing.h rename to mindspore/core/utils/hashing.h diff --git a/mindspore/ccsrc/utils/log_adapter.cc b/mindspore/core/utils/log_adapter.cc similarity index 100% rename from mindspore/ccsrc/utils/log_adapter.cc rename to mindspore/core/utils/log_adapter.cc diff --git a/mindspore/ccsrc/utils/log_adapter.h b/mindspore/core/utils/log_adapter.h similarity index 98% rename from mindspore/ccsrc/utils/log_adapter.h rename to mindspore/core/utils/log_adapter.h index 53c94a634a..866b61b864 100644 --- a/mindspore/ccsrc/utils/log_adapter.h +++ b/mindspore/core/utils/log_adapter.h @@ -23,7 +23,7 @@ #include #include #include -#include "./overload.h" +#include "utils/overload.h" #include "./securec.h" #ifdef USE_GLOG #include "glog/logging.h" @@ -31,7 +31,7 @@ #include "toolchain/slog.h" #endif // NOTICE: when relative path of 'log_adapter.h' changed, macro 'LOG_HDR_FILE_REL_PATH' must be changed -#define LOG_HDR_FILE_REL_PATH "mindspore/ccsrc/utils/log_adapter.h" +#define LOG_HDR_FILE_REL_PATH "mindspore/core/utils/log_adapter.h" // Get start index of file relative path in __FILE__ static constexpr int GetRelPathPos() noexcept { diff --git a/mindspore/ccsrc/utils/misc.cc b/mindspore/core/utils/misc.cc similarity index 99% rename from mindspore/ccsrc/utils/misc.cc rename to mindspore/core/utils/misc.cc index a9eb8071ef..ae93c750ee 100644 --- a/mindspore/ccsrc/utils/misc.cc +++ b/mindspore/core/utils/misc.cc @@ -17,7 +17,6 @@ #include "utils/misc.h" namespace mindspore { - const int RET_SUCCESS = 0; const int RET_FAILED = 1; const int RET_CONTINUE = 2; diff --git a/mindspore/ccsrc/utils/misc.h b/mindspore/core/utils/misc.h similarity index 99% rename from mindspore/ccsrc/utils/misc.h rename to mindspore/core/utils/misc.h index e2cdebe98a..be83b2999c 100644 --- a/mindspore/ccsrc/utils/misc.h +++ b/mindspore/core/utils/misc.h @@ -26,7 +26,6 @@ #include "utils/log_adapter.h" namespace mindspore { - extern const int RET_SUCCESS; extern const int RET_FAILED; extern const int RET_CONTINUE; diff --git a/mindspore/ccsrc/utils/ordered_map.h b/mindspore/core/utils/ordered_map.h similarity index 100% rename from mindspore/ccsrc/utils/ordered_map.h rename to mindspore/core/utils/ordered_map.h diff --git a/mindspore/ccsrc/utils/ordered_set.h b/mindspore/core/utils/ordered_set.h similarity index 100% rename from mindspore/ccsrc/utils/ordered_set.h rename to mindspore/core/utils/ordered_set.h diff --git a/mindspore/ccsrc/utils/overload.h b/mindspore/core/utils/overload.h similarity index 99% rename from mindspore/ccsrc/utils/overload.h rename to mindspore/core/utils/overload.h index a95e285fc7..be3a42b77b 100644 --- a/mindspore/ccsrc/utils/overload.h +++ b/mindspore/core/utils/overload.h @@ -28,7 +28,6 @@ #include namespace mindspore { - template std::ostream &operator<<(std::ostream &out, const std::vector &v) { out << "[const vector]["; @@ -134,7 +133,6 @@ std::string ToString(const std::map &map) { buffer << map; return buffer.str(); } - } // namespace mindspore #endif // MINDSPORE_CCSRC_UTILS_OVERLOAD_H_ diff --git a/mindspore/ccsrc/utils/signal.h b/mindspore/core/utils/signal.h similarity index 100% rename from mindspore/ccsrc/utils/signal.h rename to mindspore/core/utils/signal.h diff --git a/mindspore/ccsrc/utils/symbolic.cc b/mindspore/core/utils/symbolic.cc similarity index 100% rename from mindspore/ccsrc/utils/symbolic.cc rename to mindspore/core/utils/symbolic.cc diff --git a/mindspore/ccsrc/utils/symbolic.h b/mindspore/core/utils/symbolic.h similarity index 99% rename from mindspore/ccsrc/utils/symbolic.h rename to mindspore/core/utils/symbolic.h index 9019000233..7ac0453091 100644 --- a/mindspore/ccsrc/utils/symbolic.h +++ b/mindspore/core/utils/symbolic.h @@ -27,7 +27,6 @@ #include "ir/anf.h" #include "abstract/abstract_value.h" -#include "utils/any.h" namespace mindspore { diff --git a/mindspore/ccsrc/utils/visible.h b/mindspore/core/utils/visible.h similarity index 100% rename from mindspore/ccsrc/utils/visible.h rename to mindspore/core/utils/visible.h diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index 880a281037..b4af09dee7 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -55,6 +55,7 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/core/base/*.cc" "../../../mindspore/core/abstract/*.cc" "../../../mindspore/core/ir/*.cc" + "../../../mindspore/core/utils/*.cc" "../../../mindspore/ccsrc/common/*.cc" "../../../mindspore/ccsrc/utils/*.cc" "../../../mindspore/ccsrc/pipeline/jit/parse/*.cc" diff --git a/tests/ut/cpp/ir/clone_test.cc b/tests/ut/cpp/ir/clone_test.cc index 20da3fb8b5..ac32cc7f39 100644 --- a/tests/ut/cpp/ir/clone_test.cc +++ b/tests/ut/cpp/ir/clone_test.cc @@ -20,9 +20,9 @@ #include "ir/manager.h" #include "utils/log_adapter.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "debug/draw.h" #include "./common.h" diff --git a/tests/ut/cpp/ir/manager_test.cc b/tests/ut/cpp/ir/manager_test.cc index 3e6d1a312c..3284a1e06f 100644 --- a/tests/ut/cpp/ir/manager_test.cc +++ b/tests/ut/cpp/ir/manager_test.cc @@ -17,7 +17,7 @@ #include "common/py_func_graph_fetcher.h" #include "ir/dtype.h" #include "ir/manager.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" #include "frontend/operator/ops.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/ir/meta_tensor_test.cc b/tests/ut/cpp/ir/meta_tensor_test.cc index 537d4c460e..555a4e9654 100644 --- a/tests/ut/cpp/ir/meta_tensor_test.cc +++ b/tests/ut/cpp/ir/meta_tensor_test.cc @@ -22,7 +22,7 @@ #include "securec/include/securec.h" #include "ir/tensor.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" using mindspore::tensor::TensorPy; diff --git a/tests/ut/cpp/operator/ops_test.cc b/tests/ut/cpp/operator/ops_test.cc index 20f4734bf0..4af615e9c6 100644 --- a/tests/ut/cpp/operator/ops_test.cc +++ b/tests/ut/cpp/operator/ops_test.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "ir/value.h" -#include "ir/primitive_py.h" +#include "utils/primitive_py.h" #include "frontend/operator/ops.h" #include "./common.h" diff --git a/tests/ut/cpp/optimizer/ad/ad_test.cc b/tests/ut/cpp/optimizer/ad/ad_test.cc index 3f861d3604..effc3d3b1a 100644 --- a/tests/ut/cpp/optimizer/ad/ad_test.cc +++ b/tests/ut/cpp/optimizer/ad/ad_test.cc @@ -21,9 +21,9 @@ #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" #include "ir/value.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "utils/log_adapter.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "pipeline/jit/resource.h" #include "pipeline/jit/parse/parse.h" #include "debug/draw.h" diff --git a/tests/ut/cpp/optimizer/cconv_test.cc b/tests/ut/cpp/optimizer/cconv_test.cc index c004409058..d98905955f 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 "ir/func_graph_cloner.h" +#include "utils/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 48865a10d2..84bc0d8b75 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 "ir/func_graph_cloner.h" +#include "utils/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 bf70f597d7..d5eaf98eab 100644 --- a/tests/ut/cpp/optimizer/opt_test.cc +++ b/tests/ut/cpp/optimizer/opt_test.cc @@ -20,7 +20,8 @@ #include "common/py_func_graph_fetcher.h" #include "ir/anf.h" -#include "ir/func_graph_cloner.h" +#include "ir/visitor.h" +#include "utils/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/pipeline/static_analysis/specialize_test.cc b/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc index e32a86d9be..1a320d72ed 100644 --- a/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc @@ -24,7 +24,7 @@ #include "pipeline/jit/static_analysis/program_specialize.h" #include "pipeline/static_analysis/helper.h" #include "utils/log_adapter.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "utils/misc.h" #include "debug/draw.h" diff --git a/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc b/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc index 12030433fc..e1efa3baaf 100644 --- a/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc +++ b/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc @@ -22,7 +22,7 @@ #include "common/common_test.h" #include "backend/optimizer/common/pattern_engine.h" #include "backend/optimizer/common/visit.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" #include "ir/anf.h" namespace mindspore { diff --git a/tests/ut/cpp/transform/graph_runner_test.cc b/tests/ut/cpp/transform/graph_runner_test.cc index b91ec959d2..fed34b1c62 100644 --- a/tests/ut/cpp/transform/graph_runner_test.cc +++ b/tests/ut/cpp/transform/graph_runner_test.cc @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "ir/dtype.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" #include "transform/transform_base_test.h" #include "common/py_func_graph_fetcher.h" #include "pipeline/jit/static_analysis/static_analysis.h" diff --git a/tests/ut/cpp/transform/transform_base_test.cc b/tests/ut/cpp/transform/transform_base_test.cc index 50227bc53c..86c4e7b8e0 100644 --- a/tests/ut/cpp/transform/transform_base_test.cc +++ b/tests/ut/cpp/transform/transform_base_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" #include "transform/transform_base_test.h" -#include "ir/tensor_py.h" +#include "utils/tensor_py.h" using mindspore::tensor::TensorPy; diff --git a/tests/ut/cpp/utils/baseref_test.cc b/tests/ut/cpp/utils/baseref_test.cc index 4e1556d819..4a5a267d9d 100644 --- a/tests/ut/cpp/utils/baseref_test.cc +++ b/tests/ut/cpp/utils/baseref_test.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "ir/anf.h" -#include "utils/base_ref.h" +#include "base/base_ref.h" namespace mindspore { namespace utils { diff --git a/tests/ut/cpp/utils/graph_utils_test.cc b/tests/ut/cpp/utils/graph_utils_test.cc index 35fa9cdc6a..60bc3f75ec 100644 --- a/tests/ut/cpp/utils/graph_utils_test.cc +++ b/tests/ut/cpp/utils/graph_utils_test.cc @@ -22,8 +22,8 @@ #include "common/py_func_graph_fetcher.h" #include "ir/anf.h" -#include "utils/graph_utils.h" - +#include "ir/graph_utils.h" +#include "utils/convert_utils.h" #include "pipeline/jit/parse/parse_base.h" #include "pipeline/jit/parse/parse.h" diff --git a/tests/ut/cpp/vm/segment_runner_test.cc b/tests/ut/cpp/vm/segment_runner_test.cc index 60c027b077..3b9d5d52da 100644 --- a/tests/ut/cpp/vm/segment_runner_test.cc +++ b/tests/ut/cpp/vm/segment_runner_test.cc @@ -19,9 +19,9 @@ #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" #include "utils/log_adapter.h" -#include "ir/func_graph_cloner.h" +#include "utils/func_graph_cloner.h" #include "pipeline/jit/parse/parse.h" -#include "utils/graph_utils.h" +#include "ir/graph_utils.h" #include "pipeline/jit/resource.h" #include "debug/draw.h" #include "frontend/operator/ops.h"