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 2db84631ef9..247399b1223 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 bd9c1a26fa6..047caea6c31 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 c6b62a1766d..39e788f89ca 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 9a079dd3e0c..4114e6729b6 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 1c96b417bb4..5a174e5966c 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 dd0d61e1ac4..129c6e1f599 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 017c475eb4a..400f58721eb 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 dbaef1805b3..77a5e9d6705 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 c3967f39633..9918c530c88 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 d32269fab11..1966229ac2b 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 50d93dd0191..f9fdd35994d 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 d58ce8aa483..9416028374c 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 6e48048b280..8504135ece8 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 e899561eb97..4d7941c8cce 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 d75511d790a..d16e22118e4 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 472b6a86154..adfdc80535e 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 038ed424aea..0a12edc59b1 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 4a74e6b7ad6..f9d414ed132 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 1b8c0159945..b226986217c 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 a6222a13aec..6732d849e7a 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 62ec43e19bc..476a76f9250 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 9adbf945017..7337bf9a221 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 35c484de8d5..27486377618 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 adca536f049..b29cab31336 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 09992005a4f..4d390d795fb 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 51bcd880cd8..c9091112daf 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 defb0113962..5eb8a86a041 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 e55f16e9915..3433d5305cc 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 ccbfd3adb9c..11a8e0b0025 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 73ec39cffa2..501327a261c 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 6f48eabbc5b..e2c6143927e 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 02a866930c8..d4ad4c431f5 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 67c881759a8..e8f198ccd7b 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 46bf2a86048..ccbdfa87916 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 b6da588e895..e757aa12904 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 5dd3f3b9dcf..2de9df5daaa 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 cb8ad63b46a..8bf4833d631 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 e5612aefa5b..4e6514a877d 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 024f69e8437..7263a1c86b4 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 16f0b18711d..fdb6d6ae8f9 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 afc1a5e9e25..06e319d59f1 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 a22045f8471..fe1b0a3023c 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 1deb1bc96aa..e93d2b6dc51 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 a564f0edff2..dc943a25dd2 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 a51a6bab421..d565c7d2c5b 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 09f387d974b..48c0c780478 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 799754dad3a..aa86246acf3 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 9e884994c52..723dfb29fce 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 8e1cd02a998..63e9fa1cc0a 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 ce57baa1dd5..93a39469d5f 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 42997558fc2..aafbf013658 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 635010cea8c..00000000000 --- 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 8c9e8c871bd..0bdb3b2d50d 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 d7b7e18d4ee..10c4b54b042 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 27f90f76174..87f9cea0843 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 87ae0b78dec..1a39c3cc474 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 c00e61b0966..99d45dfb0a4 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 91bd3e9dfe6..034d0069323 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 b6e417fab84..9309cea2cdb 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 26b6dcc58d4..e9e71fe648b 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 537b43a2f12..ece29968711 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 243e424d031..ee29b20b4f8 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 a7f014705ec..acf891e5003 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 b5f76b1d240..1929b505e52 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 6a891c6f2af..468879451f5 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 42e7004c240..e1fb6d0ee00 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 15db6283f18..166f44a4897 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 ae9467cef1f..6696a04ca65 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 b0676b481da..fc491231676 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 2aa95128088..6cbb21e886d 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 f862d84c4a0..858f99c429e 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 9b217a23218..3d89bc41afa 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 1929cf599e8..b8b32571eaa 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 060151109d4..8b8b0d91513 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 9ebbcfdba78..829d66176e7 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 d037a9019c0..f3b61a70eb3 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 5976bcc52f8..7c97fbb9ec1 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 a0322867502..6f019fb519e 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 4886b25748b..ede3fde9fbd 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