optimize c++ primitive head files

mindspore/core/ops/LayerNormBetaGammaBackprop.cc

@@ -15,12 +15,29 @@
  */
 
 #include "ops/LayerNormBetaGammaBackprop.h"
+
 #include <memory>
 #include <set>
-#include "ops/op_utils.h"
+#include <map>
+#include <string>
+
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.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/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/LayerNormXBackprop.cc

@@ -17,10 +17,21 @@
 #include "ops/LayerNormXBackprop.h"
 #include <memory>
 #include <set>
-#include "ops/op_utils.h"
+
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/abs.cc

@@ -15,13 +15,26 @@
  */
 
 #include "ops/abs.h"
-#include <string>
-#include <algorithm>
-#include <set>
-#include <map>
+
+#include <memory>
+#include <vector>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "base/float16.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "mindapi/base/type_id.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/acos.cc

@@ -15,14 +15,24 @@
  */
 
 #include "ops/acos.h"
-#include <string>
-#include <algorithm>
-#include <map>
+
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/acosh.cc

@@ -15,9 +15,24 @@
  */
 
 #include "ops/acosh.h"
-#include "ops/op_utils.h"
+
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adam.cc

@@ -18,9 +18,28 @@
 
 #include <set>
 #include <functional>
+#include <map>
+#include <numeric>
+#include <string>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adam_no_update_param.cc

@@ -14,15 +14,28 @@
  * limitations under the License.
  */
 #include "ops/adam_no_update_param.h"
+
 #include <string>
 #include <vector>
 #include <set>
 #include <map>
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/adam_weight_decay.cc

@@ -14,15 +14,32 @@
  * limitations under the License.
  */
 #include "ops/adam_weight_decay.h"
+
 #include <string>
 #include <vector>
 #include <set>
 #include <map>
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/adaptive_avg_pool_2d_v1.cc

@@ -15,14 +15,28 @@
  */
 
 #include "ops/adaptive_avg_pool_2d_v1.h"
-#include "ops/adaptive_avg_pool_2d.h"
 
-#include <algorithm>
 #include <set>
 #include <string>
 
-#include "ops/op_utils.h"
+#include "ops/adaptive_avg_pool_2d.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adaptive_avg_pool_3d.cc

@@ -16,13 +16,30 @@
 
 #include "ops/adaptive_avg_pool_3d.h"
 
-#include <algorithm>
 #include <set>
 #include <string>
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
+
 namespace mindspore {
 namespace ops {
 namespace {

mindspore/core/ops/adaptive_max_pool2d.cc

@@ -15,14 +15,30 @@
  */
 
 #include "ops/adaptive_max_pool2d.h"
-#include <string>
-#include <algorithm>
+
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <map>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/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/adaptive_max_pool3d.cc

@@ -15,9 +15,29 @@
  */
 
 #include "ops/adaptive_max_pool3d.h"
-#include "ops/op_utils.h"
+
+#include <algorithm>
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/named.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adder.cc

@@ -15,7 +15,11 @@
  */
 
 #include "ops/adder.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/adjust_contrastv2.cc

@@ -15,13 +15,27 @@
  */
 
 #include "ops/adjust_contrastv2.h"
+
 #include <memory>
 #include <vector>
 #include <set>
-#include <algorithm>
-#include "ops/op_utils.h"
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adjust_hue.cc

@@ -15,12 +15,26 @@
  */
 
 #include "ops/adjust_hue.h"
-#include <algorithm>
+
 #include <memory>
 #include <vector>
-#include "ops/op_utils.h"
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/adjust_saturation.cc

@@ -15,13 +15,26 @@
  */
 
 #include "ops/adjust_saturation.h"
+
 #include <memory>
 #include <vector>
 #include <set>
-#include <algorithm>
-#include "ops/op_utils.h"
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/affine.cc

@@ -15,8 +15,14 @@
  */
 
 #include "ops/affine.h"
+
 #include <vector>
-#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/affine_grid.cc

@@ -15,13 +15,33 @@
  */
 
 #include "ops/affine_grid.h"
+
 #include <memory>
 #include <string>
 #include <set>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "ir/value.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/all_reduce.cc

@@ -14,16 +14,29 @@
  * limitations under the License.
  */
 #include "ops/all_reduce.h"
+
 #include <string>
-#include <algorithm>
 #include <vector>
 #include <set>
-#include "abstract/param_validator.h"
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "utils/ms_context.h"
 #include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/angle.cc

@@ -15,12 +15,29 @@
  */
 
 #include "ops/angle.h"
-#include <string>
-#include <algorithm>
+
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <memory>
+
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "mindapi/base/type_id.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/angle_atom_energy.cc

@@ -17,9 +17,27 @@
 #include "ops/angle_atom_energy.h"
 
 #include <set>
+#include <memory>
+#include <vector>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_ada_max.cc

@@ -16,12 +16,27 @@
 
 #include "ops/apply_ada_max.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <type_traits>
+#include <utility>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_adadelta.cc

@@ -16,13 +16,26 @@
 
 #include "ops/apply_adadelta.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <type_traits>
+#include <utility>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/apply_adagrad.cc

@@ -16,14 +16,30 @@
 
 #include "ops/apply_adagrad.h"
 
-#include <algorithm>
 #include <set>
 #include <utility>
+#include <map>
+#include <type_traits>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_adagrad_d_a.cc

@@ -16,13 +16,28 @@
 
 #include "ops/apply_adagrad_d_a.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <memory>
+#include <type_traits>
+#include <utility>
 
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_adagrad_v2.cc

@@ -16,15 +16,28 @@
 
 #include "ops/apply_adagrad_v2.h"
 
-#include <algorithm>
-#include <functional>
 #include <set>
 #include <utility>
+#include <map>
 
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_adam_with_amsgrad.cc

@@ -20,11 +20,25 @@
 #include <set>
 #include <map>
 #include <utility>
+#include <type_traits>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/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/apply_add_sign.cc

@@ -15,12 +15,29 @@
  */
 
 #include "ops/apply_add_sign.h"
-#include <algorithm>
+
 #include <set>
+#include <map>
+#include <type_traits>
+#include <utility>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_centered_rms_prop.cc

@@ -15,8 +15,24 @@
  */
 
 #include "ops/apply_centered_rms_prop.h"
-#include "ops/op_utils.h"
+
+#include <map>
+#include <set>
+
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_ftrl.cc

@@ -16,14 +16,27 @@
 
 #include "ops/apply_ftrl.h"
 
-#include <algorithm>
 #include <set>
 #include <utility>
+#include <map>
+#include <type_traits>
+#include <vector>
 
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_gradient_descent.cc

@@ -16,15 +16,27 @@
 
 #include "ops/apply_gradient_descent.h"
 
-#include <algorithm>
-#include <functional>
 #include <set>
 #include <utility>
+#include <map>
+#include <type_traits>
 
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_keras_momentum.cc

@@ -16,13 +16,27 @@
 
 #include "ops/apply_keras_momentum.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <type_traits>
+#include <utility>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_momentum.cc

@@ -17,9 +17,29 @@
 #include "ops/apply_momentum.h"
 
 #include <utility>
+#include <map>
+#include <set>
+#include <type_traits>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/overload.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_power_sign_d.cc

@@ -22,9 +22,24 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <type_traits>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_proximal_adagrad.cc

@@ -16,13 +16,27 @@
 
 #include "ops/apply_proximal_adagrad.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <type_traits>
+#include <utility>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_proximal_gradient_descent.cc

@@ -16,15 +16,30 @@
 
 #include "ops/apply_proximal_gradient_descent.h"
 
-#include <algorithm>
 #include <map>
 #include <set>
 #include <string>
+#include <memory>
+#include <type_traits>
+#include <utility>
 
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/apply_rms_prop.cc

@@ -15,8 +15,27 @@
  */
 
 #include "ops/apply_rms_prop.h"
-#include "ops/op_utils.h"
+
+#include <map>
+#include <set>
+#include <vector>
+
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/approximate_equal.cc

@@ -18,8 +18,24 @@
 #include <set>
 #include <map>
 #include <string>
+
 #include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/arg_max.cc

@@ -16,10 +16,25 @@
 
 #include "ops/arg_max.h"
 
-#include <set>
 #include "mindapi/ir/type.h"
 #include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/arg_min.cc

@@ -15,10 +15,31 @@
  */
 
 #include <set>
+#include <algorithm>
+
 #include "ops/arg_min.h"
 #include "mindapi/ir/type.h"
 #include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/scalar.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/arg_min_v2.cc

@@ -16,10 +16,24 @@
 
 #include <set>
 #include <algorithm>
+
 #include "ops/arg_min_v2.h"
-#include "mindapi/ir/type.h"
 #include "utils/check_convert_utils.h"
 #include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/argmax_with_value.cc

@@ -15,12 +15,32 @@
  */
 
 #include "ops/argmax_with_value.h"
-#include <set>
-#include <string>
 
-#include "ops/op_utils.h"
+#include <set>
+#include <map>
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/primitive.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/argmin_with_value.cc

@@ -15,14 +15,35 @@
  */
 
 #include "ops/argmin_with_value.h"
+
 #include <set>
 #include <string>
+#include <map>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "utils/ms_context.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/primitive.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/asin.cc

@@ -15,10 +15,23 @@
  */
 
 #include "ops/asin.h"
-#include "ops/op_utils.h"
+
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "abstract/param_validator.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/asinh.cc

@@ -15,10 +15,24 @@
  */
 
 #include "ops/asinh.h"
-#include "ops/op_utils.h"
+
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "abstract/param_validator.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/assign.cc

@@ -24,6 +24,21 @@
 #include "ops/op_utils.h"
 #include "ir/dtype/ref.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/assign_add.cc

@@ -16,9 +16,21 @@
 
 #include <map>
 #include <string>
+
 #include "ops/assign_add.h"
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.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/assign_sub.cc

@@ -17,8 +17,21 @@
 
 #include <map>
 #include <string>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.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/atan.cc

@@ -14,16 +14,26 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <algorithm>
-#include <map>
 #include <set>
 #include <vector>
+#include <memory>
 
 #include "ops/atan.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/atan2.cc

@@ -15,15 +15,29 @@
  */
 
 #include "ops/atan2.h"
+
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "utils/ms_context.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/atanh.cc

@@ -14,16 +14,24 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <algorithm>
-#include <map>
 #include <set>
 #include <vector>
 
 #include "ops/atanh.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/attention.cc

@@ -16,8 +16,12 @@
  */
 
 #include "ops/attention.h"
+
 #include "ops/primitive_c.h"
-#include "ops/op_utils.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/op_name.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore::ops {

mindspore/core/ops/avg_pool.cc

@@ -15,14 +15,34 @@
  */
 
 #include "ops/avg_pool.h"
+
 #include <string>
 #include <algorithm>
 #include <memory>
-#include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <cmath>
+#include <map>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/avg_pool_3d.cc

@@ -15,13 +15,31 @@
  */
 
 #include "ops/avg_pool_3d.h"
+
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <cmath>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/types.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/avg_pool_v1.cc

@@ -15,14 +15,27 @@
  */
 
 #include "ops/avg_pool_v1.h"
-#include <string>
-#include <algorithm>
+
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
-#include "mindapi/src/helper.h"
+#include <cmath>
+
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/format.h"
+#include "mindapi/base/types.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/check_convert_utils.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/bartlett_window.cc

@@ -15,13 +15,35 @@
  */
 
 #include "ops/bartlett_window.h"
+
 #include <map>
 #include <set>
-#include <string>
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
-#include "mindapi/src/helper.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/named.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/base/type_id.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/batch_matmul.cc

@@ -15,18 +15,35 @@
  */
 
 #include "ops/batch_matmul.h"
+
 #include <map>
 #include <string>
 #include <memory>
 #include <algorithm>
 #include <set>
-#include "ops/op_utils.h"
+
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
-#include "utils/ms_context.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
+#include "utils/ms_context.h"
 #include "ops/mat_mul.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "mindapi/base/type_id.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/batch_norm.cc

@@ -18,10 +18,32 @@
 #include <memory>
 #include <set>
 #include <vector>
+#include <map>
+#include <utility>
+
 #include "ops/batch_norm.h"
 #include "abstract/ops/primitive_infer_map.h"
 #include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/base/type_id.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/batch_to_space.cc

@@ -15,11 +15,29 @@
  */
 
 #include "ops/batch_to_space.h"
+
 #include <set>
-#include "ops/op_utils.h"
+#include <memory>
+#include <string>
+
 #include "utils/check_convert_utils.h"
 #include "utils/shape_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/batch_to_space_nd.cc

@@ -14,16 +14,33 @@
  * limitations under the License.
  */
 #include "ops/batch_to_space_nd.h"
+
 #include <string>
-#include <algorithm>
 #include <memory>
-#include <set>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "utils/ms_context.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/batch_to_space_nd_v2.cc

@@ -14,14 +14,29 @@
  * limitations under the License.
  */
 #include "ops/batch_to_space_nd_v2.h"
+
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bce_with_logits_loss.cc

@@ -15,13 +15,31 @@
  */
 
 #include "ops/bce_with_logits_loss.h"
+
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <vector>
+#include <map>
+#include <set>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bernoulli.cc

@@ -15,12 +15,27 @@
  */
 
 #include "ops/bernoulli.h"
-#include <algorithm>
+
 #include <memory>
 #include <vector>
-#include "ops/op_utils.h"
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/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/bessel_i0.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_i0.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_i0e.cc

@@ -14,14 +14,24 @@
  * limitations under the License.
  */
 #include "ops/bessel_i0e.h"
-#include <string>
-#include <algorithm>
-#include <map>
+
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/bessel_i1.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_i1.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_i1e.cc

@@ -14,14 +14,23 @@
  * limitations under the License.
  */
 #include "ops/bessel_i1e.h"
-#include <string>
-#include <algorithm>
-#include <map>
-#include <set>
+
 #include <vector>
+#include <memory>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/primitive.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/bessel_j0.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_j0.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_j1.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_j1.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_k0.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_k0.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_k0e.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_k0e.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_k1.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_k1.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_k1e.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_k1e.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_y0.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_y0.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bessel_y1.cc

@@ -15,12 +15,24 @@
  */
 #include "ops/bessel_y1.h"
 
-#include <algorithm>
 #include <set>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/betainc.cc

@@ -15,12 +15,25 @@
  */
 #include "ops/betainc.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <memory>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/binary_cross_entropy.cc

@@ -22,9 +22,22 @@
 #include <map>
 
 #include "ops/binary_cross_entropy.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/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/bincount.cc

@@ -15,11 +15,26 @@
  */
 
 #include <set>
+#include <memory>
 
 #include "ops/bincount.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/dtype/number.h"
+#include "ir/named.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "ir/value.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bitwiseand.cc

@@ -16,13 +16,26 @@
 #include "ops/bitwiseand.h"
 
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bitwiseor.cc

@@ -16,13 +16,26 @@
 #include "ops/bitwiseor.h"
 
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bitwisexor.cc

@@ -16,13 +16,26 @@
 #include "ops/bitwisexor.h"
 
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
+#include <map>
+
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/blackman_window.cc

@@ -14,12 +14,34 @@
  * limitations under the License.
  */
 #include "ops/blackman_window.h"
+
 #include <map>
 #include <set>
-#include <string>
+#include <memory>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/named.h"
+#include "ir/primitive.h"
+#include "ir/tensor.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/base/type_id.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bn_training_reduce.cc

@@ -18,12 +18,25 @@
 #include <map>
 #include <set>
 #include <vector>
-#include <string>
 
-#include "ops/op_utils.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/format.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bn_training_update.cc

@@ -16,13 +16,25 @@
 
 #include "ops/bn_training_update.h"
 
-#include <algorithm>
 #include <set>
 
-#include "ops/op_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "utils/tensor_construct_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/container.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/format.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bounding_box_decode.cc

@@ -16,12 +16,26 @@
 
 #include "ops/bounding_box_decode.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <memory>
 
 #include "abstract/ops/primitive_infer_map.h"
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/bounding_box_encode.cc

@@ -16,12 +16,26 @@
 
 #include "ops/bounding_box_encode.h"
 
-#include <algorithm>
 #include <set>
+#include <map>
+#include <memory>
 
 #include "abstract/ops/primitive_infer_map.h"
 #include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/broadcast.cc

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include <set>
-#include <vector>
-#include <memory>
 #include "ops/broadcast.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/broadcast_to.cc

@@ -15,9 +15,30 @@
  */
 
 #include <set>
+#include <algorithm>
+#include <memory>
+
 #include "ops/broadcast_to.h"
 #include "utils/check_convert_utils.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/dtype/type.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/cauchy.cc

@@ -14,14 +14,27 @@
  * limitations under the License.
  */
 #include "ops/cauchy.h"
+
 #include <memory>
-#include <set>
-#include <string>
 #include <vector>
+
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/primitive.h"
+#include "ir/value.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/ceil.cc

@@ -15,14 +15,25 @@
  */
 
 #include <set>
-#include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "ops/ceil.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/celu.cc

@@ -15,14 +15,28 @@
  */
 
 #include "ops/celu.h"
+
 #include <memory>
-#include <string>
 #include <vector>
 #include <set>
 
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/channel_shuffle.cc

@@ -16,14 +16,28 @@
  */
 
 #include "ops/channel_shuffle.h"
-#include <string>
-#include <algorithm>
+
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <map>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shape_vector.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/check_numerics.cc

@@ -15,15 +15,26 @@
  */
 
 #include "ops/check_numerics.h"
-#include <string>
-#include <algorithm>
+
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
-#include "mindapi/src/helper.h"
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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 {
 namespace ops {

mindspore/core/ops/check_valid.cc

@@ -15,10 +15,26 @@
  */
 
 #include "ops/check_valid.h"
+
 #include <set>
+#include <memory>
+
 #include "utils/check_convert_utils.h"
 #include "ops/primitive_c.h"
-#include "ops/op_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/dtype/tensor_type.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/cholesky.cc

@@ -16,12 +16,27 @@
 
 #include "ops/cholesky.h"
 
+#include <memory>
+#include <set>
+
 #include "abstract/dshape.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/cholesky_inverse_.cc

@@ -14,9 +14,27 @@
  * limitations under the License.
  */
 #include "ops/cholesky_inverse_.h"
-#include "ops/op_utils.h"
+
+#include <map>
+#include <set>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "mindapi/base/shared_ptr.h"
+#include "mindapi/ir/value.h"
+#include "ops/core_ops.h"
+#include "ops/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
 #include "mindapi/src/helper.h"
 
 namespace mindspore {

mindspore/core/ops/cholesky_solve.cc

@@ -16,12 +16,29 @@
 
 #include "ops/cholesky_solve.h"
 
+#include <map>
+#include <memory>
+#include <set>
+
 #include "abstract/dshape.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
-#include "ops/op_utils.h"
 #include "utils/check_convert_utils.h"
-#include "utils/tensor_construct_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/clip_by_norm.cc

@@ -15,11 +15,34 @@
  */
 
 #include "ops/clip_by_norm.h"
+
 #include <set>
 #include <map>
+#include <algorithm>
+
 #include "ops/op_utils.h"
-#include "mindapi/src/helper.h"
 #include "utils/check_convert_utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/ops/primitive_infer_map.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ir/scalar.h"
+#include "ir/value.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/op_name.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "utils/shape_utils.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/clip_by_norm_no_div_sum.cc

@@ -16,15 +16,27 @@
 #include "ops/clip_by_norm_no_div_sum.h"
 
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <map>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {

mindspore/core/ops/clip_by_value.cc

@@ -16,15 +16,27 @@
 #include "ops/clip_by_value.h"
 
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <vector>
-#include "ops/op_utils.h"
+#include <map>
+
 #include "utils/check_convert_utils.h"
 #include "abstract/ops/primitive_infer_map.h"
-#include "mindapi/src/helper.h"
 #include "include/common/utils/utils.h"
+#include "abstract/abstract_value.h"
+#include "abstract/dshape.h"
+#include "abstract/ops/op_infer.h"
+#include "abstract/utils.h"
+#include "base/base.h"
+#include "ir/anf.h"
+#include "ir/dtype/number.h"
+#include "ir/primitive.h"
+#include "ops/core_ops.h"
+#include "ops/primitive_c.h"
+#include "utils/convert_utils_base.h"
+#include "utils/log_adapter.h"
+#include "mindapi/src/helper.h"
 
 namespace mindspore {
 namespace ops {