diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h index 2db84631ef987d7d069491ecc6767ab5465e9b43..247399b12230ad11fcb35c9c34c1fe8314fc5957 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h @@ -22,7 +22,7 @@ #include #include "ir/anf.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc index bd9c1a26fa612a392c7bfe884cb028984e98b4d1..047caea6c317480ce7c9de9e5ab1be502c8f2123 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc @@ -27,7 +27,7 @@ #include "utils/ms_utils.h" #include "ir/manager.h" #include "ir/meta_tensor.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "ir/graph_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc index c6b62a1766dc4121165287202e346536eda50e83..39e788f89ca7218347c00946a4ae2c7ca278be6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc @@ -18,7 +18,7 @@ #include #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "frontend/parallel/ops_info/ops_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/tbe/tbe_adapter.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc index 9a079dd3e0c6fbcb684de5bd6e30eb7839c3f75f..4114e6729b6d1173e03daaa66c9790efd2fa6c1c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc @@ -27,7 +27,6 @@ #include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" #include "backend/session/anf_runtime_algorithm.h" -#include "./common.h" #include "backend/kernel_compiler/tbe/tbe_convert_utils.h" #include "backend/kernel_compiler/tbe/tbe_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc index 1c96b417bb4dbbaa56c715f97b0bc9d3299bc2ad..5a174e5966cb0f7dcdcaab332451376e10011a60 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc @@ -23,7 +23,7 @@ #include "runtime/device/kernel_info.h" #include "backend/kernel_compiler/oplib/oplib.h" #include "backend/kernel_compiler/common_utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/kernel_graph.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc index dd0d61e1ac45d7227ba4f36d372e86bebbf59dc1..129c6e1f59918db56d677c4c30507491b7aa7b66 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc @@ -21,7 +21,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc index 017c475eb4a214d2a419a3b8af2603fe7d1d95b0..400f58721ebec3b08e317bc65bdae93c675062cd 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc @@ -21,7 +21,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc index dbaef1805b35bf568768b5e0203a444438c7689a..77a5e9d67052193b9b4fd3092fb1dc1a4f50164b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc index c3967f39633da175bf282752c373e1d1c029b88e..9918c530c881215aea2d06c88d71bf2911174125 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc index d32269fab111688ddba6eae5a91b4b5fff1a1e70..1966229ac2be18555d7ff443335a6880510c1161 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc @@ -22,7 +22,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc index 50d93dd0191cefd73245314097d730e9c49e0aaa..f9fdd35994db1d7a6c83e4d73642da630ff4b941 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc index d58ce8aa4830377af9210eed16af141650d59005..9416028374c7da67de71865c8a3c6c0da52fdef1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc index 6e48048b280b2ddcb9dfa82b7584bb9eb2b3c4f0..8504135ece8db396d0e410b2708237be6486c0b8 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc index e899561eb97e7892531464b5be6e674a73ae29eb..4d7941c8cce270711fecd53ec08b9ea59d784ffe 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc index d75511d790a2a23626beae33ad238d1099a2dc11..d16e22118e4240f2a7ba33574428e5721f742d6d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc @@ -21,7 +21,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc index 472b6a861543c896e00bb77eba04a4203155ac24..adfdc80535ef1f4180378843fcc113ca3424cab2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc index 038ed424aead4c7e69bb3cdb2bb1318907bbb7d6..0a12edc59b1a454a2b63d315280f22b8dcee1e0f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc index 4a74e6b7ad6245ac18dd60205963665523674ce6..f9d414ed1327d0f5f9117e3311963153aa5bf1a6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc @@ -21,7 +21,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc index 1b8c0159945925ea38025855ae9183313e4737bd..b226986217c6866f345ce253373816f299094f18 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc index a6222a13aecbe75b283662cb64bc44eb238e0c81..6732d849e7a89bacb28fa7d95d88b560f55b6df2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc @@ -22,7 +22,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc index 62ec43e19bc5aefc839f6e02b6ea8431837cb4cd..476a76f92509f9c409bbcb3cdf4f730105243d4c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc @@ -24,7 +24,7 @@ #include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc index 9adbf945017e017472ec73de06869b8ed58adab7..7337bf9a22149fe3a0fc7ef3bcc509f8e929ba46 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc @@ -20,7 +20,7 @@ #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc index 35c484de8d559d99c781baea6151ee8258426e3a..274863776184aa0dbf11da6996f80f4839eb00ca 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc @@ -23,7 +23,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc index adca536f049387c709e7c693ae9c79025e8d6464..b29cab31336c1eb31ff188935ce2597243c99d72 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc @@ -21,7 +21,7 @@ #include "backend/optimizer/common/helper.h" #include "backend/kernel_compiler/common_utils.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc index 09992005a4fe27a252d0f73a5e7b3ca1c779fa4b..4d390d795fb7013ee688c264f97ef61b32cc46c3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc @@ -20,7 +20,7 @@ #include "backend/optimizer/common/helper.h" #include "backend/kernel_compiler/common_utils.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc index 51bcd880cd8c714c2ed7ea405a45076af02ddff3..c9091112daf95c9e578243705cecb570ba8fb48e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc @@ -19,7 +19,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "abstract/abstract_value.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc index defb0113962ebff11fb5d5160f58f5fa6491a669..5eb8a86a0418feceb2cd04c15d5858b1a4639ca9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc @@ -19,7 +19,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "abstract/abstract_value.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc index e55f16e99158c87062e881aea20d6a54a623f34a..3433d5305cc343a819e577c20e340566a1b84c16 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc @@ -20,7 +20,7 @@ #include #include "utils/utils.h" #include "backend/optimizer/common/helper.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc index ccbfd3adb9cb497d874f43091a138887e2e6c33d..11a8e0b00257a7b69822631d75c97cb86b7f7053 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc @@ -18,7 +18,7 @@ #include #include #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc index 73ec39cffa2a5b0d0052e1e40333e10b683a0f0b..501327a261c711236b5f73ead1e11097d7ec5dbb 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc @@ -18,7 +18,7 @@ #include #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "runtime/device/kernel_info.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc index 6f48eabbc5be7f4ac17ebd94f1a280381e6a0b88..e2c6143927ee360fef218738303a29a58006eb50 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc @@ -18,7 +18,7 @@ #include #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc index 02a866930c8659491421e98a63c872ac650d5948..d4ad4c431f5f505e846cecf9373266f6dc459eb6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc @@ -19,7 +19,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "backend/optimizer/common/helper.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc index 67c881759a81c550651da0798f68a2aef0bb2fd7..e8f198ccd7bdec62d6c6e4392dd9b081f05e53dd 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc @@ -22,7 +22,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "backend/optimizer/common/helper.h" #include "runtime/device/kernel_info.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc index 46bf2a8604854b6babf518c585c29a5bd3ac8639..ccbdfa87916e6c6c0ff81aacc7e1393d3ab2ef5e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc @@ -19,7 +19,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "backend/optimizer/common/helper.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc index b6da588e8952b0a42767ac6d24656002aac44eb3..e757aa129045b8d72199824dc95dd63931bd16aa 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc @@ -18,7 +18,7 @@ #include #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.cc b/mindspore/ccsrc/backend/optimizer/common/helper.cc index 6c2276f28bcea0f6dbd4cc07b6e94b7ec77c54dd..6983162cda4f747d52e3c3028ff8f2bcfcacc3ee 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.cc +++ b/mindspore/ccsrc/backend/optimizer/common/helper.cc @@ -25,7 +25,7 @@ #include "utils/utils.h" #include "base/base_ref.h" #include "backend/session/anf_runtime_algorithm.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/ms_utils.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/pass.h b/mindspore/ccsrc/backend/optimizer/common/pass.h index cb8ad63b46a1fb552b8bbeb2179bcb3b7aa3816a..8bf4833d63154e559a96925ce451359df4b3ed1a 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pass.h +++ b/mindspore/ccsrc/backend/optimizer/common/pass.h @@ -19,7 +19,7 @@ #include #include "ir/anf.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc index e5612aefa5bde35b5cb5a0102b4ac17f0b8fe461..4e6514a877d7f7fe9e8ef17fe199be1f56661804 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc @@ -17,7 +17,7 @@ #include "backend/optimizer/pass/add_atomic_clean.h" #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/utils.h" #include "utils/log_adapter.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc index 024f69e84376c528e7e37f02144f3b9e1e3346dd..7263a1c86b4aeeb0814d2129b3ecedb33b6d4f06 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc @@ -21,7 +21,7 @@ #include #include "ir/graph_utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/kernel_build_info.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc index 16f0b18711dd51142eebea7a61688071bb543b35..fdb6d6ae8f90cdc2f0ebd14ba4e4afd38051527e 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc @@ -19,7 +19,7 @@ #include "utils/utils.h" #include "utils/log_adapter.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc index afc1a5e9e256f0bb82507619559630c8e39f5a2e..06e319d59f19942a7c289d705ecdebfc06f8ccce 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc @@ -23,7 +23,7 @@ #include "backend/optimizer/common/helper.h" #include "utils/utils.h" #include "utils/ms_context.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/common_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc index a22045f8471dad60f03cd943f125240267c177d2..fe1b0a3023cdb3442f5ced0f8d4f115befa3bbd5 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc @@ -21,7 +21,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "backend/optimizer/common/helper.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "backend/kernel_compiler/common_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc index 1deb1bc96aa01149707306ca51a25cfe4d8551b2..e93d2b6dc51cd1646c035f51507713ff931ce713 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc @@ -24,7 +24,7 @@ #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "ir/graph_utils.h" #include "backend/optimizer/common/helper.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc index a564f0edff23ef6d2e8938a9a8a6b89e6d3d640d..dc943a25dd2f0d4f4bd29dfb720e44bd3b2e5a8a 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc @@ -24,7 +24,7 @@ #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/utils.h" #include "ir/graph_utils.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc index a51a6bab421adf5bf54d5b2a2d1fba929d8f834c..d565c7d2c5b27d6a00a0d52d0090634e6f34c1ae 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc @@ -16,7 +16,7 @@ #include "backend/optimizer/pass/getitem_tuple.h" #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/utils.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc index 09f387d974b852225385101887b5fa1255275f50..48c0c78047833743087c39b521a920e5f996e5b1 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc @@ -19,7 +19,7 @@ #include #include #include "backend/optimizer/common/helper.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/utils.h" #include "backend/session/kernel_graph.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc index b70286ae4243a532f537e0d83bf930d6c75cc6b1..2962ba3be2282405f8c0212d535bcbfcbe7c644e 100644 --- a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc +++ b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc @@ -20,7 +20,7 @@ #include #include "ir/anf.h" #include "ir/func_graph.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" #include "runtime/device/device_address.h" diff --git a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h index 191ab887d96dfc9e256ced0879cb7f060bedf9f6..2fff066166a6b2fd488d93501737f1622ce792f2 100644 --- a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h +++ b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h @@ -31,7 +31,7 @@ #include "runtime/device/device_address.h" #include "backend/kernel_compiler/kernel.h" #include "backend/kernel_compiler/kernel_build_info.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "utils/contract.h" #include "backend/session/kernel_graph.h" diff --git a/mindspore/ccsrc/backend/session/ascend_session.cc b/mindspore/ccsrc/backend/session/ascend_session.cc index 8e1cd02a998f8b23a3ba612884a321f7bf142071..63e9fa1cc0ac82b9f718bef01a72cf1d049df794 100644 --- a/mindspore/ccsrc/backend/session/ascend_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_session.cc @@ -20,7 +20,7 @@ #include #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "ir/tensor.h" #include "ir/anf.h" #include "common/trans.h" diff --git a/mindspore/ccsrc/backend/session/kernel_graph.cc b/mindspore/ccsrc/backend/session/kernel_graph.cc index ce57baa1dd5af6392a5d8c90a9fef0036296da95..93a39469d5fd6fc721c7017022fc4169917e1640 100644 --- a/mindspore/ccsrc/backend/session/kernel_graph.cc +++ b/mindspore/ccsrc/backend/session/kernel_graph.cc @@ -18,7 +18,7 @@ #include #include #include -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "ir/param_info.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc index 42997558fc2a383f6bc6805b3fc09230846dcd37..aafbf013658138db96179802dc1b655292c4370e 100644 --- a/mindspore/ccsrc/backend/session/session_basic.cc +++ b/mindspore/ccsrc/backend/session/session_basic.cc @@ -21,7 +21,7 @@ #include "ir/manager.h" #include "ir/param_info.h" #include "backend/kernel_compiler/common_utils.h" -#include "frontend/operator/ops.h" +#include "base/core_ops.h" #include "common/trans.h" #include "utils/config_manager.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/common.h b/mindspore/ccsrc/common.h deleted file mode 100644 index 635010cea8ccabc87405e3809a1a4768ced675c3..0000000000000000000000000000000000000000 --- a/mindspore/ccsrc/common.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2019 Huawei Technologies Co., Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MINDSPORE_CCSRC_COMMON_H_ -#define MINDSPORE_CCSRC_COMMON_H_ - -#include -#include - -#include "pybind11/pybind11.h" -#include "pybind11/stl.h" - -#include "abstract/dshape.h" -#include "abstract/abstract_value.h" -#include "abstract/abstract_function.h" -#include "pipeline/jit/parse/python_adapter.h" -#include "pipeline/jit/parse/parse.h" -#include "pipeline/jit/parse/parse_base.h" -#include "pipeline/jit/parse/resolve.h" - -namespace py = pybind11; -#endif // MINDSPORE_CCSRC_COMMON_H_ diff --git a/mindspore/ccsrc/frontend/operator/composite/do_signature.cc b/mindspore/ccsrc/frontend/operator/composite/do_signature.cc index 8c9e8c871bdb103edbeb6de642f0180904bf21d3..0bdb3b2d50db144139c18c5e78d6701870186e07 100644 --- a/mindspore/ccsrc/frontend/operator/composite/do_signature.cc +++ b/mindspore/ccsrc/frontend/operator/composite/do_signature.cc @@ -24,7 +24,6 @@ #include "abstract/param_validator.h" #include "frontend/operator/cc_implementations.h" #include "frontend/optimizer/opt.h" -#include "./common.h" #include "pybind_api/api_register.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc index d7b7e18d4eefe10a9f5a9d320bf1437964f04c5d..10c4b54b0420f3267a0855350aa071a73051f409 100644 --- a/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc +++ b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc @@ -26,7 +26,6 @@ #include "frontend/optimizer/opt.h" #include "utils/ms_context.h" #include "pybind_api/api_register.h" -#include "./common.h" #include "ir/signature.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc b/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc index 27f90f76174d8818e70c520ed0adc814f77208e0..87f9cea0843524ae01834549f9e8c0bd5ec54189 100644 --- a/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc +++ b/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc @@ -18,7 +18,6 @@ #include #include -#include "./common.h" #include "abstract/abstract_value.h" #include "abstract/dshape.h" #include "frontend/operator/cc_implementations.h" diff --git a/mindspore/ccsrc/frontend/optimizer/clean.cc b/mindspore/ccsrc/frontend/optimizer/clean.cc index 87ae0b78dec05c8d6d4b94109d9cabdfb51c7d27..1a39c3cc474bdee3709c05f78d6195dab4efa34f 100644 --- a/mindspore/ccsrc/frontend/optimizer/clean.cc +++ b/mindspore/ccsrc/frontend/optimizer/clean.cc @@ -20,9 +20,9 @@ #include #include #include -#include "./common.h" #include "debug/trace.h" #include "frontend/operator/composite/composite.h" +#include "pipeline/jit/parse/resolve.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h index c00e61b09669f36915f23f1b6cd0edff6ce5869d..99d45dfb0a49d9faa7df41430afcb913c9306c7a 100644 --- a/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h @@ -22,7 +22,6 @@ #include #include #include -#include "mindspore/ccsrc/common.h" #include "utils/ms_utils.h" #include "frontend/parallel/auto_parallel/edge_costmodel.h" #include "frontend/parallel/costmodel_context.h" diff --git a/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc index 91bd3e9dfe6acd04960e37850e76ce778f07d253..034d00693236d39b27a19229ea27b215b12d174c 100644 --- a/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc @@ -20,6 +20,8 @@ #include #include +#include "pipeline/jit/parse/python_adapter.h" + using mindspore::tensor::Tensor; namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h index b6e417fab84ba3c0fb29758f2e988b3ff653c6ac..9309cea2cdb60f2dd6fd1aeae530b01a86f9fbcf 100644 --- a/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h +++ b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h @@ -24,7 +24,6 @@ #include #include -#include "./common.h" #include "frontend/optimizer/opt.h" #include "frontend/parallel/strategy.h" #include "frontend/parallel/tensor_layout/tensor_redistribution.h" diff --git a/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc index 26b6dcc58d4c3e96b12300e4400e27d3dcbc58e2..e9e71fe648be395406b7eae83a9fb66f34ec0a79 100644 --- a/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/mindspore/ccsrc/frontend/parallel/step_parallel.h b/mindspore/ccsrc/frontend/parallel/step_parallel.h index 537b43a2f12a902742e00e2d607621fac3f741e9..ece29968711f7982c1a554672626e93231d3296f 100644 --- a/mindspore/ccsrc/frontend/parallel/step_parallel.h +++ b/mindspore/ccsrc/frontend/parallel/step_parallel.h @@ -26,7 +26,6 @@ #include #include -#include "./common.h" #include "frontend/optimizer/opt.h" #include "frontend/parallel/strategy.h" #include "frontend/parallel/tensor_layout/tensor_redistribution.h" diff --git a/mindspore/ccsrc/pipeline/jit/resource.h b/mindspore/ccsrc/pipeline/jit/resource.h index 243e424d031a6b0eedec12e3bd9202f7c497aaf3..ee29b20b4f8bbf3f95531914146b7fec931989de 100644 --- a/mindspore/ccsrc/pipeline/jit/resource.h +++ b/mindspore/ccsrc/pipeline/jit/resource.h @@ -31,7 +31,6 @@ #include "ir/manager.h" #include "pipeline/jit/static_analysis/prim.h" #include "pipeline/jit/static_analysis/static_analysis.h" -#include "./common.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc index a7f014705ecb0244620d3ddd8a9ea028f4bc100d..acf891e5003577ea561e8c5f01fedacdfc20322f 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc @@ -27,7 +27,6 @@ #include "utils/symbolic.h" #include "ir/tensor.h" #include "ir/func_graph_cloner.h" -#include "./common.h" #include "pipeline/jit/parse/data_converter.h" #include "pipeline/jit/static_analysis/evaluator.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/pybind_api/ir/primitive_py.cc b/mindspore/ccsrc/pybind_api/ir/primitive_py.cc index b5f76b1d2409f87b45e664463d2909dd2ac0759d..1929b505e527c5a5b19700b2f413c3c9a280e41b 100644 --- a/mindspore/ccsrc/pybind_api/ir/primitive_py.cc +++ b/mindspore/ccsrc/pybind_api/ir/primitive_py.cc @@ -17,7 +17,6 @@ #include "pybind_api/ir/primitive_py.h" #include #include "ir/signature.h" -#include "./common.h" #include "pipeline/jit/parse/python_adapter.h" #include "pipeline/jit/parse/data_converter.h" #include "pybind11/pytypes.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc index 6a891c6f2afea9de2951a7d0a01783565852c3a7..468879451f5474d5777cf4c9dd8082218ffcd8ea 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc @@ -32,7 +32,6 @@ #include "backend/kernel_compiler/common_utils.h" #include "frontend/operator/ops.h" #include "backend/session/anf_runtime_algorithm.h" -#include "./common.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/transform/graph_ir/convert.cc b/mindspore/ccsrc/transform/graph_ir/convert.cc index 42e7004c240c67ee3399cfa701dade7960032f21..e1fb6d0ee00103ae3fdf61bc87100a849d6bc034 100644 --- a/mindspore/ccsrc/transform/graph_ir/convert.cc +++ b/mindspore/ccsrc/transform/graph_ir/convert.cc @@ -27,7 +27,6 @@ #include "utils/symbolic.h" #include "utils/config_manager.h" #include "utils/convert_utils.h" -#include "./common.h" #include "utils/ms_context.h" #include "transform/graph_ir/op_adapter_map.h" #include "ops/state_ops.h" diff --git a/mindspore/ccsrc/transform/graph_ir/graph_runner.cc b/mindspore/ccsrc/transform/graph_ir/graph_runner.cc index 15db6283f188261b1cb7c9255765f50f03158cf9..166f44a489736e16dd41f2266fa5c67f5c4aff9e 100644 --- a/mindspore/ccsrc/transform/graph_ir/graph_runner.cc +++ b/mindspore/ccsrc/transform/graph_ir/graph_runner.cc @@ -18,11 +18,12 @@ #include #include #include + +#include "pybind11/pybind11.h" #include "utils/log_adapter.h" #include "utils/config_manager.h" #include "sys/time.h" #include "utils/utils.h" -#include "./common.h" #include "utils/callbacks.h" #ifdef ENABLE_GE #include "utils/callbacks_ge.h" @@ -40,6 +41,8 @@ Session::~Session() {} } // namespace ge #endif +namespace py = pybind11; + namespace mindspore { namespace transform { std::shared_ptr GraphRunner::NewSession(const SessionOptions &sess_options) { diff --git a/tests/ut/cpp/common/py_func_graph_fetcher.h b/tests/ut/cpp/common/py_func_graph_fetcher.h index ae9467cef1ff7f09aded032ad2fd622521d563d5..6696a04ca6575164522c58317273ea106862f9df 100644 --- a/tests/ut/cpp/common/py_func_graph_fetcher.h +++ b/tests/ut/cpp/common/py_func_graph_fetcher.h @@ -24,7 +24,7 @@ #include "ir/func_graph.h" #include "pipeline/jit/parse/parse_base.h" #include "pipeline/jit/parse/parse.h" -#include "./common.h" +#include "pipeline/jit/parse/resolve.h" namespace UT { diff --git a/tests/ut/cpp/debug/memory_dumper_test.cc b/tests/ut/cpp/debug/memory_dumper_test.cc index b0676b481daf32a0f8c1443086f995ddaac79aec..fc491231676e727d730324f181ff1c6f0d423a27 100644 --- a/tests/ut/cpp/debug/memory_dumper_test.cc +++ b/tests/ut/cpp/debug/memory_dumper_test.cc @@ -17,7 +17,6 @@ #include #include #include "common/common_test.h" -#include "./common.h" #include "utils/system/file_system.h" #include "utils/system/env.h" #define private public diff --git a/tests/ut/cpp/device/ascend_kernel_runtime_test.cc b/tests/ut/cpp/device/ascend_kernel_runtime_test.cc index 2aa951280888df37441889b3f6cea303d839e92d..6cbb21e886df9c6134ad4c44bd6948503466c158 100644 --- a/tests/ut/cpp/device/ascend_kernel_runtime_test.cc +++ b/tests/ut/cpp/device/ascend_kernel_runtime_test.cc @@ -19,7 +19,6 @@ #include "common/common_test.h" #include "runtime/device/kernel_runtime.h" -#include "./common.h" namespace mindspore { class TestAscendKernelRuntime : public UT::Common { diff --git a/tests/ut/cpp/device/ascend_profiling_test.cc b/tests/ut/cpp/device/ascend_profiling_test.cc index f862d84c4a03816138faf3982c0e383211721786..858f99c429ea0bdb2c04a0c763ebc5d042746d1a 100644 --- a/tests/ut/cpp/device/ascend_profiling_test.cc +++ b/tests/ut/cpp/device/ascend_profiling_test.cc @@ -19,7 +19,6 @@ #include "./prof_reporter.h" #include "common/common_test.h" #include "runtime/device/ascend/profiling/profiling_manager.h" -#include "./common.h" #define private public #include "runtime/device/ascend/profiling/plugin_impl.h" #undef private diff --git a/tests/ut/cpp/ir/anf_test.cc b/tests/ut/cpp/ir/anf_test.cc index 9b217a23218d1c2a3b8cac587405aa700367cb5e..3d89bc41afa5c501bd054ff6fb9d95e381b156bd 100644 --- a/tests/ut/cpp/ir/anf_test.cc +++ b/tests/ut/cpp/ir/anf_test.cc @@ -19,8 +19,8 @@ #include "common/common_test.h" #include "ir/anf.h" +#include "ir/func_graph.h" #include "frontend/operator/ops.h" -#include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/ir/clone_test.cc b/tests/ut/cpp/ir/clone_test.cc index 1929cf599e85075a0f975abc241f6eb9fe4bbc9c..b8b32571eaab7b329181c66c295b2ba6cdac7070 100644 --- a/tests/ut/cpp/ir/clone_test.cc +++ b/tests/ut/cpp/ir/clone_test.cc @@ -24,7 +24,6 @@ #include "pipeline/jit/parse/parse.h" #include "ir/graph_utils.h" #include "debug/draw.h" -#include "./common.h" namespace mindspore { class TestCloner : public UT::Common { diff --git a/tests/ut/cpp/ir/manager_test.cc b/tests/ut/cpp/ir/manager_test.cc index 060151109d490bb17cb7787eb3f465cf4ac5bc84..8b8b0d91513c9abeb19d3ebc082ed8aad91e5956 100644 --- a/tests/ut/cpp/ir/manager_test.cc +++ b/tests/ut/cpp/ir/manager_test.cc @@ -23,7 +23,6 @@ #include "utils/log_adapter.h" #include "debug/draw.h" #include "utils/label.h" -#include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/operator/ops_test.cc b/tests/ut/cpp/operator/ops_test.cc index 9ebbcfdba78f5f9da2fb8134c759a0fb8cebf88b..829d66176e7bfa3aa150fd89122d32150f379261 100644 --- a/tests/ut/cpp/operator/ops_test.cc +++ b/tests/ut/cpp/operator/ops_test.cc @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "ir/value.h" #include "pybind_api/ir/primitive_py.h" +#include "pipeline/jit/parse/python_adapter.h" #include "frontend/operator/ops.h" -#include "./common.h" namespace mindspore { namespace prim { diff --git a/tests/ut/cpp/pipeline/static_analysis/prim_test.cc b/tests/ut/cpp/pipeline/static_analysis/prim_test.cc index d037a9019c05a9e06ddaeca7ff8aa38cdf317590..f3b61a70eb3a4162bdd79f0403b89dd1e732db8c 100644 --- a/tests/ut/cpp/pipeline/static_analysis/prim_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/prim_test.cc @@ -27,7 +27,6 @@ #include "debug/draw.h" #include "ir/tensor.h" #include "utils/symbolic.h" -#include "./common.h" namespace mindspore { namespace abstract { diff --git a/tests/ut/cpp/transform/op_adapter_test.cc b/tests/ut/cpp/transform/op_adapter_test.cc index 5976bcc52f87836c507b23b94814fc399d972110..7c97fbb9ec18eaeacadb3c544fca7393aa46440c 100644 --- a/tests/ut/cpp/transform/op_adapter_test.cc +++ b/tests/ut/cpp/transform/op_adapter_test.cc @@ -22,7 +22,6 @@ #include "transform/graph_ir/op_adapter.h" #include "transform/graph_ir/op_declare/array_ops_declare.h" #include "frontend/operator/ops.h" -#include "./common.h" using std::cout; using std::endl; diff --git a/tests/ut/cpp/transform/transform_base_test.cc b/tests/ut/cpp/transform/transform_base_test.cc index a0322867502735de52b8a4e895a716d5a1a3a7f2..6f019fb519ea501bafb56b59dcc5449006eecd56 100644 --- a/tests/ut/cpp/transform/transform_base_test.cc +++ b/tests/ut/cpp/transform/transform_base_test.cc @@ -17,6 +17,7 @@ #include "common/common_test.h" #include "transform/transform_base_test.h" #include "pybind_api/ir/tensor_py.h" +#include "pipeline/jit/parse/resolve.h" using mindspore::tensor::TensorPy; diff --git a/tests/ut/cpp/transform/transform_base_test.h b/tests/ut/cpp/transform/transform_base_test.h index 4886b25748b9ded22cc78f163de70a4e04f99f87..ede3fde9fbd047ac8b4a5509cd4f9de6d294ff9e 100644 --- a/tests/ut/cpp/transform/transform_base_test.h +++ b/tests/ut/cpp/transform/transform_base_test.h @@ -25,7 +25,6 @@ #include "common/common_test.h" #include "pipeline/jit/parse/parse.h" -#include "./common.h" #include "graph/tensor.h" #ifdef OPEN_SOURCE