diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 58b3ce6881ed9f50a9951ab79077bc8cc11106e5..176c7e576aaadadbf30137b90f77cd36b8e75e16 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -127,7 +127,7 @@ endif() ## make sub objects set(SUB_COMP transform pre_activate parallel pipeline device kernel common debug gvar ir onnx operator optimizer predict - pybind_api pynative session utils vm + pybind_api pynative session utils vm base abstract ) foreach (_comp ${SUB_COMP}) diff --git a/mindspore/ccsrc/abstract/CMakeLists.txt b/mindspore/ccsrc/abstract/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..fa331776b34f3825b0ee8e5f54378c7be561cdab --- /dev/null +++ b/mindspore/ccsrc/abstract/CMakeLists.txt @@ -0,0 +1,3 @@ +file(GLOB_RECURSE _ABSTRACT_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +set_property(SOURCE ${_ABSTRACT_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ABSTRACT) +add_library(_mindspore_abstract_obj OBJECT ${_ABSTRACT_ALL_SRC_FILES}) diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_value.cc b/mindspore/ccsrc/abstract/abstract_value.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/abstract_value.cc rename to mindspore/ccsrc/abstract/abstract_value.cc index a2f97cf3b08cef1534ec1ec3e9a12d80897fa072..7bef3829a61dcba2cc1ece289c2fa0ae9b463449 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/abstract_value.cc +++ b/mindspore/ccsrc/abstract/abstract_value.cc @@ -16,13 +16,12 @@ * limitations under the License. */ -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include #include "utils/symbolic.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_value.h b/mindspore/ccsrc/abstract/abstract_value.h similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/abstract_value.h rename to mindspore/ccsrc/abstract/abstract_value.h index f165808fa06ffaed698aed8cbba52bc728a6f9e4..d922f93e70b4dafeb0c13a576cf1f6cda85208cd 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/abstract_value.h +++ b/mindspore/ccsrc/abstract/abstract_value.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef PIPELINE_STATIC_ANALYSIS_ABSTRACT_VALUE_H_ -#define PIPELINE_STATIC_ANALYSIS_ABSTRACT_VALUE_H_ +#ifndef MINDSPORE_CCSRC_ABSTRACT_ABSTRACT_VALUE_H_ +#define MINDSPORE_CCSRC_ABSTRACT_ABSTRACT_VALUE_H_ #include #include @@ -27,11 +27,11 @@ #include "utils/log_adapter.h" #include "utils/hashing.h" -#include "ir/base.h" +#include "base/base.h" #include "ir/dtype.h" #include "ir/value.h" #include "ir/tensor.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" namespace mindspore { namespace abstract { @@ -623,4 +623,4 @@ class AbstractIndexedSlices : public AbstractUndetermined { }; } // namespace abstract } // namespace mindspore -#endif // PIPELINE_STATIC_ANALYSIS_ABSTRACT_VALUE_H_ +#endif // MINDSPORE_CCSRC_ABSTRACT_ABSTRACT_VALUE_H_ diff --git a/mindspore/ccsrc/pipeline/static_analysis/analysis_context.cc b/mindspore/ccsrc/abstract/analysis_context.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/analysis_context.cc rename to mindspore/ccsrc/abstract/analysis_context.cc index 4a43b1416871db032191803230c39ad9707a9b29..1ae6125838e6de31f3de899954b8dc7d2a3cdb3d 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/analysis_context.cc +++ b/mindspore/ccsrc/abstract/analysis_context.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/static_analysis/analysis_context.h" +#include "abstract/analysis_context.h" #include diff --git a/mindspore/ccsrc/pipeline/static_analysis/analysis_context.h b/mindspore/ccsrc/abstract/analysis_context.h similarity index 93% rename from mindspore/ccsrc/pipeline/static_analysis/analysis_context.h rename to mindspore/ccsrc/abstract/analysis_context.h index c0b34037024aaeb05dfdb59a0cb51d7e9fc55b38..c0293d7e917be1e3a08d6e103f54afd2dd00f41e 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/analysis_context.h +++ b/mindspore/ccsrc/abstract/analysis_context.h @@ -16,14 +16,14 @@ * limitations under the License. */ -#ifndef PIPELINE_STATIC_ANALYSIS_ANALYSIS_CONTEXT_H_ -#define PIPELINE_STATIC_ANALYSIS_ANALYSIS_CONTEXT_H_ +#ifndef MINDSPORE_CCSRC_ABSTRACT_ANALYSIS_CONTEXT_H_ +#define MINDSPORE_CCSRC_ABSTRACT_ANALYSIS_CONTEXT_H_ #include #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "ir/meta_func_graph.h" namespace mindspore { @@ -85,4 +85,4 @@ struct ContextEqual { extern const AnalysisContextPtr kDummyAnalysisContext; } // namespace abstract } // namespace mindspore -#endif // PIPELINE_STATIC_ANALYSIS_ANALYSIS_CONTEXT_H_ +#endif // MINDSPORE_CCSRC_ABSTRACT_ANALYSIS_CONTEXT_H_ diff --git a/mindspore/ccsrc/pipeline/static_analysis/dshape.cc b/mindspore/ccsrc/abstract/dshape.cc similarity index 98% rename from mindspore/ccsrc/pipeline/static_analysis/dshape.cc rename to mindspore/ccsrc/abstract/dshape.cc index 183ec772fffe96dcfa9f819236f5a4a2fe1c0dd1..74ea1ff7bfe350736ec87e5cd937b3e8905b4635 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/dshape.cc +++ b/mindspore/ccsrc/abstract/dshape.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" #include #include diff --git a/mindspore/ccsrc/pipeline/static_analysis/dshape.h b/mindspore/ccsrc/abstract/dshape.h similarity index 96% rename from mindspore/ccsrc/pipeline/static_analysis/dshape.h rename to mindspore/ccsrc/abstract/dshape.h index 3e850e309b4734273b5f9cfc74f079adf9571eba..b9b8e93292f62c9e846172d570a6e059f43d5815 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/dshape.h +++ b/mindspore/ccsrc/abstract/dshape.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef PIPELINE_STATIC_ANALYSIS_DSHAPE_H_ -#define PIPELINE_STATIC_ANALYSIS_DSHAPE_H_ +#ifndef MINDSPORE_CCSRC_ABSTRACT_DSHAPE_H_ +#define MINDSPORE_CCSRC_ABSTRACT_DSHAPE_H_ #include #include @@ -27,7 +27,7 @@ #include #include "utils/log_adapter.h" -#include "ir/base.h" +#include "base/base.h" namespace mindspore { namespace abstract { @@ -132,4 +132,4 @@ using ListShapePtr = std::shared_ptr; } // namespace abstract } // namespace mindspore -#endif // PIPELINE_STATIC_ANALYSIS_DSHAPE_H_ +#endif // MINDSPORE_CCSRC_ABSTRACT_DSHAPE_H_ diff --git a/mindspore/ccsrc/pipeline/static_analysis/param_validator.cc b/mindspore/ccsrc/abstract/param_validator.cc similarity index 98% rename from mindspore/ccsrc/pipeline/static_analysis/param_validator.cc rename to mindspore/ccsrc/abstract/param_validator.cc index 2cbd33c162671ba9cfc90c6260094310c70989c1..69fe88b4a3d9c153e9c79dbc99bd2c50b5f51afa 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/param_validator.cc +++ b/mindspore/ccsrc/abstract/param_validator.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include #include #include #include "utils/symbolic.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/param_validator.h b/mindspore/ccsrc/abstract/param_validator.h similarity index 93% rename from mindspore/ccsrc/pipeline/static_analysis/param_validator.h rename to mindspore/ccsrc/abstract/param_validator.h index daa436d66df43087b4cb0e521d8ad9e783948370..434235abda3e827f4eeb91c0f4fb0c3d34f08ce8 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/param_validator.h +++ b/mindspore/ccsrc/abstract/param_validator.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef PIPELINE_STATIC_ANALYSIS_PARAM_VALIDATOR_H_ -#define PIPELINE_STATIC_ANALYSIS_PARAM_VALIDATOR_H_ +#ifndef MINDSPORE_CCSRC_ABSTRACT_PARAM_VALIDATOR_H_ +#define MINDSPORE_CCSRC_ABSTRACT_PARAM_VALIDATOR_H_ #include #include #include #include -#include "pipeline/static_analysis/abstract_value.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/abstract_value.h" +#include "abstract/utils.h" #include "utils/any.h" #include "ir/primitive.h" @@ -97,4 +97,4 @@ void CheckArgsSpec(const AbstractBasePtrList &args_list) { } // namespace abstract } // namespace mindspore -#endif // PIPELINE_STATIC_ANALYSIS_PARAM_VALIDATOR_H_ +#endif // MINDSPORE_CCSRC_ABSTRACT_PARAM_VALIDATOR_H_ diff --git a/mindspore/ccsrc/pipeline/static_analysis/utils.cc b/mindspore/ccsrc/abstract/utils.cc similarity index 98% rename from mindspore/ccsrc/pipeline/static_analysis/utils.cc rename to mindspore/ccsrc/abstract/utils.cc index 4c399f6ffc1f9d2a41081d96b61bc5c05f36281f..16497c74a9b2db4828ac5ce557c74317332e82de 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/utils.cc +++ b/mindspore/ccsrc/abstract/utils.cc @@ -16,13 +16,13 @@ * limitations under the License. */ -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include #include #include #include "utils/symbolic.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/utils.h b/mindspore/ccsrc/abstract/utils.h similarity index 91% rename from mindspore/ccsrc/pipeline/static_analysis/utils.h rename to mindspore/ccsrc/abstract/utils.h index 97227dbbe36650ef61456662bda6fa6b91abd1a6..be38ae860da0d3dda878c0ab592aad6fcab4be8a 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/utils.h +++ b/mindspore/ccsrc/abstract/utils.h @@ -16,14 +16,14 @@ * limitations under the License. */ -#ifndef PIPELINE_STATIC_ANALYSIS_UTILS_H_ -#define PIPELINE_STATIC_ANALYSIS_UTILS_H_ +#ifndef MINDSPORE_CCSRC_ABSTRACT_UTILS_H_ +#define MINDSPORE_CCSRC_ABSTRACT_UTILS_H_ #include #include #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "utils/any.h" #include "utils/misc.h" #include "utils/convert_utils.h" @@ -53,4 +53,4 @@ int GetPositiveAxis(int axis_value, size_t increment); ShapePtr GetBroadcastShape(const std::string &op, const AbstractTensorPtr &tensor_x, const AbstractTensorPtr &tensor_y); } // namespace abstract } // namespace mindspore -#endif // PIPELINE_STATIC_ANALYSIS_UTILS_H_ +#endif // MINDSPORE_CCSRC_ABSTRACT_UTILS_H_ diff --git a/mindspore/ccsrc/base/CMakeLists.txt b/mindspore/ccsrc/base/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..d65b91a8249e013217edf4e967742556aea16aea --- /dev/null +++ b/mindspore/ccsrc/base/CMakeLists.txt @@ -0,0 +1,3 @@ +file(GLOB_RECURSE _BASE_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +set_property(SOURCE ${_BASE_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_BASE) +add_library(_mindspore_base_obj OBJECT ${_BASE_ALL_SRC_FILES}) diff --git a/mindspore/ccsrc/ir/base.cc b/mindspore/ccsrc/base/base.cc similarity index 98% rename from mindspore/ccsrc/ir/base.cc rename to mindspore/ccsrc/base/base.cc index 7a03269ad8f5bb814656b48fe659d59f2e255248..07ed252e962e43a777e5c3f1ec9b0deb4af32ab2 100644 --- a/mindspore/ccsrc/ir/base.cc +++ b/mindspore/ccsrc/base/base.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ir/base.h" +#include "base/base.h" #include #include #include diff --git a/mindspore/ccsrc/ir/base.h b/mindspore/ccsrc/base/base.h similarity index 97% rename from mindspore/ccsrc/ir/base.h rename to mindspore/ccsrc/base/base.h index 7dc4145837b6c2c807aa4582368e2bcac57fdc81..8e1a447c0df6c397a497635107fc3115cbba28ae 100644 --- a/mindspore/ccsrc/ir/base.h +++ b/mindspore/ccsrc/base/base.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_IR_BASE_H_ -#define MINDSPORE_CCSRC_IR_BASE_H_ +#ifndef MINDSPORE_CCSRC_BASE_BASE_H_ +#define MINDSPORE_CCSRC_BASE_BASE_H_ #include #include @@ -149,4 +149,4 @@ struct MS_EXPORT TypeIdManager { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_IR_BASE_H_ +#endif // MINDSPORE_CCSRC_BASE_BASE_H_ diff --git a/mindspore/ccsrc/common.h b/mindspore/ccsrc/common.h index 0928dcfcf6800dfe3e7e7ca42b766d64da5fa130..a545be32c76bb54a5e234da0c5c2c934e352a7bc 100644 --- a/mindspore/ccsrc/common.h +++ b/mindspore/ccsrc/common.h @@ -23,8 +23,8 @@ #include "pybind11/pybind11.h" #include "pybind11/stl.h" -#include "pipeline/static_analysis/dshape.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/dshape.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/abstract_function.h" #include "pipeline/parse/python_adapter.h" #include "pipeline/parse/parse.h" diff --git a/mindspore/ccsrc/debug/info.h b/mindspore/ccsrc/debug/info.h index c09c6031b3d175ede7f3e29ff2c92b739074b5c9..39475a4606fbd881ad8c344c220420a5dae5a18b 100644 --- a/mindspore/ccsrc/debug/info.h +++ b/mindspore/ccsrc/debug/info.h @@ -24,7 +24,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "debug/trace_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/trace_info.h b/mindspore/ccsrc/debug/trace_info.h index cf4f0c080ad7999b420df7fa7d2cae4504c71a2c..62908cb449e8a9aa1e5fc75185a1df7a5d2cee95 100644 --- a/mindspore/ccsrc/debug/trace_info.h +++ b/mindspore/ccsrc/debug/trace_info.h @@ -24,7 +24,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" namespace mindspore { class TraceInfo; diff --git a/mindspore/ccsrc/gvar/typeid_manager.cc b/mindspore/ccsrc/gvar/typeid_manager.cc index f40052411ab66636ce73778b6d8bfb44bef2dfb1..bc74f3a0df04074fe0a8bc0b196f7608c095cf77 100644 --- a/mindspore/ccsrc/gvar/typeid_manager.cc +++ b/mindspore/ccsrc/gvar/typeid_manager.cc @@ -20,7 +20,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/anf.h b/mindspore/ccsrc/ir/anf.h index fcfe14c1f7df22dfabfef7f0ebac1f36cf9cfba3..9df4d71c402e9d2444d2f8c272050f3907daf29a 100644 --- a/mindspore/ccsrc/ir/anf.h +++ b/mindspore/ccsrc/ir/anf.h @@ -26,7 +26,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "debug/info.h" #include "ir/scope.h" diff --git a/mindspore/ccsrc/ir/dtype.h b/mindspore/ccsrc/ir/dtype.h index f10c56e659459b1c039c255353ad3975b8bcca69..dc277c031c652232aa63d1bb833e8c342e004566 100644 --- a/mindspore/ccsrc/ir/dtype.h +++ b/mindspore/ccsrc/ir/dtype.h @@ -28,7 +28,7 @@ #include #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/ir/dtype/container.h b/mindspore/ccsrc/ir/dtype/container.h index 0612d24c4dd6d4ebf671613d22f0109bef4077aa..29579fe73cf1d182f9213838a27f3d1acd1f28df 100644 --- a/mindspore/ccsrc/ir/dtype/container.h +++ b/mindspore/ccsrc/ir/dtype/container.h @@ -29,7 +29,7 @@ #include #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/ir/dtype/empty.h b/mindspore/ccsrc/ir/dtype/empty.h index e3b46ec7d9a28257f59f7e1d4fbc381830cf956b..e6149a1fce8db7a18b85a97b8ac315007adec98d 100644 --- a/mindspore/ccsrc/ir/dtype/empty.h +++ b/mindspore/ccsrc/ir/dtype/empty.h @@ -29,7 +29,7 @@ #include #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/ir/dtype/number.h b/mindspore/ccsrc/ir/dtype/number.h index f8a746f8d686a0c81aaf3c7d4cbebc0fb9df81d1..8997ddc4dfe4b69a2477c6349f923e882d8b8933 100644 --- a/mindspore/ccsrc/ir/dtype/number.h +++ b/mindspore/ccsrc/ir/dtype/number.h @@ -29,7 +29,7 @@ #include #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/ir/dtype/ref.h b/mindspore/ccsrc/ir/dtype/ref.h index 7d8159289f09cf53a14b5a2120ac0d9c61cb01db..e798d72af54ea943438995369d2a316e058398c3 100644 --- a/mindspore/ccsrc/ir/dtype/ref.h +++ b/mindspore/ccsrc/ir/dtype/ref.h @@ -29,7 +29,7 @@ #include #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/ir/dtype/type.h b/mindspore/ccsrc/ir/dtype/type.h index cba0d17fce15628a51e8b67e557cd02a08ea25d4..2e38e8ffb68fcbfae71ea899da4b5f50bd24e664 100644 --- a/mindspore/ccsrc/ir/dtype/type.h +++ b/mindspore/ccsrc/ir/dtype/type.h @@ -32,7 +32,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/named.h" #include "ir/dtype/type_id.h" diff --git a/mindspore/ccsrc/ir/dtype/type_extends.cc b/mindspore/ccsrc/ir/dtype/type_extends.cc index a77a6a9cbae24518cf35fe738cbb69a40cc21f08..771a460c174425c4b4ac113b8ed9af091d499b7d 100644 --- a/mindspore/ccsrc/ir/dtype/type_extends.cc +++ b/mindspore/ccsrc/ir/dtype/type_extends.cc @@ -15,7 +15,7 @@ */ #include "ir/dtype/type.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { abstract::AbstractBasePtr Type::ToAbstract() { diff --git a/mindspore/ccsrc/ir/dtype_extends.cc b/mindspore/ccsrc/ir/dtype_extends.cc index b41631c1ce07819f56cd5b3ac3fd5e6035b8e768..099748217edc62c19a7d9abd87884a1d36f24eef 100644 --- a/mindspore/ccsrc/ir/dtype_extends.cc +++ b/mindspore/ccsrc/ir/dtype_extends.cc @@ -19,7 +19,7 @@ #include #include #include "utils/log_adapter.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { TypePtr TypeAnything::DeepCopy() const { return kAnyType; } diff --git a/mindspore/ccsrc/ir/dtype_py.cc b/mindspore/ccsrc/ir/dtype_py.cc index c8b34a48e926d8a589b368b35a88ee4f02fdb726..66bd8ba5f6f77f89fdc690513e19348a8bb942db 100644 --- a/mindspore/ccsrc/ir/dtype_py.cc +++ b/mindspore/ccsrc/ir/dtype_py.cc @@ -19,7 +19,7 @@ #include #include #include "utils/log_adapter.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pybind_api/api_register.h" #include "pybind_api/export_flags.h" diff --git a/mindspore/ccsrc/ir/func_graph_extends.cc b/mindspore/ccsrc/ir/func_graph_extends.cc index ad7aa6ee0cb38b86357b1240703b7e3b714f6193..02f37f343dc620e7a45c84aea05814d7b72bdfa6 100644 --- a/mindspore/ccsrc/ir/func_graph_extends.cc +++ b/mindspore/ccsrc/ir/func_graph_extends.cc @@ -24,7 +24,7 @@ #include "ir/func_graph_cloner.h" #include "operator/ops.h" #include "utils/ordered_set.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/static_analysis.h" #include "pipeline/static_analysis/abstract_function.h" diff --git a/mindspore/ccsrc/ir/meta_func_graph.h b/mindspore/ccsrc/ir/meta_func_graph.h index 8b43bafe7feaa38d534f4dd789ac1b5f54362239..bc7fb78957c2ec2a6015a39e5df322b9d070ffa4 100644 --- a/mindspore/ccsrc/ir/meta_func_graph.h +++ b/mindspore/ccsrc/ir/meta_func_graph.h @@ -30,7 +30,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/signature.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { // namespace to support intermediate representation definition diff --git a/mindspore/ccsrc/ir/meta_tensor.h b/mindspore/ccsrc/ir/meta_tensor.h index a8c07d6992c6dd50bea2f7b0c39a4c3e4175d3c6..00106215e8aee4b37a7949023d0d1071aa8321e3 100644 --- a/mindspore/ccsrc/ir/meta_tensor.h +++ b/mindspore/ccsrc/ir/meta_tensor.h @@ -22,7 +22,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/dtype.h" #include "utils/convert_utils.h" #include "utils/hashing.h" diff --git a/mindspore/ccsrc/ir/meta_tensor_extends.cc b/mindspore/ccsrc/ir/meta_tensor_extends.cc index 87f1db95e5cf67b22660bae4f64b057e804d8bf9..d73aa193742d01bb8ba989fc9aa63ee027ff4431 100644 --- a/mindspore/ccsrc/ir/meta_tensor_extends.cc +++ b/mindspore/ccsrc/ir/meta_tensor_extends.cc @@ -22,7 +22,7 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace tensor { diff --git a/mindspore/ccsrc/ir/named.cc b/mindspore/ccsrc/ir/named.cc index 9e1a7968b8d3246ad06c3e192ec708b77ac4c83d..802f0c8693a460356a974f7d9df4b728bedc0041 100644 --- a/mindspore/ccsrc/ir/named.cc +++ b/mindspore/ccsrc/ir/named.cc @@ -15,7 +15,7 @@ */ #include "ir/named.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { bool Named::operator==(const Value &other) const { diff --git a/mindspore/ccsrc/ir/primitive.h b/mindspore/ccsrc/ir/primitive.h index 9732e173ac69e9c3b253fdf6b10d3f1e981022aa..2a4d689ae95097884fc874230c6ce07415cb78ef 100644 --- a/mindspore/ccsrc/ir/primitive.h +++ b/mindspore/ccsrc/ir/primitive.h @@ -24,9 +24,10 @@ #include #include "ir/dtype/type.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "parallel/ops_info/operator_info.h" #include "utils/base_ref_extends.h" + namespace mindspore { // Supported meta type enum PrimType { diff --git a/mindspore/ccsrc/ir/primitive_py.h b/mindspore/ccsrc/ir/primitive_py.h index 96acc831f2f3495387efeb4f63e6dade9e921f71..7dc26d15612c806f107af15e084c3fd89de98f92 100644 --- a/mindspore/ccsrc/ir/primitive_py.h +++ b/mindspore/ccsrc/ir/primitive_py.h @@ -24,13 +24,14 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "utils/misc.h" #include "pybind11/pybind11.h" #include "utils/log_adapter.h" #include "ir/primitive.h" #include "ir/signature.h" #include "parallel/ops_info/operator_info.h" + namespace py = pybind11; namespace mindspore { class PrimitivePy : public Primitive { diff --git a/mindspore/ccsrc/ir/scalar.h b/mindspore/ccsrc/ir/scalar.h index e8e29fb2f916c510250ace61909f90b9216691e0..adae8c65f9f916471ae96bb4b16c792e437a38bd 100644 --- a/mindspore/ccsrc/ir/scalar.h +++ b/mindspore/ccsrc/ir/scalar.h @@ -27,7 +27,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/dtype.h" #include "ir/dtype/number.h" diff --git a/mindspore/ccsrc/ir/tensor.cc b/mindspore/ccsrc/ir/tensor.cc index 093a39db4774e5b9210ebed8d341ad9a2db0f960..b2a2f38915344b653d20c1e7caa472a03472c4df 100644 --- a/mindspore/ccsrc/ir/tensor.cc +++ b/mindspore/ccsrc/ir/tensor.cc @@ -29,7 +29,7 @@ #include #include "device/device_address.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace tensor { diff --git a/mindspore/ccsrc/ir/tensor_py.cc b/mindspore/ccsrc/ir/tensor_py.cc index 518db0f093fc462d8a1899569aff39c7147e4e75..25339cff5b93c57b3f0fd2447e73b4a7a905bcdc 100644 --- a/mindspore/ccsrc/ir/tensor_py.cc +++ b/mindspore/ccsrc/ir/tensor_py.cc @@ -25,7 +25,7 @@ #include "device/device_address.h" #include "pybind_api/api_register.h" #include "pybind_api/export_flags.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace tensor { diff --git a/mindspore/ccsrc/ir/value.h b/mindspore/ccsrc/ir/value.h index ea9bb47ffe12a2252e0dc22612c1b4626afcd4d0..535de81adf0ca173e05d247f7df98ccfe5c70eee 100644 --- a/mindspore/ccsrc/ir/value.h +++ b/mindspore/ccsrc/ir/value.h @@ -25,7 +25,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/anf.h" #include "ir/dtype.h" #include "ir/scalar.h" diff --git a/mindspore/ccsrc/ir/value_extends.cc b/mindspore/ccsrc/ir/value_extends.cc index f5f9bb8f28477959a1e1998dcbc97276001f725d..c75da806650a253a9d37d544ba5108cdd69d2990 100644 --- a/mindspore/ccsrc/ir/value_extends.cc +++ b/mindspore/ccsrc/ir/value_extends.cc @@ -20,7 +20,7 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { using ContextPtr = abstract::AnalysisContextPtr; diff --git a/mindspore/ccsrc/ir/value_py.cc b/mindspore/ccsrc/ir/value_py.cc index 7207cd06d6d30210f019570e234fe1e5faa05d31..1d80c74c4d71a02822c5b72104ee8a5ec3e830ae 100644 --- a/mindspore/ccsrc/ir/value_py.cc +++ b/mindspore/ccsrc/ir/value_py.cc @@ -18,7 +18,7 @@ #include #include "pybind_api/api_register.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { // Define python 'RefKey' class. diff --git a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h b/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h index 3a1145140f86f60368bafe9730219d6a02ab801b..d6158907378ac8ca253717da7f421530340f347c 100644 --- a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h +++ b/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ #include "kernel/kernel.h" -#include "ir/base.h" +#include "base/base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/kernel.h b/mindspore/ccsrc/kernel/kernel.h index a15f6b16e7a38a1cb0b02fdff703d27cd7f982b1..2d240338f3c660edbf2e14d8318daccbf9b40570 100644 --- a/mindspore/ccsrc/kernel/kernel.h +++ b/mindspore/ccsrc/kernel/kernel.h @@ -23,7 +23,7 @@ #include "ir/dtype.h" #include "utils/utils.h" #include "ir/tensor.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_adapter.h b/mindspore/ccsrc/kernel/tbe/tbe_adapter.h index 51c4cfd777f7de04be03fd0be8781c8dee20ed12..354bcb3ebd25184eaf9f8dd0a23e9b249d5e7ec2 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_adapter.h +++ b/mindspore/ccsrc/kernel/tbe/tbe_adapter.h @@ -21,7 +21,7 @@ #include #include #include "nlohmann/json.hpp" -#include "ir/base.h" +#include "base/base.h" #include "kernel/oplib/opinfo.h" // Note: This file is mainly used to adapt the ME front-end operator description and // the TBE back-end operator implementation difference diff --git a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h b/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h index 2c8d3008b9a5b861689ca6903f08d6099c95146d..3fc52becc2cf56b8c676320308bb7d876291a441 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h +++ b/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h @@ -19,7 +19,7 @@ #include #include "kernel/kernel.h" -#include "ir/base.h" +#include "base/base.h" #include "ir/dtype/type.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/composite/composite.cc b/mindspore/ccsrc/operator/composite/composite.cc index 75532b9fbdf892094625f83c74ea49c9090bf197..db3055ad9aade5ff8d37f473d79013ec1c3a348a 100644 --- a/mindspore/ccsrc/operator/composite/composite.cc +++ b/mindspore/ccsrc/operator/composite/composite.cc @@ -24,10 +24,10 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/abstract_function.h" -#include "pipeline/static_analysis/dshape.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/dshape.h" +#include "abstract/param_validator.h" #include "operator/cc_implementations.h" #include "optimizer/opt.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/composite/do_signature.cc b/mindspore/ccsrc/operator/composite/do_signature.cc index 7e34026d1e4e9ab4fe3bc72e721e0a1cd3fa0941..90ecfdb9f932edb840b91d4de7c85199b3beb7c5 100644 --- a/mindspore/ccsrc/operator/composite/do_signature.cc +++ b/mindspore/ccsrc/operator/composite/do_signature.cc @@ -18,10 +18,10 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "ir/anf.h" -#include "pipeline/static_analysis/dshape.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/dshape.h" +#include "abstract/param_validator.h" #include "operator/cc_implementations.h" #include "optimizer/opt.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/composite/list_append_operation.cc b/mindspore/ccsrc/operator/composite/list_append_operation.cc index 236a5b7062aaad8de029463c0a5a1367e93cff61..076ae5d41b050e16925afde66e622f1be2f65763 100644 --- a/mindspore/ccsrc/operator/composite/list_append_operation.cc +++ b/mindspore/ccsrc/operator/composite/list_append_operation.cc @@ -20,7 +20,7 @@ #include #include -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include "optimizer/opt.h" #include "pybind_api/api_register.h" diff --git a/mindspore/ccsrc/operator/composite/map.cc b/mindspore/ccsrc/operator/composite/map.cc index 2149285323bd1d715383f6c1fe46075ca2b37ab6..eb8b4b6df1b38bfe5fd9419f69c4aceca535b7fc 100644 --- a/mindspore/ccsrc/operator/composite/map.cc +++ b/mindspore/ccsrc/operator/composite/map.cc @@ -22,9 +22,9 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/abstract_function.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" #include "pybind_api/api_register.h" #include "debug/trace.h" #include "operator/ops.h" diff --git a/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc b/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc index 7919ea5f4f4fe7307dc5d402769cdcaf330ad545..bc51bb63953d8df08354584505842bb172c2b1e3 100644 --- a/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc +++ b/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc @@ -24,10 +24,10 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/abstract_function.h" -#include "pipeline/static_analysis/dshape.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/dshape.h" +#include "abstract/param_validator.h" #include "operator/cc_implementations.h" #include "optimizer/opt.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/operator/composite/unpack_call.cc b/mindspore/ccsrc/operator/composite/unpack_call.cc index 3993d415973e27a2d6c39fa72af29d530c19a57f..96298c92506cce7d6ce53998310095587ab9f1e4 100644 --- a/mindspore/ccsrc/operator/composite/unpack_call.cc +++ b/mindspore/ccsrc/operator/composite/unpack_call.cc @@ -19,9 +19,9 @@ #include #include "./common.h" -#include "pipeline/static_analysis/abstract_value.h" -#include "pipeline/static_analysis/dshape.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/abstract_value.h" +#include "abstract/dshape.h" +#include "abstract/param_validator.h" #include "operator/cc_implementations.h" #include "ir/anf.h" #include "optimizer/opt.h" diff --git a/mindspore/ccsrc/operator/composite/zip_operation.cc b/mindspore/ccsrc/operator/composite/zip_operation.cc index 38f2b5161481d9e94ce4826488fa852d35256adf..89118c7b3b244ed80c0de26eb7116ce19bd54a29 100644 --- a/mindspore/ccsrc/operator/composite/zip_operation.cc +++ b/mindspore/ccsrc/operator/composite/zip_operation.cc @@ -19,9 +19,9 @@ #include "operator/composite/zip_operation.h" #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "ir/anf.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" #include "operator/cc_implementations.h" #include "optimizer/opt.h" #include "pybind_api/api_register.h" diff --git a/mindspore/ccsrc/operator/prim_arrays.cc b/mindspore/ccsrc/operator/prim_arrays.cc index 237ca795eb95324fe46d77f1fba9192061eef243..4e2e2ebd1f41cf798432165751c170e52f40192f 100644 --- a/mindspore/ccsrc/operator/prim_arrays.cc +++ b/mindspore/ccsrc/operator/prim_arrays.cc @@ -16,9 +16,9 @@ #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "operator/cc_implementations.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/operator/prim_debug.cc b/mindspore/ccsrc/operator/prim_debug.cc index 5e6cdcc3183ec37308ed94bbb935aaf0d812f15a..014797fb208b18fd500cca0fc4dbf4255c5c00e5 100644 --- a/mindspore/ccsrc/operator/prim_debug.cc +++ b/mindspore/ccsrc/operator/prim_debug.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/prim_maths.cc b/mindspore/ccsrc/operator/prim_maths.cc index 02b86603e747b6a19d5e36ea12977691d7499806..e073a3630b25719d25c6ea8d58aa3433ad4f5e27 100644 --- a/mindspore/ccsrc/operator/prim_maths.cc +++ b/mindspore/ccsrc/operator/prim_maths.cc @@ -16,8 +16,8 @@ #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/utils.h" +#include "abstract/param_validator.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/prim_nn.cc b/mindspore/ccsrc/operator/prim_nn.cc index d9a007175712e266b81c3eede4cf973578e07ebf..729674cace273b6329c26f39c382c37455edf846 100644 --- a/mindspore/ccsrc/operator/prim_nn.cc +++ b/mindspore/ccsrc/operator/prim_nn.cc @@ -16,8 +16,8 @@ #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/utils.h" +#include "abstract/param_validator.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/operator/prim_others.cc b/mindspore/ccsrc/operator/prim_others.cc index c6c693b4d85f2a4c876c6e736f19490bd06c24f8..f181fcacf74379cec2dc58f17a92ceb4b2c923a4 100644 --- a/mindspore/ccsrc/operator/prim_others.cc +++ b/mindspore/ccsrc/operator/prim_others.cc @@ -20,9 +20,9 @@ #include "ir/dtype.h" #include "common/utils.h" #include "operator/ops.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include "pipeline/static_analysis/prim.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "utils/context/ms_context.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/prim_statement.cc b/mindspore/ccsrc/operator/prim_statement.cc index 89bcfe62186997460fbf21a9ccebd466b52a10f6..3760814554568b9541e534574b2205ed66654c68 100644 --- a/mindspore/ccsrc/operator/prim_statement.cc +++ b/mindspore/ccsrc/operator/prim_statement.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/prim_structures.cc b/mindspore/ccsrc/operator/prim_structures.cc index 3d0cba5e8379ad35ad2084d678997b8432ea0024..6501e6a8435f41760297a2228ec959633b609a65 100644 --- a/mindspore/ccsrc/operator/prim_structures.cc +++ b/mindspore/ccsrc/operator/prim_structures.cc @@ -17,8 +17,8 @@ */ #include "pipeline/static_analysis/prim.h" -#include "pipeline/static_analysis/utils.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/utils.h" +#include "abstract/param_validator.h" #include "operator/ops.h" #include "utils/convert_utils.h" #include "ir/tensor_py.h" diff --git a/mindspore/ccsrc/optimizer/clean.h b/mindspore/ccsrc/optimizer/clean.h index 0130ecfb32a29b35ad25f43be3f32516cfcf357c..672ee7841498be352bac438c49af14ae28352170 100644 --- a/mindspore/ccsrc/optimizer/clean.h +++ b/mindspore/ccsrc/optimizer/clean.h @@ -24,7 +24,7 @@ #include "operator/ops.h" #include "utils/any.h" #include "ir/manager.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h b/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h index d2e1d15f913da5af80043e83b49b3569f37dc9fd..cea002111cd9993c5a4973d9426fd3e1cf595892 100644 --- a/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h +++ b/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h @@ -25,7 +25,7 @@ #include "optimizer/optimizer.h" #include "ir/visitor.h" #include "operator/ops.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h b/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h index cafc8b796c4a08cf021a638bc9cebf7b10cbee38..e10ff5c678e344844e6737d3beeb641c57a3c92d 100644 --- a/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h +++ b/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h @@ -25,7 +25,7 @@ #include "operator/ops.h" #include "optimizer/irpass.h" #include "optimizer/optimizer.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/parallel/context.h b/mindspore/ccsrc/parallel/context.h index 6a503ca7eda609ab820cd64eaa6975890b1d66c0..76166f50cf8b614af2753d07eaf702518f51c5ea 100644 --- a/mindspore/ccsrc/parallel/context.h +++ b/mindspore/ccsrc/parallel/context.h @@ -29,7 +29,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "debug/info.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/node_info.h b/mindspore/ccsrc/parallel/graph_util/node_info.h index bda268e582f6ab618370991bee9d589f525a0dbe..6037c466cdbc1b6ee920150e88d30a54ae2ef376 100644 --- a/mindspore/ccsrc/parallel/graph_util/node_info.h +++ b/mindspore/ccsrc/parallel/graph_util/node_info.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_NODE_INFO_H_ #include -#include "ir/base.h" +#include "base/base.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.h b/mindspore/ccsrc/parallel/ops_info/operator_info.h index 21041c3e94b445b1cbb4c0434b6c2ddb7c3cbe71..a3e6bc2c06a9a7af6c06166f778f1c155110cafd 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.h +++ b/mindspore/ccsrc/parallel/ops_info/operator_info.h @@ -26,7 +26,7 @@ #include #include "common/utils.h" -#include "ir/base.h" +#include "base/base.h" #include "parallel/auto_parallel/costmodel.h" #include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/device_manager.h" diff --git a/mindspore/ccsrc/pipeline/action.cc b/mindspore/ccsrc/pipeline/action.cc index 3339c3aa4b154f99e749ad5caa26d72a16334e45..3648bc991e1646f0365fb73b979da63ff345206a 100644 --- a/mindspore/ccsrc/pipeline/action.cc +++ b/mindspore/ccsrc/pipeline/action.cc @@ -30,7 +30,7 @@ #include "pipeline/pass.h" #include "pipeline/parse/parse_base.h" #include "pipeline/parse/data_converter.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/static_analysis/static_analysis.h" #include "pipeline/static_analysis/program_specialize.h" #include "pipeline/resource.h" diff --git a/mindspore/ccsrc/pipeline/parse/resolve.h b/mindspore/ccsrc/pipeline/parse/resolve.h index df5c54855f0c950d150a83161476d4fef20c48f8..a84b533bd09e16b6e570c4332e5daa2cff3ada44 100644 --- a/mindspore/ccsrc/pipeline/parse/resolve.h +++ b/mindspore/ccsrc/pipeline/parse/resolve.h @@ -23,7 +23,7 @@ #include "ir/manager.h" #include "pipeline/parse/python_adapter.h" #include "pipeline/parse/parse_base.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "utils/log_adapter.h" // forward declaration of ResourceBase diff --git a/mindspore/ccsrc/pipeline/pipeline_ge.cc b/mindspore/ccsrc/pipeline/pipeline_ge.cc index 8ec16023157a859b1ab6495d552167d1c634eca0..ffc907f6984f27524984e19cd42755093db22007 100644 --- a/mindspore/ccsrc/pipeline/pipeline_ge.cc +++ b/mindspore/ccsrc/pipeline/pipeline_ge.cc @@ -29,7 +29,7 @@ #include "transform/graph_builder.h" #include "transform/graph_runner.h" #include "debug/draw.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/remove_value_node_dup.h b/mindspore/ccsrc/pipeline/remove_value_node_dup.h index 8f670c7dcfdc3e3dbefe375396a519c8a15b8bd9..b36544bdbad2916f9ba2a2ecdc9232a09065efa3 100644 --- a/mindspore/ccsrc/pipeline/remove_value_node_dup.h +++ b/mindspore/ccsrc/pipeline/remove_value_node_dup.h @@ -19,7 +19,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "ir/manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc b/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc index ced4a518cb812184fcab988b013fdbebb20e8509..cd768f751582baccaf9afc66c0fc7bb462c7a18f 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc +++ b/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc @@ -18,7 +18,6 @@ #include -#include "pipeline/static_analysis/analysis_context.h" #include "pipeline/static_analysis/static_analysis.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.h b/mindspore/ccsrc/pipeline/static_analysis/abstract_function.h index 9e1cf9ba83d3b44011ea79cb8154fa90e21b2ef7..0823b21cd76c64dbab807da8930a83561eed92a0 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.h +++ b/mindspore/ccsrc/pipeline/static_analysis/abstract_function.h @@ -22,8 +22,8 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" -#include "pipeline/static_analysis/analysis_context.h" +#include "abstract/abstract_value.h" +#include "abstract/analysis_context.h" #include "ir/meta_func_graph.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc b/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc index a95f686199d831e760b31a05430119b4485c2ce1..14ebeb0fc7c27f0d78bcea9e18c1ba6d4da00b58 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc +++ b/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc @@ -20,7 +20,7 @@ #include #include "ir/func_graph_cloner.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "debug/trace.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/prim.cc b/mindspore/ccsrc/pipeline/static_analysis/prim.cc index 19aeceb19be4bde31ac98a8ba8dc23ed3eef5c26..bf16bb52370c7ad3b57887d1440ff52e110d6a82 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/prim.cc +++ b/mindspore/ccsrc/pipeline/static_analysis/prim.cc @@ -29,7 +29,7 @@ #include "operator/ops.h" #include "operator/composite/do_signature.h" #include "operator/prim_to_function.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "utils/symbolic.h" #include "./common.h" #include "pipeline/resource.h" @@ -38,7 +38,7 @@ #include "utils/convert_utils.h" #include "utils/context/ms_context.h" #include "pipeline/parse/data_converter.h" -#include "pipeline/static_analysis/param_validator.h" +#include "abstract/param_validator.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc b/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc index 54165766803fc280701350d681dbba29efbfd129..53c2c064b4cb8ef168c2f2cdeda19e6e61c51732 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc +++ b/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc @@ -21,7 +21,7 @@ #include #include -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h b/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h index c33ea9f588cbe63c5e7c5373bc72f2b1318e50c6..d4a3fd6a8d0f0147575c65873471f654ab75a6c6 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h +++ b/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h @@ -34,7 +34,7 @@ #include "utils/log_adapter.h" #include "ir/anf.h" #include "ir/primitive_py.h" -#include "pipeline/static_analysis/analysis_context.h" +#include "abstract/analysis_context.h" #include "pipeline/static_analysis/abstract_function.h" #include "pipeline/parse/parse.h" diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc index 1a62b7a5bef651e21f27537be6a19adcf2953767..debe9e8351315bef62b0b278d3a1da751e4758fa 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc +++ b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc @@ -20,7 +20,7 @@ #include "ir/primitive.h" #include "utils/utils.h" #include "operator/ops.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pre_activate/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc index 424d3a12c163335a3fcceace2f39c8e694c8c86c..e9d28c32dca5ea8289668c0c9db1e468cfbdbbe6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc +++ b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc @@ -20,7 +20,7 @@ #include "ir/primitive.h" #include "utils/utils.h" #include "operator/ops.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pre_activate/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc index d49b2d47f36b289ba44e08b7059760f49362793c..41c0b21d10e831d440bb67aaecbe82198a7bdc17 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc +++ b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc @@ -22,7 +22,7 @@ #include "session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pre_activate/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc index 2f3c998bb8f3d5cacb760e4ec078e7501937ef50..252e586f629429299102b610d48c8f6aa9c96290 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc +++ b/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc @@ -19,7 +19,7 @@ #include "session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pre_activate/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h b/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h index 91e83600f2940f08733928129d5740ee2671169b..bdee5ee84ae43397d52ce711050806ff69fe6625 100644 --- a/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h +++ b/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_COMMON_FUSION_ID_ALLOCATOR_H_ #include -#include "ir/base.h" +#include "base/base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/pattern_engine.h b/mindspore/ccsrc/pre_activate/common/pattern_engine.h index 858b1aecb8854ea16ceae7d441f409ff54f207ef..ff38c504230e8c9e624664778d4bc51678c44bd4 100644 --- a/mindspore/ccsrc/pre_activate/common/pattern_engine.h +++ b/mindspore/ccsrc/pre_activate/common/pattern_engine.h @@ -34,7 +34,7 @@ #include #include "pre_activate/common/visit.h" -#include "ir/base.h" +#include "base/base.h" #include "utils/log_adapter.h" #include "utils/base_ref.h" diff --git a/mindspore/ccsrc/pre_activate/common/visit.h b/mindspore/ccsrc/pre_activate/common/visit.h index 2017b03b2fe00a363f43535118951c9cb90b4a8f..9799d3f9c10ba91232cacabb1a18fb7a91e94aba 100644 --- a/mindspore/ccsrc/pre_activate/common/visit.h +++ b/mindspore/ccsrc/pre_activate/common/visit.h @@ -26,7 +26,7 @@ #include #include -#include "ir/base.h" +#include "base/base.h" #include "utils/base_ref.h" // namespace to support utils definition diff --git a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc b/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc index b0e2ab044c74441fede7804ff060cf1b0484dbf6..ec2d23258458878dd700a130df2c8e0b8f4973b9 100644 --- a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc +++ b/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc @@ -20,7 +20,7 @@ #include "ir/primitive.h" #include "utils/context/ms_context.h" #include "utils/utils.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pre_activate/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/pynative/base.h b/mindspore/ccsrc/pynative/base.h index 4b4d44858ba47e6d30a0d76a86b94f8f30031286..afb6d0982ba69a81e48520281f258d2c0906fd37 100644 --- a/mindspore/ccsrc/pynative/base.h +++ b/mindspore/ccsrc/pynative/base.h @@ -27,7 +27,7 @@ #include "pybind11/pybind11.h" #include "ir/primitive_py.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" namespace mindspore { namespace pynative { diff --git a/mindspore/ccsrc/session/anf_runtime_algorithm.h b/mindspore/ccsrc/session/anf_runtime_algorithm.h index 82056197935094a39e69bb3f235865eed5f7c0b5..3238b1cecc9945cb498fc58b97b20b439c602f89 100644 --- a/mindspore/ccsrc/session/anf_runtime_algorithm.h +++ b/mindspore/ccsrc/session/anf_runtime_algorithm.h @@ -25,7 +25,7 @@ #include #include "ir/anf.h" #include "ir/dtype.h" -#include "ir/base.h" +#include "base/base.h" #include "ir/primitive.h" #include "device/device_address.h" #include "kernel/kernel.h" diff --git a/mindspore/ccsrc/utils/convert_utils.cc b/mindspore/ccsrc/utils/convert_utils.cc index 74e61a58011fa81c614ede308baa6f7614ae1407..a5a618dff4622c8c0db11f7b39234ae44d9df4be 100644 --- a/mindspore/ccsrc/utils/convert_utils.cc +++ b/mindspore/ccsrc/utils/convert_utils.cc @@ -25,7 +25,7 @@ #include #include "pybind11/pybind11.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "pipeline/parse/parse.h" #include "pipeline/parse/parse_base.h" #include "ir/value.h" diff --git a/mindspore/ccsrc/utils/convert_utils.h b/mindspore/ccsrc/utils/convert_utils.h index a6c9052eae8c3cacd28cbbd6dac0df90b754bbd8..d4ecbf4408dc1f2b9fece905a24c5353cf40961e 100644 --- a/mindspore/ccsrc/utils/convert_utils.h +++ b/mindspore/ccsrc/utils/convert_utils.h @@ -28,7 +28,7 @@ #include "utils/convert_utils_base.h" #include "utils/any.h" #include "utils/base_ref.h" -#include "ir/base.h" +#include "base/base.h" #include "ir/anf.h" namespace py = pybind11; diff --git a/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc b/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc index ac7fe1564a9edc1e3bc7bb67b9a83baacf7a79ce..d676be895e1fbc58c475e7fc010ac276b6092ffe 100644 --- a/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc +++ b/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc @@ -24,7 +24,7 @@ #include "ir/tensor.h" #include "ir/param_value.h" #include "operator/ops.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "proto/onnx.pb.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/utils/log_adapter.cc b/mindspore/ccsrc/utils/log_adapter.cc index 46682532d4e633d536be259b95fc06f052e1abee..1df9a3898786fba9a22b9212788df52f37f9445d 100644 --- a/mindspore/ccsrc/utils/log_adapter.cc +++ b/mindspore/ccsrc/utils/log_adapter.cc @@ -157,6 +157,7 @@ static std::string ExceptionTypeToString(ExceptionType type) { static const char *GetSubModuleName(SubModuleId module_id) { static const char *sub_module_names[NUM_SUBMODUES] = { "UNKNOWN", // SM_UNKNOWN + "BASE", // SM_BASE "ANALYZER", // SM_ANALYZER "COMMON", // SM_COMMON "DEBUG", // SM_DEBUG @@ -176,6 +177,7 @@ static const char *GetSubModuleName(SubModuleId module_id) { "SESSION", // SM_SESSION "UTILS", // SM_UTILS "VM" // SM_VM + "ABSTRACT" // SM_ABSTRACT }; return sub_module_names[module_id % NUM_SUBMODUES]; diff --git a/mindspore/ccsrc/utils/log_adapter.h b/mindspore/ccsrc/utils/log_adapter.h index 71dbf815e393d50aab2627185a816ab6e4669c01..a0e9bfc6d6b8a04b08860e480887ceea2d88b13c 100644 --- a/mindspore/ccsrc/utils/log_adapter.h +++ b/mindspore/ccsrc/utils/log_adapter.h @@ -100,6 +100,7 @@ enum MsLogLevel : int { DEBUG = 0, INFO, WARNING, ERROR, EXCEPTION }; enum SubModuleId : int { SM_UNKNOWN = 0, // unknown submodule + SM_BASE, // base SM_ANALYZER, // static analyzer SM_COMMON, // common SM_DEBUG, // debug @@ -119,6 +120,7 @@ enum SubModuleId : int { SM_SESSION, // session SM_UTILS, // utils SM_VM, // VM + SM_ABSTRACT, // abstract NUM_SUBMODUES // number of submodules }; diff --git a/mindspore/ccsrc/utils/symbolic.h b/mindspore/ccsrc/utils/symbolic.h index 1b7a212610a56b7e82dd8165779a19e954849184..ca68b2c8777fc720656dcc15671fe1cf9a84780f 100644 --- a/mindspore/ccsrc/utils/symbolic.h +++ b/mindspore/ccsrc/utils/symbolic.h @@ -26,7 +26,7 @@ #include #include "ir/anf.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "utils/any.h" namespace mindspore { diff --git a/mindspore/ccsrc/vm/transform.cc b/mindspore/ccsrc/vm/transform.cc index 378bf08a96f085b2a9472469c247d1ab80ce31b9..ccad0112c373bcb18d085fbc9894c0d1920e608b 100644 --- a/mindspore/ccsrc/vm/transform.cc +++ b/mindspore/ccsrc/vm/transform.cc @@ -26,7 +26,7 @@ #include #include -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #ifdef ENABLE_GE #include "transform/convert.h" #endif diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index c24f1db6ca1046b90374fff4b78fa1d21b7d4f09..65fbb43133aaa38bb338d9b5ed199c83e8247513 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -51,6 +51,8 @@ else() endif() file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "../../../mindspore/ccsrc/base/*.cc" + "../../../mindspore/ccsrc/abstract/*.cc" "../../../mindspore/ccsrc/ir/*.cc" "../../../mindspore/ccsrc/common/*.cc" "../../../mindspore/ccsrc/utils/*.cc" diff --git a/tests/ut/cpp/pipeline/static_analysis/abstract_test.cc b/tests/ut/cpp/abstract/abstract_test.cc similarity index 98% rename from tests/ut/cpp/pipeline/static_analysis/abstract_test.cc rename to tests/ut/cpp/abstract/abstract_test.cc index 93baf86c3eacdaaf3a2c66c19c72264f4503b9ac..ea0b5e5b61ecc058b0ea5553f04e8993fc17c3cf 100644 --- a/tests/ut/cpp/pipeline/static_analysis/abstract_test.cc +++ b/tests/ut/cpp/abstract/abstract_test.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "pipeline/static_analysis/static_analysis.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "pipeline/static_analysis/prim.h" #include "pipeline/parse/parse.h" #include "pipeline/parse/resolve.h" diff --git a/tests/ut/cpp/pipeline/static_analysis/dshape_test.cc b/tests/ut/cpp/abstract/dshape_test.cc similarity index 97% rename from tests/ut/cpp/pipeline/static_analysis/dshape_test.cc rename to tests/ut/cpp/abstract/dshape_test.cc index ae18f7730b752e0d2721a002f020c6f91e5572ff..da0e9ed3eef88fb9549e86585668431e47aab839 100644 --- a/tests/ut/cpp/pipeline/static_analysis/dshape_test.cc +++ b/tests/ut/cpp/abstract/dshape_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" -#include "pipeline/static_analysis/dshape.h" +#include "abstract/dshape.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/static_analysis/utils_test.cc b/tests/ut/cpp/abstract/utils_test.cc similarity index 97% rename from tests/ut/cpp/pipeline/static_analysis/utils_test.cc rename to tests/ut/cpp/abstract/utils_test.cc index dceef71b0249a2af08758c0ae8665b5d8fa9a0ed..fbc6b3c3e28929db72ffa8b6cbd9caf0b404d628 100644 --- a/tests/ut/cpp/pipeline/static_analysis/utils_test.cc +++ b/tests/ut/cpp/abstract/utils_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" #include "common/common_test.h" #include "pipeline/static_analysis/static_analysis.h" diff --git a/tests/ut/cpp/ir/base_test.cc b/tests/ut/cpp/base/base_test.cc similarity index 99% rename from tests/ut/cpp/ir/base_test.cc rename to tests/ut/cpp/base/base_test.cc index 0b4e8a637b46d4d0369f55677aaed4db8d479b53..71a7999e0f2a229c1c8cf080e026f93e16bed361 100644 --- a/tests/ut/cpp/ir/base_test.cc +++ b/tests/ut/cpp/base/base_test.cc @@ -17,7 +17,7 @@ #include "common/common_test.h" #include "utils/any.h" -#include "ir/base.h" +#include "base/base.h" #include "ir/anf.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/ir/value_test.cc b/tests/ut/cpp/ir/value_test.cc index a71ef7a57ff9ad578deedde24ec5529bc50d63a1..b4ed5f438ef0f0f735503176d25c83bed683b22d 100644 --- a/tests/ut/cpp/ir/value_test.cc +++ b/tests/ut/cpp/ir/value_test.cc @@ -21,7 +21,7 @@ #include "common/common_test.h" #include "ir/value.h" -#include "pipeline/static_analysis/abstract_value.h" +#include "abstract/abstract_value.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/static_analysis/data_test.cc b/tests/ut/cpp/pipeline/static_analysis/data_test.cc index 61a22bbe5fc4cb3f0511b7497b9cd302cd5b205f..d431dcc0ec8a30aea46aae4bdf7c28730d1a53d3 100644 --- a/tests/ut/cpp/pipeline/static_analysis/data_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/data_test.cc @@ -20,7 +20,7 @@ #include "common/py_func_graph_fetcher.h" #include "pipeline/static_analysis/prim.h" #include "operator/ops.h" -#include "pipeline/static_analysis/utils.h" +#include "abstract/utils.h" namespace mindspore { namespace abstract {