diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 58b3ce6881..176c7e576a 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 0000000000..fa331776b3 --- /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 a2f97cf3b0..7bef3829a6 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 f165808fa0..d922f93e70 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 4a43b14168..1ae6125838 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 c0b3403702..c0293d7e91 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 183ec772ff..74ea1ff7bf 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 3e850e309b..b9b8e93292 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 2cbd33c162..69fe88b4a3 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 daa436d66d..434235abda 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 4c399f6ffc..16497c74a9 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 97227dbbe3..be38ae860d 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 0000000000..d65b91a824 --- /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 7a03269ad8..07ed252e96 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 7dc4145837..8e1a447c0d 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 0928dcfcf6..a545be32c7 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 c09c6031b3..39475a4606 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 cf4f0c080a..62908cb449 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 f40052411a..bc74f3a0df 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 fcfe14c1f7..9df4d71c40 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 f10c56e659..dc277c031c 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 0612d24c4d..29579fe73c 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 e3b46ec7d9..e6149a1fce 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 f8a746f8d6..8997ddc4df 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 7d8159289f..e798d72af5 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 cba0d17fce..2e38e8ffb6 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 a77a6a9cba..771a460c17 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 b41631c1ce..099748217e 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 c8b34a48e9..66bd8ba5f6 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 ad7aa6ee0c..02f37f343d 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 8b43bafe7f..bc7fb78957 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 a8c07d6992..00106215e8 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 87f1db95e5..d73aa19374 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 9e1a7968b8..802f0c8693 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 9732e173ac..2a4d689ae9 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 96acc831f2..7dc26d1561 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 e8e29fb2f9..adae8c65f9 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 093a39db47..b2a2f38915 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 518db0f093..25339cff5b 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 ea9bb47ffe..535de81adf 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 f5f9bb8f28..c75da80665 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 7207cd06d6..1d80c74c4d 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 3a1145140f..d615890737 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 a15f6b16e7..2d240338f3 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 51c4cfd777..354bcb3ebd 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 2c8d3008b9..3fc52becc2 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 75532b9fbd..db3055ad9a 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 7e34026d1e..90ecfdb9f9 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 236a5b7062..076ae5d41b 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 2149285323..eb8b4b6df1 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 7919ea5f4f..bc51bb6395 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 3993d41597..96298c9250 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 38f2b51614..89118c7b3b 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 237ca795eb..4e2e2ebd1f 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 5e6cdcc318..014797fb20 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 02b86603e7..e073a3630b 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 d9a0071757..729674cace 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 c6c693b4d8..f181fcacf7 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 89bcfe6218..3760814554 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 3d0cba5e83..6501e6a843 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 0130ecfb32..672ee78414 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 d2e1d15f91..cea002111c 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 cafc8b796c..e10ff5c678 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 6a503ca7ed..76166f50cf 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 bda268e582..6037c466cd 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 21041c3e94..a3e6bc2c06 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 3339c3aa4b..3648bc991e 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 df5c54855f..a84b533bd0 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 8ec1602315..ffc907f698 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 8f670c7dcf..b36544bdba 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 ced4a518cb..cd768f7515 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 9e1cf9ba83..0823b21cd7 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 a95f686199..14ebeb0fc7 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 19aeceb19b..bf16bb5237 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 5416576680..53c2c064b4 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 c33ea9f588..d4a3fd6a8d 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 1a62b7a5be..debe9e8351 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 424d3a12c1..e9d28c32dc 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 d49b2d47f3..41c0b21d10 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 2f3c998bb8..252e586f62 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 91e83600f2..bdee5ee84a 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 858b1aecb8..ff38c50423 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 2017b03b2f..9799d3f9c1 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 b0e2ab044c..ec2d232584 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 4b4d44858b..afb6d0982b 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 8205619793..3238b1cecc 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 74e61a5801..a5a618dff4 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 a6c9052eae..d4ecbf4408 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 ac7fe1564a..d676be895e 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 46682532d4..1df9a38987 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 71dbf815e3..a0e9bfc6d6 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 1b7a212610..ca68b2c877 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 378bf08a96..ccad0112c3 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 c24f1db6ca..65fbb43133 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 93baf86c3e..ea0b5e5b61 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 ae18f7730b..da0e9ed3ee 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 dceef71b02..fbc6b3c3e2 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 0b4e8a637b..71a7999e0f 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 a71ef7a57f..b4ed5f438e 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 61a22bbe5f..d431dcc0ec 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 {