m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move the dependency of utils to core

Browse Source
pull/3349/head
liubuyu 5 years ago
parent 15dfaf6b97
commit f4bc0bc9fe
132 changed files with 198 additions and 158 deletions
Show Stats Download Patch File Download Diff File

2
include/infer_log.h
Unescape View File

@ -25,7 +25,7 @@
#include <iostream> #include <iostream>
#ifndef ENABLE_ACL #ifndef ENABLE_ACL
#include "mindspore/ccsrc/utils/log_adapter.h" #include "mindspore/core/utils/log_adapter.h"
namespace mindspore::inference { namespace mindspore::inference {
#define MSI_LOG(level) MS_LOG(level) #define MSI_LOG(level) MS_LOG(level)

4
mindspore/ccsrc/CMakeLists.txt
Unescape View File

@ -154,9 +154,11 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/base base)
list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_base_obj>) list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_base_obj>)
add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/abstract abstract) add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/abstract abstract)
list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_abstract_obj>) 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) add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/ir ir)
list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_ir_obj>) 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) set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME)
add_library(mindspore STATIC ${SUB_OBJECTS_SRC}) add_library(mindspore STATIC ${SUB_OBJECTS_SRC})

1
mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h
Unescape View File

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

2
mindspore/ccsrc/backend/kernel_compiler/common_utils.cc
Unescape View File

@ -29,7 +29,7 @@
#include "ir/meta_tensor.h" #include "ir/meta_tensor.h"
#include "ir/func_graph.h" #include "ir/func_graph.h"
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
namespace mindspore { namespace mindspore {
namespace kernel { namespace kernel {

1
mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h
Unescape View File

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

2
mindspore/ccsrc/backend/optimizer/common/helper.cc
Unescape View File

@ -23,7 +23,7 @@
#include <set> #include <set>
#include <deque> #include <deque>
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/base_ref.h" #include "base/base_ref.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "common/utils.h" #include "common/utils.h"

2
mindspore/ccsrc/backend/optimizer/common/optimizer.h
Unescape View File

@ -26,7 +26,7 @@
#include "ir/primitive.h" #include "ir/primitive.h"
#include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/common/pass_manager.h"
#include "backend/optimizer/common/pattern_engine.h" #include "backend/optimizer/common/pattern_engine.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "common/utils.h" #include "common/utils.h"
#include "backend/optimizer/common/helper.h" #include "backend/optimizer/common/helper.h"

2
mindspore/ccsrc/backend/optimizer/common/pattern_engine.h
Unescape View File

@ -36,7 +36,7 @@
#include "backend/optimizer/common/visit.h" #include "backend/optimizer/common/visit.h"
#include "base/base.h" #include "base/base.h"
#include "utils/log_adapter.h" #include "utils/log_adapter.h"
#include "utils/base_ref.h" #include "base/base_ref.h"
namespace mindspore { namespace mindspore {
class CondVar; class CondVar;

2
mindspore/ccsrc/backend/optimizer/common/visit.h
Unescape View File

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

2
mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc
Unescape View File

@ -20,7 +20,7 @@
#include <functional> #include <functional>
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/log_adapter.h" #include "utils/log_adapter.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "backend/session/kernel_graph.h" #include "backend/session/kernel_graph.h"

2
mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc
Unescape View File

@ -19,7 +19,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "runtime/device/kernel_info.h" #include "runtime/device/kernel_info.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"

2
mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc
Unescape View File

@ -19,7 +19,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "backend/optimizer/common/helper.h" #include "backend/optimizer/common/helper.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "backend/session/kernel_graph.h" #include "backend/session/kernel_graph.h"

1
mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h
Unescape View File

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

3
mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc
Unescape View File

@ -19,7 +19,8 @@
#include <memory> #include <memory>
#include <utility> #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/optimizer/common/helper.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "backend/session/kernel_graph.h" #include "backend/session/kernel_graph.h"

4
mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc
Unescape View File

@ -26,13 +26,13 @@
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "backend/optimizer/common/helper.h" #include "backend/optimizer/common/helper.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "vm/segment_runner.h" #include "vm/segment_runner.h"
#include "debug/draw.h" #include "debug/draw.h"
#include "debug/anf_ir_dump.h" #include "debug/anf_ir_dump.h"
#include "ir/func_graph_cloner.h" #include "utils/func_graph_cloner.h"
namespace mindspore { namespace mindspore {
namespace opt { namespace opt {

4
mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc
Unescape View File

@ -27,13 +27,13 @@
#include "frontend/operator/ops.h" #include "frontend/operator/ops.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "backend/optimizer/common/helper.h" #include "backend/optimizer/common/helper.h"
#include "backend/session/anf_runtime_algorithm.h" #include "backend/session/anf_runtime_algorithm.h"
#include "vm/segment_runner.h" #include "vm/segment_runner.h"
#include "debug/draw.h" #include "debug/draw.h"
#include "debug/anf_ir_dump.h" #include "debug/anf_ir_dump.h"
#include "ir/func_graph_cloner.h" #include "utils/func_graph_cloner.h"
namespace mindspore { namespace mindspore {
namespace opt { namespace opt {

2
mindspore/ccsrc/backend/session/ascend_control_parser.h
Unescape View File

@ -23,7 +23,7 @@
#include <utility> #include <utility>
#include <functional> #include <functional>
#include "backend/session/kernel_graph.h" #include "backend/session/kernel_graph.h"
#include "utils/base_ref.h" #include "base/base_ref.h"
#include "utils/contract.h" #include "utils/contract.h"
#include "utils/union_find_set.h" #include "utils/union_find_set.h"

2
mindspore/ccsrc/backend/session/infer_session.cc
Unescape View File

@ -21,7 +21,7 @@
#include "utils/load_onnx/anf_converter.h" #include "utils/load_onnx/anf_converter.h"
#include "backend/session/session_basic.h" #include "backend/session/session_basic.h"
#include "backend/session/session_factory.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" #include "backend/kernel_compiler/oplib/oplib.h"
#ifdef ENABLE_D #ifdef ENABLE_D

2
mindspore/ccsrc/backend/session/kernel_graph.h
Unescape View File

@ -27,7 +27,7 @@
#include <unordered_set> #include <unordered_set>
#include "ir/func_graph.h" #include "ir/func_graph.h"
#include "ir/anf.h" #include "ir/anf.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/contract.h" #include "utils/contract.h"
#include "runtime/device/kernel_info.h" #include "runtime/device/kernel_info.h"

2
mindspore/ccsrc/backend/session/session_basic.cc
Unescape View File

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

2
mindspore/ccsrc/debug/anf_ir_dump.cc
Unescape View File

@ -25,7 +25,7 @@
#include "ir/primitive.h" #include "ir/primitive.h"
#include "ir/func_graph.h" #include "ir/func_graph.h"
#include "runtime/device/kernel_info.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 "backend/session/anf_runtime_algorithm.h"
#include "frontend/parallel/ops_info/operator_info.h" #include "frontend/parallel/ops_info/operator_info.h"

4
mindspore/ccsrc/debug/anf_ir_utils.cc
Unescape View File

@ -23,11 +23,11 @@
#include <unordered_set> #include <unordered_set>
#include <algorithm> #include <algorithm>
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/symbolic.h" #include "utils/symbolic.h"
#include "ir/meta_func_graph.h" #include "ir/meta_func_graph.h"
#include "ir/param_value.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/python_adapter.h"
#include "pipeline/jit/parse/resolve.h" #include "pipeline/jit/parse/resolve.h"
#include "frontend/operator/composite/composite.h" #include "frontend/operator/composite/composite.h"

2
mindspore/ccsrc/debug/debugger/proto_exporter.cc
Unescape View File

@ -24,7 +24,7 @@
#include "debug/debugger/debugger.h" #include "debug/debugger/debugger.h"
#include "proto/debug_graph.pb.h" #include "proto/debug_graph.pb.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/symbolic.h" #include "utils/symbolic.h"
namespace mindspore { namespace mindspore {

2
mindspore/ccsrc/debug/draw.cc
Unescape View File

@ -27,7 +27,7 @@
#include "ir/meta_func_graph.h" #include "ir/meta_func_graph.h"
#include "ir/param_value.h" #include "ir/param_value.h"
#include "ir/primitive.h" #include "ir/primitive.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "frontend/operator/composite/composite.h" #include "frontend/operator/composite/composite.h"
#include "ir/tensor.h" #include "ir/tensor.h"

2
mindspore/ccsrc/debug/dump_proto.cc
Unescape View File

@ -24,7 +24,7 @@
#include "debug/anf_ir_utils.h" #include "debug/anf_ir_utils.h"
#include "proto/anf_ir.pb.h" #include "proto/anf_ir.pb.h"
#include "utils/graph_utils.h" #include "ir/graph_utils.h"
#include "utils/symbolic.h" #include "utils/symbolic.h"
namespace mindspore { namespace mindspore {

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save