Replace fluid/operators/eigen/eigen_function.h (#63257)

co63oc · web-flow · commit ad833fee8c64 · 2024-04-07T11:18:28.000+08:00
diff --git a/paddle/fluid/operators/crop_op.h b/paddle/fluid/operators/crop_op.h
@@ -18,7 +18,7 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 #include "paddle/phi/kernels/funcs/strided_memcpy.h"
 
 namespace paddle {
@@ -101,7 +101,7 @@ void CropFunction(const framework::ExecutionContext& context) {
   }
   auto& place =
       *context.template device_context<DeviceContext>().eigen_device();
-  EigenSlice<std::decay_t<decltype(place)>, T, D>::Eval(
+  phi::funcs::EigenSlice<std::decay_t<decltype(place)>, T, D>::Eval(
       place, out_tensor, x_tensor, e_offsets, e_shape);
 }
 
@@ -165,7 +165,7 @@ void CropGradFunction(const framework::ExecutionContext& context) {
     auto d_out_tensor = EigenTensor<T, D>::From(*d_out);
     auto& place =
         *context.template device_context<DeviceContext>().eigen_device();
-    EigenPad<std::decay_t<decltype(place)>, T, D>::Eval(
+    phi::funcs::EigenPad<std::decay_t<decltype(place)>, T, D>::Eval(
         place, d_x_tensor, d_out_tensor, paddings, static_cast<T>(0));
   }
 }
diff --git a/paddle/fluid/operators/expand_as_v2_op.h b/paddle/fluid/operators/expand_as_v2_op.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 
 #define MAX_RANK_SUPPORTED 8
 
diff --git a/paddle/fluid/operators/expand_op.h b/paddle/fluid/operators/expand_op.h
@@ -19,7 +19,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 
 #define MAX_RANK_SUPPORTED 8
 
@@ -172,10 +172,10 @@ class ExpandKernel : public framework::OpKernel<T> {
     // use 32-bit index to speed up
     bool use_32bit_index = y.size() < Eigen::NumTraits<int>::highest();
     if (use_32bit_index) {
-      EigenBroadcast<std::decay_t<decltype(place)>, T, Rank>::Eval(
+      phi::funcs::EigenBroadcast<std::decay_t<decltype(place)>, T, Rank>::Eval(
           place, To32BitIndex(y), To32BitIndex(x), bcast_dims);
     } else {
-      EigenBroadcast<std::decay_t<decltype(place)>, T, Rank>::Eval(
+      phi::funcs::EigenBroadcast<std::decay_t<decltype(place)>, T, Rank>::Eval(
           place, y, x, bcast_dims);
     }
   }
@@ -307,8 +307,8 @@ class ExpandGradKernel : public framework::OpKernel<T> {
     auto out_grad = EigenVector<T>::Flatten(*in0);
     auto& place =
         *context.template device_context<DeviceContext>().eigen_device();
-    EigenBroadcastGrad<std::decay_t<decltype(place)>, T, Dims>::Eval(
-        place, x_grad, out_grad, reduce_dims, reshape_dims);
+    phi::funcs::EigenBroadcastGrad<std::decay_t<decltype(place)>, T, Dims>::
+        Eval(place, x_grad, out_grad, reduce_dims, reshape_dims);
   }
 };
 
diff --git a/paddle/fluid/operators/expand_v2_op.h b/paddle/fluid/operators/expand_v2_op.h
@@ -20,7 +20,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 
 #define MAX_RANK_SUPPORTED 8
 
diff --git a/paddle/fluid/operators/l1_norm_op.h b/paddle/fluid/operators/l1_norm_op.h
@@ -15,7 +15,7 @@ limitations under the License. */
 #pragma once
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 
 namespace paddle {
 namespace operators {
@@ -34,7 +34,8 @@ class L1NormKernel : public framework::OpKernel<T> {
     auto &place =
         *context.template device_context<DeviceContext>().eigen_device();
 
-    EigenL1Norm<std::decay_t<decltype(place)>, T>::Eval(place, out, x);
+    phi::funcs::EigenL1Norm<std::decay_t<decltype(place)>, T>::Eval(
+        place, out, x);
   }
 };
 
@@ -62,7 +63,7 @@ class L1NormGradKernel : public framework::OpKernel<T> {
         *context.template device_context<DeviceContext>().eigen_device();
 
     Eigen::DSizes<Eigen::DenseIndex, 1> x_dsize(x->numel());
-    EigenL1NormGrad<std::decay_t<decltype(place)>, T>::Eval(
+    phi::funcs::EigenL1NormGrad<std::decay_t<decltype(place)>, T>::Eval(
         place, dx_eigen, d_out_eigen, x_eigen, x_dsize);
   }
 };
diff --git a/paddle/fluid/operators/minus_op.h b/paddle/fluid/operators/minus_op.h
@@ -15,7 +15,7 @@ limitations under the License. */
 #pragma once
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 
 namespace paddle {
 namespace operators {
@@ -31,7 +31,7 @@ class MinusKernel : public framework::OpKernel<T> {
     out_tensor->mutable_data<T>(context.GetPlace());
     auto& dev =
         *context.template device_context<DeviceContext>().eigen_device();
-    EigenSub<std::decay_t<decltype(dev)>, T>::Eval(
+    phi::funcs::EigenSub<std::decay_t<decltype(dev)>, T>::Eval(
         dev,
         framework::EigenVector<T>::Flatten(*out_tensor),
         framework::EigenVector<T>::Flatten(*left_tensor),
diff --git a/paddle/fluid/operators/set_value_op.h b/paddle/fluid/operators/set_value_op.h
@@ -22,10 +22,10 @@
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/tensor_util.h"
 #include "paddle/fluid/operators/assign_value_op.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
 #include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
 #include "paddle/fluid/operators/utils.h"
 #include "paddle/fluid/platform/enforce.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 #include "paddle/phi/kernels/funcs/slice_utils.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/svd_helper.h b/paddle/fluid/operators/svd_helper.h
@@ -24,12 +24,12 @@
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/tensor.h"
 #include "paddle/fluid/operators/diag_op.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
 #include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/for_range.h"
 #include "paddle/phi/kernels/funcs/blas/blas.h"
 #include "paddle/phi/kernels/funcs/complex_functors.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 #include "paddle/phi/kernels/funcs/lapack/lapack_function.h"
 #include "paddle/phi/kernels/funcs/math_function.h"
 
@@ -732,7 +732,7 @@ struct DeviceIndependenceTensorOperations {
       offsets_32bit[i] = start[i];
       extents_32bit[i] = end[i];
     }
-    EigenSlice<std::decay_t<decltype(eigen_place)>, T, D>::Eval(
+    phi::funcs::EigenSlice<std::decay_t<decltype(eigen_place)>, T, D>::Eval(
         eigen_place,
         framework::To32BitIndex(out_t),
         framework::To32BitIndex(in_t),
diff --git a/paddle/fluid/pybind/tensor_py.h b/paddle/fluid/pybind/tensor_py.h
@@ -31,11 +31,11 @@ limitations under the License. */
 #include "paddle/fluid/framework/data_type.h"
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/memory/memcpy.h"
-#include "paddle/fluid/operators/eigen/eigen_function.h"
 #include "paddle/fluid/operators/math/concat_and_split.h"
 #include "paddle/fluid/platform/bfloat16.h"
 #include "paddle/fluid/platform/device/device_wrapper.h"
 #include "paddle/fluid/pybind/complex.h"
+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
 #include "paddle/phi/kernels/funcs/strided_memcpy.h"
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
 #include "paddle/fluid/platform/cuda_device_guard.h"
@@ -696,7 +696,7 @@ void _sliceCompute(const phi::DenseTensor *in,
   auto out_t =
       framework::EigenTensor<T, D, Eigen::RowMajor, Eigen::DenseIndex>::From(
           *out);
-  operators::EigenSlice<std::decay_t<decltype(eigen_place)>, T, D>::Eval(
+  phi::funcs::EigenSlice<std::decay_t<decltype(eigen_place)>, T, D>::Eval(
       eigen_place, out_t, in_t, offsets, extents);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ limitations under the License. */`
`18`	`18`
`19`	`19`	`#include "paddle/fluid/framework/eigen.h"`
`20`	`20`	`#include "paddle/fluid/framework/op_registry.h"`
`21`		`-#include "paddle/fluid/operators/eigen/eigen_function.h"`
	`21`	`+#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"`
`22`	`22`	`#include "paddle/phi/kernels/funcs/strided_memcpy.h"`
`23`	`23`
`24`	`24`	`namespace paddle {`
`@@ -101,7 +101,7 @@ void CropFunction(const framework::ExecutionContext& context) {`
`101`	`101`	`}`
`102`	`102`	`auto& place =`
`103`	`103`	`*context.template device_context<DeviceContext>().eigen_device();`
`104`		`- EigenSlice<std::decay_t<decltype(place)>, T, D>::Eval(`
	`104`	`+ phi::funcs::EigenSlice<std::decay_t<decltype(place)>, T, D>::Eval(`
`105`	`105`	`place, out_tensor, x_tensor, e_offsets, e_shape);`
`106`	`106`	`}`
`107`	`107`
`@@ -165,7 +165,7 @@ void CropGradFunction(const framework::ExecutionContext& context) {`
`165`	`165`	`auto d_out_tensor = EigenTensor<T, D>::From(*d_out);`
`166`	`166`	`auto& place =`
`167`	`167`	`*context.template device_context<DeviceContext>().eigen_device();`
`168`		`- EigenPad<std::decay_t<decltype(place)>, T, D>::Eval(`
	`168`	`+ phi::funcs::EigenPad<std::decay_t<decltype(place)>, T, D>::Eval(`
`169`	`169`	`place, d_x_tensor, d_out_tensor, paddings, static_cast<T>(0));`
`170`	`170`	`}`
`171`	`171`	`}`