!49096 Optimize some head files by IWYU

Merge pull request !49096 from 胡彬/optimize-some-head-files-2

mindspore/ccsrc/common/graph_kernel/core/graph_kernel_pass_manager.cc

@@ -16,12 +16,11 @@
 #include "common/graph_kernel/core/graph_kernel_pass_manager.h"
 
 #include <iomanip>
+#include <algorithm>
+#include <memory>
+#include <ostream>
 
-#include "ir/anf.h"
-#include "ir/func_graph.h"
-#include "ir/manager.h"
-#include "utils/ms_context.h"
-#include "include/common/debug/anf_ir_dump.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore::graphkernel {
 void GraphKernelPassManager::Add(const opt::PassPtr &pass, unsigned int pass_level, bool supported_device) {

mindspore/ccsrc/common/thread_pool.cc

@@ -15,10 +15,8 @@
  */
 
 #include "include/common/thread_pool.h"
-#include <algorithm>
 #include <exception>
 #include "utils/log_adapter.h"
-#include "utils/convert_utils_base.h"
 #include "utils/ms_exception.h"
 
 namespace mindspore {

mindspore/ccsrc/cxx_api/graph/acl/model_process.cc

@@ -18,8 +18,13 @@
 #include <sys/time.h>
 #include <algorithm>
 #include <map>
-#include "include/common/utils/utils.h"
+#include <memory>
+#include <utility>
+
 #include "mindspore/core/utils/convert_utils_base.h"
+#include "acl/acl_rt.h"
+#include "include/api/data_type.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore {
 static DataType TransToApiType(aclDataType data_type) {

mindspore/ccsrc/debug/rdr/graph_recorder.cc

@@ -16,13 +16,13 @@
 #include "debug/rdr/graph_recorder.h"
 #include <fstream>
 #include <utility>
+#include <optional>
+
 #include "mindspore/core/base/base.h"
-#include "backend/common/session/kernel_graph.h"
 #include "mindspore/core/utils/log_adapter.h"
 #include "include/common/debug/anf_ir_dump.h"
 #include "include/common/debug/anf_dump_utils.h"
 #include "include/common/debug/dump_proto.h"
-#include "include/common/debug/common.h"
 #include "include/common/debug/rdr/recorder_manager.h"
 #include "mindspore/core/utils/file_utils.h"
 

mindspore/ccsrc/kernel/oplib/super_bar.cc

@@ -16,9 +16,12 @@
 #include "kernel/oplib/super_bar.h"
 
 #include <vector>
-#include <fstream>
+#include <algorithm>
+#include <stdexcept>
 #include <nlohmann/json.hpp>
-#include "include/common/debug/common.h"
+
+#include "nlohmann/detail/iterators/iter_impl.hpp"
+#include "utils/log_adapter.h"
 namespace mindspore::kernel {
 // super bar config
 constexpr auto kNodeAttrMap = "NodeAttrMap";

mindspore/ccsrc/minddata/dataset/core/config_manager.cc

@@ -16,16 +16,21 @@
 #include "minddata/dataset/core/config_manager.h"
 
 #include <fstream>
-#include <iostream>
 #include <limits>
 #include <string>
 #include <thread>
 #include <utility>
+#include <exception>
+#include <initializer_list>
+#include <ostream>
+#include <vector>
 
-#include "minddata/dataset/util/log_adapter.h"
 #include "minddata/dataset/util/status.h"
-#include "minddata/dataset/util/system_pool.h"
 #include "utils/ms_utils.h"
+#include "include/dataset/constants.h"
+#include "nlohmann/json.hpp"
+#include "util/path.h"
+#include "minddata/dataset/util/log_adapter.h"
 
 namespace mindspore {
 namespace dataset {

mindspore/ccsrc/minddata/dataset/core/tensor_helpers.cc

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 #include "minddata/dataset/core/tensor_helpers.h"
-#include "minddata/dataset/util/log_adapter.h"
-#include "minddata/dataset/util/status.h"
+#include <memory>
 
+#include "include/dataset/constants.h"
+#include "include/dataset/transforms.h"
+#include "minddata/dataset/util/log_adapter.h"
 namespace mindspore {
 namespace dataset {
 

mindspore/ccsrc/minddata/dataset/text/sentence_piece_vocab.cc

@@ -18,12 +18,18 @@
 #include <sentencepiece_trainer.h>
 
 #include <fstream>
+#include <memory>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
-#include "include/common/utils/utils.h"
 #include "minddata/dataset/include/dataset/constants.h"
 #include "minddata/dataset/include/dataset/text.h"
-#include "minddata/dataset/util/path.h"
 #include "minddata/dataset/util/status.h"
+#include "include/api/status.h"
 #ifndef BUILD_LITE
 #include "mindspore/core/utils/file_utils.h"
 #else

mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_manager.cc

@@ -15,9 +15,13 @@
  */
 
 #include "plugin/device/ascend/hal/device/ascend_stream_manager.h"
+
+#include <memory>
+
 #include "utils/log_adapter.h"
-#include "include/common/utils/utils.h"
 #include "graphengine/inc/external/acl/error_codes/rt_error_codes.h"
+#include "runtime/event.h"
+#include "runtime/stream.h"
 
 namespace mindspore {
 namespace device {

mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.cc

@@ -14,14 +14,21 @@
  * limitations under the License.
  */
 #include "plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h"
-#include <functional>
 #include <map>
 #include <string>
+#include <memory>
+#include <utility>
+
 #include "backend/common/session/anf_runtime_algorithm.h"
 #include "include/common/utils/anfalgo.h"
 #include "abstract/utils.h"
-#include "transform/graph_ir/transform_util.h"
 #include "runtime/device/memory_manager.h"
+#include "include/common/utils/utils.h"
+#include "ir/anf.h"
+#include "ir/value.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 
 namespace mindspore::hccl {
 namespace {

mindspore/ccsrc/plugin/device/ascend/hal/profiler/options.cc

@@ -15,10 +15,17 @@
 
 #include <string>
 #include <climits>
+#include <initializer_list>
+#include <memory>
+#include <vector>
+
 #include "plugin/device/ascend/hal/profiler/options.h"
 #include "utils/ms_context.h"
-#include "include/common/debug/common.h"
-#include "plugin/device/ascend/hal/profiler/ascend_profiling.h"
+#include "nlohmann/detail/iterators/iter_impl.hpp"
+#include "nlohmann/json.hpp"
+#include "profiler/device/profiling.h"
+#include "utils/log_adapter.h"
+#include "utils/ms_utils.h"
 
 constexpr char kOutputPath[] = "output";
 

mindspore/ccsrc/plugin/device/ascend/kernel/acl/acl_kernel_utils.cc

@@ -16,19 +16,27 @@
 #include "plugin/device/ascend/kernel/acl/acl_kernel_utils.h"
 #include <string>
 #include <map>
-#include <set>
 #include <utility>
-#include <functional>
 #include <algorithm>
+#include <iterator>
+#include <optional>
+
 #include "ir/value.h"
 #include "include/common/utils/utils.h"
 #include "include/common/utils/anfalgo.h"
-#include "kernel/common_utils.h"
 #include "runtime/device/ms_device_shape_transfer.h"
 #include "backend/common/session/anf_runtime_algorithm.h"
 
-#include "plugin/device/ascend/hal/device/ge_types_convert.h"
 #include "plugin/device/ascend/optimizer/ascend_helper.h"
+#include "acl/acl_rt.h"
+#include "include/robin_hood.h"
+#include "ir/primitive.h"
+#include "ir/scalar.h"
+#include "kernel/oplib/super_bar.h"
+#include "ops/base_operator.h"
+#include "ops/core_ops.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/random_shuffle_kernel.cc

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 #include "plugin/device/ascend/kernel/aicpu/aicpu_ops/random_shuffle_kernel.h"
-#include <map>
 #include <vector>
 #include <string>
 #include "securec/include/securec.h"
-#include "utils/convert_utils_base.h"
 #include "proto/aicpu_tensor.pb.h"
+#include "google/protobuf/stubs/common.h"
+#include "./kernel_base.h"
+#include "./kernel_errcode.h"
+#include "./kernel_log.h"
 
 namespace aicpu {
 template <typename Scalar>

mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.cc

@@ -19,7 +19,6 @@
 #include <vector>
 #include <string>
 #include "utils/log_adapter.h"
-#include "utils/dlopen_macro.h"
 
 inline void *LoadLibrary(const char *name) {
   auto handle = dlopen(name, RTLD_LAZY | RTLD_LOCAL);

mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_ops_impl.cc

@@ -15,9 +15,14 @@
  */
 
 #include <numeric>
+#include <functional>
+
 #include "plugin/device/cpu/hal/hardware/ms_collective_ops_impl.h"
-#include "distributed/cluster/cluster_context.h"
 #include "utils/ms_context.h"
+#include "actor/msg.h"
+#include "plugin/device/cpu/hal/hardware/ms_collective_topo.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore {
 namespace device {

mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel_func.cc

@@ -17,13 +17,17 @@
 #include "plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel_func.h"
 #include <utility>
 #include <map>
-#include "include/common/thread_pool.h"
-#include "plugin/device/cpu/kernel/nnacl/op_base.h"
-#include "plugin/device/cpu/kernel/nnacl/matmul_parameter.h"
-#include "plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.h"
-#include "plugin/device/cpu/hal/device/cpu_device_address.h"
-#include "utils/ms_utils.h"
+#include <memory>
+#include <string>
+
 #include "mindspore/core/ops/mat_mul.h"
+#include "include/common/utils/utils.h"
+#include "kernel/common_utils.h"
+#include "mkldnn/mkl_cpu_kernel.h"
+#include "oneapi/dnnl/dnnl.hpp"
+#include "oneapi/dnnl/dnnl_types.h"
+#include "ops/base_operator.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/profiler/device/data_saver.cc

@@ -18,7 +18,6 @@
 #include <numeric>
 #include "sys/stat.h"
 #include "utils/ms_utils.h"
-#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace profiler {

mindspore/ccsrc/ps/core/server_node.cc

@@ -15,8 +15,20 @@
  */
 #include "ps/core/server_node.h"
 
-#include "ps/core/communicator/http_communicator.h"
-#include "ps/core/communicator/tcp_communicator.h"
+#include <atomic>
+#include <map>
+#include <string>
+#include <utility>
+
+#include "proto/comm.pb.h"
+#include "ps/core/comm_util.h"
+#include "ps/core/communicator/tcp_client.h"
+#include "ps/core/communicator/tcp_server.h"
+#include "ps/core/configuration.h"
+#include "ps/core/file_configuration.h"
+#include "ps/core/node_info.h"
+#include "utils/log_adapter.h"
+#include "utils/ms_exception.h"
 
 namespace mindspore {
 namespace ps {

mindspore/core/abstract/ops/prim_arrays.cc

@@ -15,18 +15,32 @@
  */
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
-#include <numeric>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "abstract/abstract_value.h"
 #include "abstract/ops/infer_functions.h"
 #include "abstract/param_validator.h"
 #include "abstract/utils.h"
-#include "ops/op_utils.h"
-#include "ops/op_name.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
 #include "utils/shape_utils.h"
+#include "abstract/dshape.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/scalar.h"
+#include "ir/tensor.h"
+#include "ir/value.h"
+#include "mindapi/base/shape_vector.h"
+#include "mindapi/base/type_id.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 
 namespace mindspore {
 namespace abstract {

mindspore/core/abstract/ops/prim_debug.cc

@@ -13,12 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <memory>
+#include <string>
 
 #include "abstract/param_validator.h"
 #include "abstract/ops/infer_functions.h"
-#include "abstract/utils.h"
-#include "utils/symbolic.h"
-
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 namespace mindspore {
 namespace abstract {
 AbstractBasePtr InferImplDebug(const AnalysisEnginePtr &, const PrimitivePtr &primitive,

mindspore/core/abstract/ops/prim_rl.cc

@@ -15,15 +15,17 @@
  */
 
 #include <string>
+#include <memory>
+#include <vector>
 
-#include "ir/dtype.h"
-#include "utils/ms_utils.h"
 #include "abstract/ops/infer_functions.h"
-#include "abstract/utils.h"
-#include "utils/ms_context.h"
-#include "utils/symbolic.h"
-#include "utils/shape_utils.h"
-
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "utils/log_adapter.h"
 namespace mindspore {
 namespace abstract {
 constexpr int64_t kMaxElement = 10000;

mindspore/core/abstract/param_validator.cc

@@ -17,13 +17,13 @@
 #include "abstract/param_validator.h"
 
 #include <algorithm>
-#include <set>
 #include <string>
 #include <sstream>
 #include <memory>
-#include "utils/symbolic.h"
-#include "abstract/utils.h"
-
+#include "abstract/dshape.h"
+#include "ir/dtype.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/scalar.h"
 namespace mindspore {
 namespace abstract {
 #define ABSTRACT_REPORT_NAME_DEC(abstract) constexpr char ReportNameTraits<Abstract##abstract>::name[];

mindspore/core/ir/dtype_extends.cc

@@ -14,12 +14,28 @@
  * limitations under the License.
  */
 
-#include "ir/dtype.h"
 #include <cstdlib>
 #include <algorithm>
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "ir/dtype.h"
 #include "mindapi/base/type_id.h"
 #include "utils/log_adapter.h"
-#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "include/robin_hood.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/empty.h"
+#include "ir/dtype/monad_type.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/ref.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "utils/hash_map.h"
 
 namespace mindspore {
 TypePtr TypeAnything::DeepCopy() const { return kAnyType; }

mindspore/core/ops/all.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/all.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/all_gather.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/all_gather.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/assert.cc

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <memory>
-
 #include "ops/assert.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/audio_spectrogram.cc

@@ -15,11 +15,11 @@
  */
 
 #include "ops/audio_spectrogram.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/call.cc

@@ -15,7 +15,8 @@
  */
 
 #include "ops/call.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/cast.cc

@@ -15,7 +15,8 @@
  */
 
 #include "ops/cast.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/clip.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/clip.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/concat_offset.cc

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 #include "ops/concat_offset.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/constant_of_shape.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/constant_of_shape.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/coo_tensor_get_indices.cc

@@ -16,16 +16,17 @@
 
 #include "ops/coo_tensor_get_indices.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
-
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 namespace mindspore {
 namespace ops {
 AbstractBasePtr COOTensorGetIndicesInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr &primitive,

mindspore/core/ops/coo_tensor_get_shape.cc

@@ -16,15 +16,17 @@
 
 #include "ops/coo_tensor_get_shape.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/coo_tensor_get_values.cc

@@ -16,15 +16,17 @@
 
 #include "ops/coo_tensor_get_values.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/crop.cc

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include "ops/crop.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/csr_tensor_get_indices.cc

@@ -16,15 +16,17 @@
 
 #include "ops/csr_tensor_get_indices.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/csr_tensor_get_indptr.cc

@@ -16,15 +16,17 @@
 
 #include "ops/csr_tensor_get_indptr.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/csr_tensor_get_shape.cc

@@ -16,15 +16,17 @@
 
 #include "ops/csr_tensor_get_shape.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/csr_tensor_get_values.cc

@@ -16,15 +16,17 @@
 
 #include "ops/csr_tensor_get_values.h"
 
-#include "abstract/dshape.h"
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "ops/op_utils.h"
 #include "ops/primitive_c.h"
-#include "utils/anf_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/custom_extract_features.cc

@@ -15,9 +15,8 @@
  */
 
 #include "ops/custom_extract_features.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/custom_normalize.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/custom_normalize.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/custom_predict.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/custom_predict.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/depend.cc

@@ -15,7 +15,8 @@
  */
 
 #include "ops/depend.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/detection_post_process.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/detection_post_process.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/dynamic_quant.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/dynamic_quant.h"
-#include "ops/op_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/eltwise.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/eltwise.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fake_quant_with_min_max_vars.cc

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <string>
 #include "ops/fake_quant_with_min_max_vars.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fft_imag.cc

@@ -15,9 +15,8 @@
  */
 
 #include "ops/fft_imag.h"
-#include <memory>
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fft_real.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include "ops/fft_real.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/avg_pool_fusion.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/fusion/avg_pool_fusion.h"
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/full_connection.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/fusion/full_connection.h"
-#include <string>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/max_pool_fusion.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/fusion/max_pool_fusion.h"
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/reduce_fusion.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <memory>
 #include "ops/fusion/reduce_fusion.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/slice_fusion.cc

@@ -16,8 +16,11 @@
 
 #include "ops/fusion/slice_fusion.h"
 #include <string>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/fusion/softmax_grad_fusion.cc

@@ -15,7 +15,8 @@
  */
 
 #include "ops/fusion/softmax_grad_fusion.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/getnext.cc

@@ -15,17 +15,23 @@
  */
 #include "ops/getnext.h"
 
-#include <set>
-#include <string>
 #include <vector>
 #include <memory>
 #include <algorithm>
+#include <cstdint>
+#include <iterator>
 
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
-#include "utils/shape_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/activation_grad.cc

@@ -15,11 +15,11 @@
  */
 
 #include "ops/grad/activation_grad.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/add_grad.cc

@@ -15,9 +15,8 @@
  */
 
 #include "ops/grad/add_grad.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/bn_grad.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/grad/bn_grad.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/div_grad.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/grad/div_grad.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/flatten_grad.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/grad/flatten_grad.h"
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/group_conv2d_grad_input.cc

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-#include <memory>
+#include <cstdint>
 #include "ops/grad/group_conv2d_grad_input.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/log_grad.cc

@@ -15,9 +15,8 @@
  */
 
 #include "ops/grad/log_grad.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/mul_grad.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/grad/mul_grad.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/power_grad.cc

@@ -15,11 +15,11 @@
  */
 
 #include "ops/grad/power_grad.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/resize_grad.cc

@@ -15,12 +15,11 @@
  */
 
 #include "ops/grad/resize_grad.h"
-#include <map>
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/grad/sub_grad.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/grad/sub_grad.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/gru.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/gru.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/hashtable_lookup.cc

@@ -15,8 +15,8 @@
  */
 #include "ops/hashtable_lookup.h"
 
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/leaky_relu.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/leaky_relu.h"
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/list_setitem.cc

@@ -16,12 +16,18 @@
 
 #include "ops/list_setitem.h"
 
-#include <string>
+#include <memory>
 #include <vector>
 
 #include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/lp_normalization.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/lp_normalization.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/lsh_projection.cc

@@ -15,8 +15,11 @@
  */
 
 #include "ops/lsh_projection.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/make_list.cc

@@ -15,14 +15,17 @@
  */
 #include "ops/make_list.h"
 
-#include <string>
 #include <memory>
 #include <vector>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/op_infer.h"
-#include "utils/check_convert_utils.h"
-#include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/make_range.cc

@@ -21,9 +21,22 @@
 #include <string>
 #include <set>
 
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
 #include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/device_sync.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/scalar.h"
+#include "ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/make_tuple.cc

@@ -15,15 +15,18 @@
  */
 #include "ops/make_tuple.h"
 
-#include <string>
 #include <memory>
 #include <vector>
 
-#include "ops/op_utils.h"
 #include "ops/real_maketuple.h"
 #include "abstract/ops/op_infer.h"
-#include "utils/check_convert_utils.h"
-#include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/mfcc.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/mfcc.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/non_max_suppression.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <set>
-
 #include "ops/non_max_suppression.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/npu_alloc_float_status.cc

@@ -13,15 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include <map>
-#include <string>
-
 #include "ops/npu_alloc_float_status.h"
-#include "ops/op_utils.h"
-#include "abstract/param_validator.h"
-#include "utils/check_convert_utils.h"
+
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/utils.h"
+#include "ir/anf.h"
+#include "ir/dtype.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/partial.cc

@@ -15,7 +15,8 @@
  */
 
 #include "ops/partial.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/print.cc

@@ -15,11 +15,25 @@
  */
 
 #include "ops/print.h"
-#include <set>
-#include "utils/check_convert_utils.h"
+
+#include <cstdint>
+#include <memory>
+
 #include "abstract/ops/op_infer.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/device_sync.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "mindapi/base/shape_vector.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/prior_box.cc

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include "ops/prior_box.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/priority_replay_buffer.cc

@@ -20,9 +20,16 @@
 #include <functional>
 #include <memory>
 #include <vector>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include <cstdint>
+#include <numeric>
+
+#include "ir/dtype/type.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/proposal.cc

@@ -17,9 +17,11 @@
 #include <vector>
 
 #include "ops/proposal.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/random_normal.cc

@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 #include "ops/random_normal.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/rank.cc

@@ -15,8 +15,8 @@
  */
 
 #include "ops/rank.h"
-#include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/reduce.cc

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 #include "ops/reduce.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
-#include "include/common/utils/utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/reduce_asum.cc

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include <memory>
-
 #include "ops/reduce_asum.h"
-#include "ops/op_utils.h"
+#include "ops/base_operator.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/reduce_sum_square.cc

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include <memory>
-
 #include "ops/reduce_sum_square.h"
-#include "ops/op_utils.h"
+#include "ops/base_operator.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/resize.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <memory>
 #include "ops/resize.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/resize_bilinear.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 #include "ops/resize_bilinear.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/rfft.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/rfft.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/roi_pooling.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 #include "ops/roi_pooling.h"
-#include <string>
-#include <memory>
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/rpc_recv.cc

@@ -16,8 +16,12 @@
 
 #include "ops/rpc_recv.h"
 
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/skip_gram.cc

@@ -15,9 +15,11 @@
  */
 
 #include "ops/skip_gram.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/sparse_gather_v2.cc

@@ -16,13 +16,18 @@
 
 #include "ops/sparse_gather_v2.h"
 #include <set>
-#include <memory>
-#include <algorithm>
-#include "ops/op_utils.h"
-#include "mindapi/src/helper.h"
-#include "utils/check_convert_utils.h"
+#include <vector>
 #include "ops/gather_comm.h"
 #include "ops/gather.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/stream_recv.cc

@@ -16,9 +16,9 @@
 
 #include "ops/stream_recv.h"
 
-#include "ops/op_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
-#include "include/common/utils/utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/stream_send.cc

@@ -16,10 +16,9 @@
 
 #include "ops/stream_send.h"
 
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
-#include "include/common/utils/utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/switch.cc

@@ -15,9 +15,8 @@
  */
 
 #include "ops/switch.h"
-#include "ops/op_utils.h"
-#include "utils/check_convert_utils.h"
-#include "abstract/ops/primitive_infer_map.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {