remove ccsrc/common.h

replace frontend/operator/ops.h in backend with base/core_ops.h as
backend should not use any frontend-only primitive

mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h

@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include "ir/anf.h"
 #include "utils/utils.h"
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 
 namespace mindspore {
 namespace kernel {

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 {

mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc

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

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"
 

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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 {

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 {

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 {

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 {

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"
 

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"
 

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include "utils/utils.h"
 #include "backend/optimizer/common/helper.h"
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc

@@ -18,7 +18,7 @@
 #include <memory>
 #include <algorithm>
 #include "utils/utils.h"
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc

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

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc

@@ -18,7 +18,7 @@
 #include <memory>
 #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 {

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 {

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"
 

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 {

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc

@@ -18,7 +18,7 @@
 #include <memory>
 #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 {

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"

mindspore/ccsrc/backend/optimizer/common/pass.h

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "ir/anf.h"
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc

@@ -17,7 +17,7 @@
 #include "backend/optimizer/pass/add_atomic_clean.h"
 #include <memory>
 #include <vector>
-#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"

mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc

@@ -21,7 +21,7 @@
 #include <unordered_map>
 
 #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"

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 {

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"
 

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 {

mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc

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

mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc

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

mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc

@@ -16,7 +16,7 @@
 #include "backend/optimizer/pass/getitem_tuple.h"
 
 #include <memory>
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 #include "utils/utils.h"
 #include "backend/optimizer/common/helper.h"
 

mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc

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

mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc

@@ -20,7 +20,7 @@
 #include <set>
 #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"

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"
 

mindspore/ccsrc/backend/session/ascend_session.cc

@@ -20,7 +20,7 @@
 #include <set>
 #include <string>
 #include <list>
-#include "frontend/operator/ops.h"
+#include "base/core_ops.h"
 #include "ir/tensor.h"
 #include "ir/anf.h"
 #include "common/trans.h"

mindspore/ccsrc/backend/session/kernel_graph.cc

@@ -18,7 +18,7 @@
 #include <queue>
 #include <unordered_set>
 #include <set>
-#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"

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"

mindspore/ccsrc/common.h

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

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 {

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"
 

mindspore/ccsrc/frontend/operator/composite/unpack_call.cc

@@ -18,7 +18,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "./common.h"
 #include "abstract/abstract_value.h"
 #include "abstract/dshape.h"
 #include "frontend/operator/cc_implementations.h"

mindspore/ccsrc/frontend/optimizer/clean.cc

@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#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 */

mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h

@@ -22,7 +22,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "mindspore/ccsrc/common.h"
 #include "utils/ms_utils.h"
 #include "frontend/parallel/auto_parallel/edge_costmodel.h"
 #include "frontend/parallel/costmodel_context.h"

mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc

@@ -20,6 +20,8 @@
 #include <memory>
 #include <string>
 
+#include "pipeline/jit/parse/python_adapter.h"
+
 using mindspore::tensor::Tensor;
 
 namespace mindspore {

mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h

@@ -24,7 +24,6 @@
 #include <utility>
 #include <vector>
 
-#include "./common.h"
 #include "frontend/optimizer/opt.h"
 #include "frontend/parallel/strategy.h"
 #include "frontend/parallel/tensor_layout/tensor_redistribution.h"

mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc

@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <functional>
 #include <memory>
+#include <numeric>
 #include <string>
 #include <utility>
 #include <vector>

mindspore/ccsrc/frontend/parallel/step_parallel.h

@@ -26,7 +26,6 @@
 #include <utility>
 #include <set>
 
-#include "./common.h"
 #include "frontend/optimizer/opt.h"
 #include "frontend/parallel/strategy.h"
 #include "frontend/parallel/tensor_layout/tensor_redistribution.h"

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 {

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"

mindspore/ccsrc/pybind_api/ir/primitive_py.cc

@@ -17,7 +17,6 @@
 #include "pybind_api/ir/primitive_py.h"
 #include <mutex>
 #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"

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 {

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"

mindspore/ccsrc/transform/graph_ir/graph_runner.cc

@@ -18,11 +18,12 @@
 #include <algorithm>
 #include <string>
 #include <memory>
+
+#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<ge::Session> GraphRunner::NewSession(const SessionOptions &sess_options) {

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 {
 

tests/ut/cpp/debug/memory_dumper_test.cc

@@ -17,7 +17,6 @@
 #include <iostream>
 #include <memory>
 #include "common/common_test.h"
-#include "./common.h"
 #include "utils/system/file_system.h"
 #include "utils/system/env.h"
 #define private public

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 {

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

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 {
 

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 {

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 {
 

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 {

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 {

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;

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;
 

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