测试用，无需review

paddle/fluid/operators/concat_op_mlu.cc

@@ -14,6 +14,7 @@ limitations under the License. */
 
 #include "paddle/fluid/operators/concat_op.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -32,7 +33,7 @@ class ConcatMLUKernel : public framework::OpKernel<T> {
     bool need_resize_out_dims = false;
     if (ctx.HasInput("AxisTensor")) {
       auto* axis_tensor = ctx.Input<phi::DenseTensor>("AxisTensor");
-      axis = GetDataFromTensor<int>(axis_tensor)[0];
+      axis = phi::GetVectorFromTensor<int>(axis_tensor)[0];
       need_resize_out_dims = true;
     }
     axis = ComputeAxis(static_cast<int64_t>(axis),
@@ -97,7 +98,7 @@ class ConcatGradMLUKernel : public framework::OpKernel<T> {
 
     if (ctx.HasInput("AxisTensor")) {
       auto* axis_tensor = ctx.Input<phi::DenseTensor>("AxisTensor");
-      axis = GetDataFromTensor<int>(axis_tensor)[0];
+      axis = phi::GetVectorFromTensor<int>(axis_tensor)[0];
     }
 
     axis = ComputeAxis(static_cast<int64_t>(axis),

paddle/fluid/operators/cudnn_lstm_op.cu.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/utils.h"
 #include "paddle/phi/core/generator.h"
+#include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/math_function.h"
 #ifdef PADDLE_WITH_CUDA
 #include "paddle/fluid/operators/cudnn_lstm_cache.h"
@@ -242,7 +242,7 @@ class CudnnLSTMGPUKernel : public framework::OpKernel<T> {
     std::vector<int> SequenceLength;
     if (has_seq_length) {
       auto *sequence_length = ctx.Input<phi::DenseTensor>("SequenceLength");
-      SequenceLength = operators::GetDataFromTensor<int>(sequence_length);
+      SequenceLength = phi::GetVectorFromTensor<int>(sequence_length);
     }
 
     auto &dev_ctx = ctx.template device_context<phi::GPUContext>();
@@ -532,7 +532,7 @@ class CudnnLSTMGPUGradKernel : public framework::OpKernel<T> {
     std::vector<int> SequenceLength;
     if (has_seq_length) {
       auto *sequence_length = ctx.Input<phi::DenseTensor>("SequenceLength");
-      SequenceLength = operators::GetDataFromTensor<int>(sequence_length);
+      SequenceLength = phi::GetVectorFromTensor<int>(sequence_length);
     }
 
     int seq_length = input_dims[0];

paddle/fluid/operators/interpolate_v2_op_mlu.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/interpolate_op.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
-#include "paddle/fluid/operators/utils.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -96,7 +96,7 @@ class InterpolateV2MLUKernel : public framework::OpKernel<T> {
       auto scale = ctx.Attr<std::vector<float>>("scale");
       if (scale_tensor != nullptr) {
         std::vector<float> scale_data;
-        scale_data = GetDataFromTensor<float>(scale_tensor);
+        scale_data = phi::GetVectorFromTensor<float>(scale_tensor);
 
         if (scale_data.size() > 1 && scale_data.size() <= 2) {
           scale_h = scale_data[0];
@@ -147,7 +147,7 @@ class InterpolateV2MLUKernel : public framework::OpKernel<T> {
       auto out_size = ctx.Input<phi::DenseTensor>("OutSize");
       if (out_size != nullptr) {
         std::vector<int32_t> out_size_data;
-        out_size_data = GetDataFromTensor<int>(out_size);
+        out_size_data = phi::GetVectorFromTensor<int>(out_size);
         if (out_size_data.size() <= 2) {
           out_h = out_size_data[0];
           out_w = out_size_data[1];
@@ -398,7 +398,7 @@ class InterpolateV2GradMLUKernel : public framework::OpKernel<T> {
       auto scale = ctx.Attr<std::vector<float>>("scale");
       if (scale_tensor != nullptr) {
         std::vector<float> scale_data;
-        scale_data = GetDataFromTensor<float>(scale_tensor);
+        scale_data = phi::GetVectorFromTensor<float>(scale_tensor);
         if (scale_data.size() > 1) {
           scale_h = scale_data[0];
           scale_w = scale_data[1];
@@ -430,7 +430,7 @@ class InterpolateV2GradMLUKernel : public framework::OpKernel<T> {
       auto out_size = ctx.Input<phi::DenseTensor>("OutSize");
       if (out_size != nullptr) {
         std::vector<int32_t> out_size_data;
-        out_size_data = GetDataFromTensor<int>(out_size);
+        out_size_data = phi::GetVectorFromTensor<int>(out_size);
         out_h = out_size_data[0];
         out_w = out_size_data[1];
       }

paddle/fluid/operators/one_hot_v2_op_mlu.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
-#include "paddle/fluid/operators/utils.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -31,8 +31,8 @@ class OneHotV2MLUKernel : public framework::OpKernel<T> {
     int depth = ctx.Attr<int>("depth");
     if (ctx.HasInput("depth_tensor")) {
       std::vector<int32_t> depth_data;
-      depth_data =
-          GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("depth_tensor"));
+      depth_data = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("depth_tensor"));
       depth = depth_data[0];
 
       auto out_dims = out->dims();

paddle/fluid/operators/reshape_op_mlu.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/utils.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -38,14 +38,15 @@ class Reshape2MLUKernel : public framework::OpKernel<T> {
                 "shape is [%d]",
                 shape_tensor->dims().size()));
 
-        target_shape_vector.push_back(GetDataFromTensor<int>(shape_tensor)[0]);
+        target_shape_vector.push_back(
+            phi::GetVectorFromTensor<int>(shape_tensor)[0]);
       }
     } else {
       auto* shape_tensor = ctx.HasInput("Shape")
                                ? ctx.Input<phi::DenseTensor>("Shape")
                                : nullptr;
       if (shape_tensor) {
-        target_shape_vector = GetDataFromTensor<int>(shape_tensor);
+        target_shape_vector = phi::GetVectorFromTensor<int>(shape_tensor);
       } else {
         target_shape_vector = ctx.Attr<std::vector<int>>("shape");
         PADDLE_ENFORCE_GT(

paddle/fluid/operators/reshape_op_npu.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <string>
 
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/utils.h"
 #include "paddle/fluid/platform/device/npu/npu_op_runner.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -46,14 +46,15 @@ class Reshape2NPUKernel : public framework::OpKernel<T> {
                 "shape is [%d]",
                 shape_tensor->dims().size()));
 
-        target_shape_vector.push_back(GetDataFromTensor<int>(shape_tensor)[0]);
+        target_shape_vector.push_back(
+            phi::GetVectorFromTensor<int>(shape_tensor)[0]);
       }
     } else {
       auto* shape_tensor = ctx.HasInput("Shape")
                                ? ctx.Input<phi::DenseTensor>("Shape")
                                : nullptr;
       if (shape_tensor) {
-        target_shape_vector = GetDataFromTensor<int>(shape_tensor);
+        target_shape_vector = phi::GetVectorFromTensor<int>(shape_tensor);
       } else {
         target_shape_vector = ctx.Attr<std::vector<int>>("shape");
         PADDLE_ENFORCE_GT(

paddle/fluid/operators/rnn_op_mlu.cc

@@ -11,10 +11,10 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
-#include "paddle/fluid/operators/utils.h"
 #include "paddle/fluid/platform/device/device_wrapper.h"
 #include "paddle/fluid/platform/device/xpu/xpu_header.h"
 #include "paddle/fluid/platform/device_context.h"
+#include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/math_function.h"
 
 namespace paddle {
@@ -97,7 +97,7 @@ class RNNMLUKernel : public framework::OpKernel<T> {
     std::vector<int> seq_len_vec(batch_size, seq_len);
     if (has_seq_length) {  // set seq_len if no padding, otherwise seq_len for
                            // each element.
-      seq_len_vec = operators::GetDataFromTensor(sequence_length);
+      seq_len_vec = phi::GetVectorFromTensor(sequence_length);
     }
     cnnlDirectionMode_t direction =
         is_bidirec ? CNNL_RNN_BIDIRECTIONAL : CNNL_RNN_UNIDIRECTIONAL;
@@ -480,7 +480,7 @@ class RNNMLUGradKernel : public framework::OpKernel<T> {
 
     std::vector<int> seq_len_vec(batch_size, seq_len);
     if (has_seq_length) {
-      seq_len_vec = operators::GetDataFromTensor(sequence_length);
+      seq_len_vec = phi::GetVectorFromTensor(sequence_length);
     }
     cnnlDirectionMode_t direction =
         is_bidirec ? CNNL_RNN_BIDIRECTIONAL : CNNL_RNN_UNIDIRECTIONAL;

paddle/fluid/operators/slice_op_mlu.cc

@@ -15,6 +15,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
 #include "paddle/fluid/operators/utils.h"
+#include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/slice_utils.h"
 
 namespace paddle {
@@ -38,15 +39,16 @@ class SliceMLUKernel : public framework::OpKernel<T> {
     auto starts_tensor_list =
         ctx.MultiInput<phi::DenseTensor>("StartsTensorList");
     if (ctx.HasInput("StartsTensor")) {
-      starts =
-          GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("StartsTensor"));
+      starts = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("StartsTensor"));
     } else if (starts_tensor_list.size() > 0) {
       starts = GetDataFromTensorList<int>(starts_tensor_list);
     }
 
     auto ends_tensor_list = ctx.MultiInput<phi::DenseTensor>("EndsTensorList");
     if (ctx.HasInput("EndsTensor")) {
-      ends = GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("EndsTensor"));
+      ends = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("EndsTensor"));
     } else if (ends_tensor_list.size() > 0) {
       ends = GetDataFromTensorList<int>(ends_tensor_list);
     }
@@ -141,15 +143,16 @@ class SliceGradMLUKernel : public framework::OpKernel<T> {
     auto starts_tensor_list =
         ctx.MultiInput<phi::DenseTensor>("StartsTensorList");
     if (ctx.HasInput("StartsTensor")) {
-      starts =
-          GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("StartsTensor"));
+      starts = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("StartsTensor"));
     } else if (starts_tensor_list.size() > 0) {
       starts = GetDataFromTensorList<int>(starts_tensor_list);
     }
 
     auto ends_tensor_list = ctx.MultiInput<phi::DenseTensor>("EndsTensorList");
     if (ctx.HasInput("EndsTensor")) {
-      ends = GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("EndsTensor"));
+      ends = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("EndsTensor"));
     } else if (ends_tensor_list.size() > 0) {
       ends = GetDataFromTensorList<int>(ends_tensor_list);
     }

paddle/fluid/operators/slice_op_npu.cc

@@ -15,6 +15,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/utils.h"
 #include "paddle/fluid/platform/device/npu/npu_op_runner.h"
+#include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/slice_utils.h"
 
 namespace paddle {
@@ -77,15 +78,16 @@ class SliceNPUKernel : public framework::OpKernel<T> {
     auto starts_tensor_list =
         ctx.MultiInput<phi::DenseTensor>("StartsTensorList");
     if (ctx.HasInput("StartsTensor")) {
-      starts =
-          GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("StartsTensor"));
+      starts = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("StartsTensor"));
     } else if (starts_tensor_list.size() > 0) {
       starts = GetDataFromTensorList<int>(starts_tensor_list);
     }
 
     auto ends_tensor_list = ctx.MultiInput<phi::DenseTensor>("EndsTensorList");
     if (ctx.HasInput("EndsTensor")) {
-      ends = GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("EndsTensor"));
+      ends = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("EndsTensor"));
     } else if (ends_tensor_list.size() > 0) {
       ends = GetDataFromTensorList<int>(ends_tensor_list);
     }
@@ -172,15 +174,16 @@ class SliceGradNPUKernel : public framework::OpKernel<T> {
     auto starts_tensor_list =
         ctx.MultiInput<phi::DenseTensor>("StartsTensorList");
     if (ctx.HasInput("StartsTensor")) {
-      starts =
-          GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("StartsTensor"));
+      starts = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("StartsTensor"));
     } else if (starts_tensor_list.size() > 0) {
       starts = GetDataFromTensorList<int>(starts_tensor_list);
     }
 
     auto ends_tensor_list = ctx.MultiInput<phi::DenseTensor>("EndsTensorList");
     if (ctx.HasInput("EndsTensor")) {
-      ends = GetDataFromTensor<int>(ctx.Input<phi::DenseTensor>("EndsTensor"));
+      ends = phi::GetVectorFromTensor<int>(
+          ctx.Input<phi::DenseTensor>("EndsTensor"));
     } else if (ends_tensor_list.size() > 0) {
       ends = GetDataFromTensorList<int>(ends_tensor_list);
     }

paddle/fluid/operators/split_op_mlu.cc

@@ -14,6 +14,7 @@ limitations under the License. */
 
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
 #include "paddle/fluid/operators/split_op.h"
+#include "paddle/phi/core/tensor_utils.h"
 
 namespace paddle {
 namespace operators {
@@ -35,7 +36,7 @@ class SplitMLUKernel : public framework::OpKernel<T> {
     bool need_resize_outs_dims = false;
     if (ctx.HasInput("AxisTensor")) {
       auto* axis_tensor = ctx.Input<phi::DenseTensor>("AxisTensor");
-      axis = GetDataFromTensor(axis_tensor)[0];
+      axis = phi::GetVectorFromTensor(axis_tensor)[0];
       need_resize_outs_dims = true;
     }
     auto sections_tensor_list =

paddle/fluid/operators/strided_slice_op_mlu.cc

@@ -15,6 +15,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/operators/mlu/mlu_baseop.h"
 #include "paddle/fluid/operators/utils.h"
+#include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/strided_slice.h"
 
 namespace paddle {
@@ -168,21 +169,21 @@ class StridedSliceMLUKernel : public framework::OpKernel<T> {
       starts = GetDataFromTensorList<int64_t>(list_new_starts_tensor);
     } else if (ctx.HasInput("StartsTensor")) {
       auto* starts_tensor = ctx.Input<phi::DenseTensor>("StartsTensor");
-      starts = GetDataFromTensor<int64_t>(starts_tensor);
+      starts = phi::GetVectorFromTensor<int64_t>(starts_tensor);
     }
 
     if (list_new_ends_tensor.size() > 0) {
       ends = GetDataFromTensorList<int64_t>(list_new_ends_tensor);
     } else if (ctx.HasInput("EndsTensor")) {
       auto* ends_tensor = ctx.Input<phi::DenseTensor>("EndsTensor");
-      ends = GetDataFromTensor<int64_t>(ends_tensor);
+      ends = phi::GetVectorFromTensor<int64_t>(ends_tensor);
     }
 
     if (list_new_strides_tensor.size() > 0) {
       strides = GetDataFromTensorList<int64_t>(list_new_strides_tensor);
     } else if (ctx.HasInput("StridesTensor")) {
       auto* strides_tensor = ctx.Input<phi::DenseTensor>("StridesTensor");
-      strides = GetDataFromTensor<int64_t>(strides_tensor);
+      strides = phi::GetVectorFromTensor<int64_t>(strides_tensor);
     }
 
     // out dims calculation
@@ -336,21 +337,21 @@ class StridedSliceGradMLUKernel : public framework::OpKernel<T> {
       starts = GetDataFromTensorList<int64_t>(list_new_starts_tensor);
     } else if (ctx.HasInput("StartsTensor")) {
       auto* starts_tensor = ctx.Input<phi::DenseTensor>("StartsTensor");
-      starts = GetDataFromTensor<int64_t>(starts_tensor);
+      starts = phi::GetVectorFromTensor<int64_t>(starts_tensor);
     }
 
     if (list_new_ends_tensor.size() > 0) {
       ends = GetDataFromTensorList<int64_t>(list_new_ends_tensor);
     } else if (ctx.HasInput("EndsTensor")) {
       auto* ends_tensor = ctx.Input<phi::DenseTensor>("EndsTensor");
-      ends = GetDataFromTensor<int64_t>(ends_tensor);
+      ends = phi::GetVectorFromTensor<int64_t>(ends_tensor);
     }
 
     if (list_new_strides_tensor.size() > 0) {
       strides = GetDataFromTensorList<int64_t>(list_new_strides_tensor);
     } else if (ctx.HasInput("StridesTensor")) {
       auto* strides_tensor = ctx.Input<phi::DenseTensor>("StridesTensor");
-      strides = GetDataFromTensor<int64_t>(strides_tensor);
+      strides = phi::GetVectorFromTensor<int64_t>(strides_tensor);
     }
 
     std::vector<int64_t> out_dims_vector(input_dims.size(), -1);