move the dependency of utils to core

include/infer_log.h

@@ -25,7 +25,7 @@
 #include <iostream>
 
 #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)
 

mindspore/ccsrc/CMakeLists.txt

@@ -154,9 +154,11 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/base base)
 list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_base_obj>)
 add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/abstract abstract)
 list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_abstract_obj>)
+add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/utils util)
+list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_core_utils_obj>)
 add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/ir ir)
 list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_ir_obj>)
-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})

mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h

@@ -24,6 +24,7 @@
 #include <utility>
 #include "backend/kernel_compiler/kernel.h"
 #include "ir/dtype.h"
+#include "ir/primitive.h"
 #include <nlohmann/json.hpp>
 #include "backend/kernel_compiler/common_utils.h"
 #include "backend/kernel_compiler/oplib/oplib.h"

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 {

mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h

@@ -20,6 +20,7 @@
 #include <string>
 #include <memory>
 #include <nlohmann/json.hpp>
+#include "common/utils.h"
 #include "backend/kernel_compiler/oplib/opinfo.h"
 
 namespace mindspore {

mindspore/ccsrc/backend/optimizer/common/helper.cc

@@ -23,7 +23,7 @@
 #include <set>
 #include <deque>
 #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"

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"
 

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;

mindspore/ccsrc/backend/optimizer/common/visit.h

@@ -27,7 +27,7 @@
 #include <memory>
 
 #include "base/base.h"
-#include "utils/base_ref.h"
+#include "base/base_ref.h"
 
 // namespace to support utils definition
 namespace mindspore {

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

@@ -20,7 +20,7 @@
 #include <functional>
 #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"

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

@@ -19,7 +19,7 @@
 #include <memory>
 #include <unordered_map>
 
-#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"

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

@@ -19,7 +19,7 @@
 #include <memory>
 #include <utility>
 
-#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"

mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h

@@ -18,6 +18,7 @@
 #include <string>
 
 #include "ir/anf.h"
+#include "utils/convert_utils.h"
 #include "backend/optimizer/common/optimizer.h"
 
 namespace mindspore {

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

@@ -19,7 +19,8 @@
 #include <memory>
 #include <utility>
 
-#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"

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 {

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 {

mindspore/ccsrc/backend/session/ascend_control_parser.h

@@ -23,7 +23,7 @@
 #include <utility>
 #include <functional>
 #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"
 

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

mindspore/ccsrc/backend/session/kernel_graph.h

@@ -27,7 +27,7 @@
 #include <unordered_set>
 #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"
 

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"

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"
 

mindspore/ccsrc/debug/anf_ir_utils.cc

@@ -23,11 +23,11 @@
 #include <unordered_set>
 #include <algorithm>
 
-#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"

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 {

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"

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 {