Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring for base and abstract types: Moving Base into base folder; Splitting the abstract type and infer&specialize routines;

This commit is contained in:
Zhang Qinghua 2020-07-13 15:48:30 +08:00
parent 83d7072a27
commit 87715ed127
100 changed files with 150 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/CMakeLists.txt
View File

@ -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})

3
mindspore/ccsrc/abstract/CMakeLists.txt Normal file
View File

@ -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})

5
mindspore/ccsrc/pipeline/static_analysis/abstract_value.cc → mindspore/ccsrc/abstract/abstract_value.cc
View File

@ -16,13 +16,12 @@
* limitations under the License.
*/
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
#include <algorithm>
#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 {

10
mindspore/ccsrc/pipeline/static_analysis/abstract_value.h → mindspore/ccsrc/abstract/abstract_value.h
View File

@ -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 <utility>
#include <vector>
@ -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_

2
mindspore/ccsrc/pipeline/static_analysis/analysis_context.cc → mindspore/ccsrc/abstract/analysis_context.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "pipeline/static_analysis/analysis_context.h"
#include "abstract/analysis_context.h"
#include <algorithm>

8
mindspore/ccsrc/pipeline/static_analysis/analysis_context.h → mindspore/ccsrc/abstract/analysis_context.h
View File

@ -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 <memory>
#include <string>
#include <unordered_map>
#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_

2
mindspore/ccsrc/pipeline/static_analysis/dshape.cc → mindspore/ccsrc/abstract/dshape.cc
View File

@ -16,7 +16,7 @@
* limitations under the License.
*/
#include "pipeline/static_analysis/dshape.h"
#include "abstract/dshape.h"
#include <exception>
#include <iostream>

8
mindspore/ccsrc/pipeline/static_analysis/dshape.h → mindspore/ccsrc/abstract/dshape.h
View File

@ -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 <vector>
#include <string>
@ -27,7 +27,7 @@
#include <memory>
#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<ListShape>;
} // namespace abstract
} // namespace mindspore
#endif // PIPELINE_STATIC_ANALYSIS_DSHAPE_H_
#endif // MINDSPORE_CCSRC_ABSTRACT_DSHAPE_H_

4
mindspore/ccsrc/pipeline/static_analysis/param_validator.cc → mindspore/ccsrc/abstract/param_validator.cc
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#include "pipeline/static_analysis/param_validator.h"
#include "abstract/param_validator.h"
#include <string>
#include <sstream>
#include <memory>
#include "utils/symbolic.h"
#include "pipeline/static_analysis/utils.h"
#include "abstract/utils.h"
namespace mindspore {
namespace abstract {

10
mindspore/ccsrc/pipeline/static_analysis/param_validator.h → mindspore/ccsrc/abstract/param_validator.h
View File

@ -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 <memory>
#include <string>
#include <utility>
#include <vector>
#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_

4
mindspore/ccsrc/pipeline/static_analysis/utils.cc → mindspore/ccsrc/abstract/utils.cc
View File

@ -16,13 +16,13 @@
* limitations under the License.
*/
#include "pipeline/static_analysis/utils.h"
#include "abstract/utils.h"
#include <string>
#include <sstream>
#include <memory>
#include "utils/symbolic.h"
#include "pipeline/static_analysis/param_validator.h"
#include "abstract/param_validator.h"
namespace mindspore {
namespace abstract {

8
mindspore/ccsrc/pipeline/static_analysis/utils.h → mindspore/ccsrc/abstract/utils.h
View File

@ -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 <vector>
#include <utility>
#include <memory>
#include <string>
#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_

3
mindspore/ccsrc/base/CMakeLists.txt Normal file
View File

@ -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})

2
mindspore/ccsrc/ir/base.cc → mindspore/ccsrc/base/base.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "ir/base.h"
#include "base/base.h"
#include <atomic>
#include <mutex>
#include <unordered_map>

6
mindspore/ccsrc/ir/base.h → mindspore/ccsrc/base/base.h
View File

@ -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 <atomic>
#include <iostream>
@ -149,4 +149,4 @@ struct MS_EXPORT TypeIdManager {
};
} // namespace mindspore
#endif // MINDSPORE_CCSRC_IR_BASE_H_
#endif // MINDSPORE_CCSRC_BASE_BASE_H_

4
mindspore/ccsrc/common.h
View File

@ -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"

2
mindspore/ccsrc/debug/info.h
View File

@ -24,7 +24,7 @@
#include <utility>
#include <vector>
#include "ir/base.h"
#include "base/base.h"
#include "debug/trace_info.h"
namespace mindspore {

2
mindspore/ccsrc/debug/trace_info.h
View File

@ -24,7 +24,7 @@
#include <utility>
#include <vector>
#include "ir/base.h"
#include "base/base.h"
namespace mindspore {
class TraceInfo;

2
mindspore/ccsrc/gvar/typeid_manager.cc
View File

@ -20,7 +20,7 @@
#include <mutex>
#include <unordered_map>
#include "ir/base.h"
#include "base/base.h"
namespace mindspore {

2
mindspore/ccsrc/ir/anf.h
View File

@ -26,7 +26,7 @@
#include <unordered_map>
#include <utility>
#include "ir/base.h"
#include "base/base.h"
#include "debug/info.h"
#include "ir/scope.h"

2
mindspore/ccsrc/ir/dtype.h
View File

@ -28,7 +28,7 @@
#include <type_traits>
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type.h"

2
mindspore/ccsrc/ir/dtype/container.h
View File

@ -29,7 +29,7 @@
#include <type_traits>
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type.h"

2
mindspore/ccsrc/ir/dtype/empty.h
View File

@ -29,7 +29,7 @@
#include <type_traits>
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type.h"

2
mindspore/ccsrc/ir/dtype/number.h
View File

@ -29,7 +29,7 @@
#include <type_traits>
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type.h"

2
mindspore/ccsrc/ir/dtype/ref.h
View File

@ -29,7 +29,7 @@
#include <type_traits>
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type.h"

2
mindspore/ccsrc/ir/dtype/type.h
View File

@ -32,7 +32,7 @@
#include <unordered_map>
#include <algorithm>
#include "ir/base.h"
#include "base/base.h"
#include "ir/named.h"
#include "ir/dtype/type_id.h"

2
mindspore/ccsrc/ir/dtype/type_extends.cc
View File

@ -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() {

2
mindspore/ccsrc/ir/dtype_extends.cc
View File

@ -19,7 +19,7 @@
#include <cstdlib>
#include <algorithm>
#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; }

2
mindspore/ccsrc/ir/dtype_py.cc
View File

@ -19,7 +19,7 @@
#include <cstdlib>
#include <algorithm>
#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"

2
mindspore/ccsrc/ir/func_graph_extends.cc
View File

@ -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"

2
mindspore/ccsrc/ir/meta_func_graph.h
View File

@ -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

2
mindspore/ccsrc/ir/meta_tensor.h
View File

@ -22,7 +22,7 @@
#include <memory>
#include <string>
#include "ir/base.h"
#include "base/base.h"
#include "ir/dtype.h"
#include "utils/convert_utils.h"
#include "utils/hashing.h"

2
mindspore/ccsrc/ir/meta_tensor_extends.cc
View File

@ -22,7 +22,7 @@
#include <sstream>
#include <string>
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
namespace mindspore {
namespace tensor {

2
mindspore/ccsrc/ir/named.cc
View File

@ -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 {

3
mindspore/ccsrc/ir/primitive.h
View File

@ -24,9 +24,10 @@
#include <tuple>
#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 {

3
mindspore/ccsrc/ir/primitive_py.h
View File

@ -24,13 +24,14 @@
#include <tuple>
#include <map>
#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 {

2
mindspore/ccsrc/ir/scalar.h
View File

@ -27,7 +27,7 @@
#include <utility>
#include <cfloat>
#include "ir/base.h"
#include "base/base.h"
#include "ir/dtype.h"
#include "ir/dtype/number.h"

2
mindspore/ccsrc/ir/tensor.cc
View File

@ -29,7 +29,7 @@
#include <typeinfo>
#include "device/device_address.h"
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
namespace mindspore {
namespace tensor {

2
mindspore/ccsrc/ir/tensor_py.cc
View File

@ -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 {

2
mindspore/ccsrc/ir/value.h
View File

@ -25,7 +25,7 @@
#include <sstream>
#include <utility>
#include "ir/base.h"
#include "base/base.h"
#include "ir/anf.h"
#include "ir/dtype.h"
#include "ir/scalar.h"

2
mindspore/ccsrc/ir/value_extends.cc
View File

@ -20,7 +20,7 @@
#include <cmath>
#include <cfloat>
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
namespace mindspore {
using ContextPtr = abstract::AnalysisContextPtr;

2
mindspore/ccsrc/ir/value_py.cc
View File

@ -18,7 +18,7 @@
#include <string>
#include "pybind_api/api_register.h"
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
namespace mindspore {
// Define python 'RefKey' class.

2
mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h
View File

@ -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 {

2
mindspore/ccsrc/kernel/kernel.h
View File

@ -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 {

2
mindspore/ccsrc/kernel/tbe/tbe_adapter.h
View File

@ -21,7 +21,7 @@
#include <memory>
#include <vector>
#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

2
mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h
View File

@ -19,7 +19,7 @@
#include <string>
#include "kernel/kernel.h"
#include "ir/base.h"
#include "base/base.h"
#include "ir/dtype/type.h"
namespace mindspore {

6
mindspore/ccsrc/operator/composite/composite.cc
View File

@ -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"

6
mindspore/ccsrc/operator/composite/do_signature.cc
View File

@ -18,10 +18,10 @@
#include <algorithm>
#include <utility>
#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"

2
mindspore/ccsrc/operator/composite/list_append_operation.cc
View File

@ -20,7 +20,7 @@
#include <string>
#include <memory>
#include "pipeline/static_analysis/param_validator.h"
#include "abstract/param_validator.h"
#include "optimizer/opt.h"
#include "pybind_api/api_register.h"

4
mindspore/ccsrc/operator/composite/map.cc
View File

@ -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"

6
mindspore/ccsrc/operator/composite/multitype_funcgraph.cc
View File

@ -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"

6
mindspore/ccsrc/operator/composite/unpack_call.cc
View File

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

4
mindspore/ccsrc/operator/composite/zip_operation.cc
View File

@ -19,9 +19,9 @@
#include "operator/composite/zip_operation.h"
#include <algorithm>
#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"

4
mindspore/ccsrc/operator/prim_arrays.cc
View File

@ -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 {

4
mindspore/ccsrc/operator/prim_debug.cc
View File

@ -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 {

4
mindspore/ccsrc/operator/prim_maths.cc
View File

@ -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 {

4
mindspore/ccsrc/operator/prim_nn.cc
View File

@ -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 {

4
mindspore/ccsrc/operator/prim_others.cc
View File

@ -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"

4
mindspore/ccsrc/operator/prim_statement.cc
View File

@ -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 {

4
mindspore/ccsrc/operator/prim_structures.cc
View File

@ -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"

2
mindspore/ccsrc/optimizer/clean.h
View File

@ -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 */

2
mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h
View File

@ -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 {

2
mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h
View File

@ -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 {

2
mindspore/ccsrc/parallel/context.h
View File

@ -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 {

2
mindspore/ccsrc/parallel/graph_util/node_info.h
View File

@ -18,7 +18,7 @@
#define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_NODE_INFO_H_
#include <string>
#include "ir/base.h"
#include "base/base.h"
namespace mindspore {
namespace parallel {

2
mindspore/ccsrc/parallel/ops_info/operator_info.h
View File

@ -26,7 +26,7 @@
#include <vector>
#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"

2
mindspore/ccsrc/pipeline/action.cc
View File

@ -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"

2
mindspore/ccsrc/pipeline/parse/resolve.h
View File

@ -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

2
mindspore/ccsrc/pipeline/pipeline_ge.cc
View File

@ -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 {

2
mindspore/ccsrc/pipeline/remove_value_node_dup.h
View File

@ -19,7 +19,7 @@
#include <unordered_map>
#include <vector>
#include "ir/base.h"
#include "base/base.h"
#include "ir/manager.h"
namespace mindspore {

1
mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc
View File

@ -18,7 +18,6 @@
#include <vector>
#include "pipeline/static_analysis/analysis_context.h"
#include "pipeline/static_analysis/static_analysis.h"
namespace mindspore {

4
mindspore/ccsrc/pipeline/static_analysis/abstract_function.h
View File

@ -22,8 +22,8 @@
#include <memory>
#include <string>
#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 {

2
mindspore/ccsrc/pipeline/static_analysis/evaluator.cc
View File

@ -20,7 +20,7 @@
#include <unordered_set>
#include "ir/func_graph_cloner.h"
#include "pipeline/static_analysis/utils.h"
#include "abstract/utils.h"
#include "debug/trace.h"
namespace mindspore {

4
mindspore/ccsrc/pipeline/static_analysis/prim.cc
View File

@ -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 {

2
mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc
View File

@ -21,7 +21,7 @@
#include <algorithm>
#include <set>
#include "pipeline/static_analysis/utils.h"
#include "abstract/utils.h"
#include "pipeline/static_analysis/prim.h"
#include "operator/ops.h"
#include "utils/symbolic.h"

2
mindspore/ccsrc/pipeline/static_analysis/static_analysis.h
View File

@ -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"

2
mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc
View File

@ -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 {

2
mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc
View File

@ -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 {

2
mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc
View File

@ -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 {

2
mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc
View File

@ -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 {

2
mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h
View File

@ -17,7 +17,7 @@
#define MINDSPORE_CCSRC_PRE_ACTIVATE_COMMON_FUSION_ID_ALLOCATOR_H_
#include <memory>
#include "ir/base.h"
#include "base/base.h"
namespace mindspore {
namespace opt {

2
mindspore/ccsrc/pre_activate/common/pattern_engine.h
View File

@ -34,7 +34,7 @@
#include <utility>
#include "pre_activate/common/visit.h"
#include "ir/base.h"
#include "base/base.h"
#include "utils/log_adapter.h"
#include "utils/base_ref.h"

2
mindspore/ccsrc/pre_activate/common/visit.h
View File

@ -26,7 +26,7 @@
#include <string>
#include <memory>
#include "ir/base.h"
#include "base/base.h"
#include "utils/base_ref.h"
// namespace to support utils definition

2
mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc
View File

@ -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 {

2
mindspore/ccsrc/pynative/base.h
View File

@ -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 {

2
mindspore/ccsrc/session/anf_runtime_algorithm.h
View File

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

2
mindspore/ccsrc/utils/convert_utils.cc
View File

@ -25,7 +25,7 @@
#include <cfloat>
#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"

2
mindspore/ccsrc/utils/convert_utils.h
View File

@ -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;

2
mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc
View File

@ -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"

2
mindspore/ccsrc/utils/log_adapter.cc
View File

@ -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];

2
mindspore/ccsrc/utils/log_adapter.h
View File

@ -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
};

2
mindspore/ccsrc/utils/symbolic.h
View File

@ -26,7 +26,7 @@
#include <string>
#include "ir/anf.h"
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
#include "utils/any.h"
namespace mindspore {

2
mindspore/ccsrc/vm/transform.cc
View File

@ -26,7 +26,7 @@
#include <string>
#include <vector>
#include "pipeline/static_analysis/abstract_value.h"
#include "abstract/abstract_value.h"
#ifdef ENABLE_GE
#include "transform/convert.h"
#endif

2
tests/ut/cpp/CMakeLists.txt
View File

@ -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"

2
tests/ut/cpp/pipeline/static_analysis/abstract_test.cc → tests/ut/cpp/abstract/abstract_test.cc
View File

@ -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"

2
tests/ut/cpp/pipeline/static_analysis/dshape_test.cc → tests/ut/cpp/abstract/dshape_test.cc
View File

@ -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 {

2
tests/ut/cpp/pipeline/static_analysis/utils_test.cc → tests/ut/cpp/abstract/utils_test.cc
View File

@ -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"

2
tests/ut/cpp/ir/base_test.cc → tests/ut/cpp/base/base_test.cc
View File

@ -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"

2
tests/ut/cpp/ir/value_test.cc
View File

@ -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 {

2
tests/ut/cpp/pipeline/static_analysis/data_test.cc
View File

@ -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 {