PaddlePaddle
diff --git a/‎paddle/fluid/operators/elementwise/elementwise_op.h
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎paddle/fluid/operators/elementwise/elementwise_op.h
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎paddle/fluid/operators/fused/fused_elemwise_activation_op.h
Copy file name to clipboard
+35-30Lines changed: 35 additions & 30 deletions b/‎paddle/fluid/operators/fused/fused_elemwise_activation_op.h
Copy file name to clipboard
+35-30Lines changed: 35 additions & 30 deletions
diff --git a/‎paddle/fluid/operators/set_value_op.h
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎paddle/fluid/operators/set_value_op.h
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
@@ -21,9 +21,10 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/framework/data_layout.h"
+#include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/op_version_registry.h"
-#include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
 #include "paddle/phi/kernels/funcs/common_shape.h"
+#include "paddle/phi/kernels/funcs/elementwise/elementwise_op_function.h"
 
 #ifdef PADDLE_WITH_DNNL
 #include "paddle/fluid/platform/onednn_helper.h"
 
@@ -19,8 +19,8 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
 #include "paddle/phi/kernels/funcs/compound_functors.h"
+#include "paddle/phi/kernels/funcs/elementwise/elementwise_op_function.h"
 #include "paddle/phi/kernels/funcs/elementwise_functor.h"
 #include "paddle/phi/kernels/funcs/functors.h"
 
@@ -62,22 +62,23 @@ static void RunBinaryCompoundFunctor(const framework::ExecutionContext &ctx,
   phi::funcs::BinaryCompoundFunctor<T, BinaryFunctor, UnaryFunctor>
       compound_func(binary_functor, unary_functor);
   int axis = ctx.Attr<int>("axis");
+  auto &dev_ctx = ctx.template device_context<DeviceContext>();
   if (ctx.Attr<bool>("save_intermediate_out")) {
-    FusedElemwiseAndActComputeEx<
+    phi::funcs::FusedElemwiseAndActComputeEx<
         DeviceContext,
         T,
         phi::funcs::BinaryCompoundFunctor<T, BinaryFunctor, UnaryFunctor>,
         true /*KeepIntermediateValue*/,
         false /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
+        dev_ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
   } else {
-    FusedElemwiseAndActComputeEx<
+    phi::funcs::FusedElemwiseAndActComputeEx<
         DeviceContext,
         T,
         phi::funcs::BinaryCompoundFunctor<T, BinaryFunctor, UnaryFunctor>,
         false /*KeepIntermediateValue*/,
         false /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
+        dev_ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
   }
 }
 
@@ -99,23 +100,23 @@ static void RunUnaryCompoundFunctors(const framework::ExecutionContext &ctx,
 
   phi::funcs::UnaryCompoundFunctor<T, UnaryFunctor, BinaryFunctor>
       compound_func(unary_functor, binary_functor);
-
+  auto &dev_ctx = ctx.template device_context<DeviceContext>();
   if (ctx.Attr<bool>("save_intermediate_out")) {
-    FusedElemwiseAndActComputeEx<
+    phi::funcs::FusedElemwiseAndActComputeEx<
         DeviceContext,
         T,
         phi::funcs::UnaryCompoundFunctor<T, UnaryFunctor, BinaryFunctor>,
         true /*KeepIntermediateValue*/,
         true /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
+        dev_ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
   } else {
-    FusedElemwiseAndActComputeEx<
+    phi::funcs::FusedElemwiseAndActComputeEx<
         DeviceContext,
         T,
         phi::funcs::UnaryCompoundFunctor<T, UnaryFunctor, BinaryFunctor>,
         false /*KeepIntermediateValue*/,
         true /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
+        dev_ctx, in_x, in_y, axis, compound_func, (*outputs)[0], (*outputs)[1]);
   }
 }
 
@@ -154,16 +155,17 @@ static void RunBinaryCompoundGradFunctors(
                                                             BinaryGradFunctor,
                                                             UnaryFunctor>;
 
+  auto &dev_ctx = ctx.template device_context<DeviceContext>();
   if (in_intermediate_out) {
-    FusedElemwiseAndActGradComputeEx<
+    phi::funcs::FusedElemwiseAndActGradComputeEx<
         DeviceContext,
         T,
         BinaryCompoundDxFunctor,
         BinaryCompoundDyFunctor,
         BinaryCompoundDIntermediateOutFunctor,
         true /*UseIntermediateOut*/,
         false /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx,
+        dev_ctx,
         in_x,
         in_y,
         in_out,
@@ -179,15 +181,15 @@ static void RunBinaryCompoundGradFunctors(
         BinaryCompoundDIntermediateOutFunctor(binary_grad_functor,
                                               unary_functor));
   } else {
-    FusedElemwiseAndActGradComputeEx<
+    phi::funcs::FusedElemwiseAndActGradComputeEx<
         DeviceContext,
         T,
         BinaryCompoundDxFunctor,
         BinaryCompoundDyFunctor,
         BinaryCompoundDIntermediateOutFunctor,
         false /*UseIntermediateOut*/,
         false /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx,
+        dev_ctx,
         in_x,
         in_y,
         in_out,
@@ -245,15 +247,17 @@ static void RunUnaryCompoundGradFunctors(
                                                         BinaryFunctor,
                                                         InPlace>;
 
+  auto &dev_ctx = ctx.template device_context<DeviceContext>();
   if (in_intermediate_out) {
-    FusedElemwiseAndActGradComputeEx<DeviceContext,
-                                     T,
-                                     UnaryCompoundDxFunctor,
-                                     UnaryCompoundDyFunctor,
-                                     UnaryCompoundDIntermediateFunctor,
-                                     true /*UseIntermediateOut*/,
-                                     true /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx,
+    phi::funcs::FusedElemwiseAndActGradComputeEx<
+        DeviceContext,
+        T,
+        UnaryCompoundDxFunctor,
+        UnaryCompoundDyFunctor,
+        UnaryCompoundDIntermediateFunctor,
+        true /*UseIntermediateOut*/,
+        true /*SameShapeOfIntermediateOutAndOut*/>(
+        dev_ctx,
         in_x,
         in_y,
         in_out,
@@ -269,14 +273,15 @@ static void RunUnaryCompoundGradFunctors(
             unary_grad_functor, binary_functor, binary_grad_functor),
         UnaryCompoundDIntermediateFunctor(unary_grad_functor, binary_functor));
   } else {
-    FusedElemwiseAndActGradComputeEx<DeviceContext,
-                                     T,
-                                     UnaryCompoundDxFunctor,
-                                     UnaryCompoundDyFunctor,
-                                     UnaryCompoundDIntermediateFunctor,
-                                     false /*UseIntermediateOut*/,
-                                     true /*SameShapeOfIntermediateOutAndOut*/>(
-        ctx,
+    phi::funcs::FusedElemwiseAndActGradComputeEx<
+        DeviceContext,
+        T,
+        UnaryCompoundDxFunctor,
+        UnaryCompoundDyFunctor,
+        UnaryCompoundDIntermediateFunctor,
+        false /*UseIntermediateOut*/,
+        true /*SameShapeOfIntermediateOutAndOut*/>(
+        dev_ctx,
         in_x,
         in_y,
         in_out,
 
@@ -22,7 +22,6 @@
 #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/elementwise/elementwise_op_function.h"
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/funcs/eigen/eigen_function.h"