improve

Author: zrr1999

paddle/phi/kernels/gpu/p_norm_kernel.cu

@@ -22,7 +22,6 @@
 #include "paddle/phi/kernels/funcs/reduce_function.h"
 #include "paddle/phi/kernels/gpu/reduce.h"
 
-#include "paddle/fluid/framework/tensor_util.h"
 #include "paddle/phi/kernels/activation_kernel.h"
 
 namespace phi {
@@ -135,6 +134,7 @@ void PNormKernel(const Context& dev_ctx,
       // fast 1-norm
       phi::funcs::ReduceKernel<T, T, kps::AddFunctor, FabsFunctor<T>>(
           dev_ctx, *in_x, out_norm, FabsFunctor<T>(), reduce_axis);
+      return;
     } else if (porder == 2.0) {
       // fast 2-norm
       using MT = typename phi::dtype::MPTypeTrait<T>::Type;
@@ -154,7 +154,6 @@ void PNormKernel(const Context& dev_ctx,
       phi::SqrtKernel<MT>(dev_ctx, temp_sum_of_squares_hp, &temp_norm_hp);
       phi::CastKernel<MT>(dev_ctx, temp_norm_hp, out_norm->dtype(), out_norm);
       return;
-
     } else if (porder == 3.0) {
       // fast 3-norm
       phi::funcs::ReduceKernel<T, MT, kps::AddFunctor, FabsCubicFunctor<MT>>(
@@ -168,14 +167,11 @@ void PNormKernel(const Context& dev_ctx,
           UnsignedPowFunctor<MT>(porder),
           reduce_axis);
     }
-
-    if (porder != 1.0) {
-      std::vector<const DenseTensor*> ins = {&out_temp};
-      std::vector<DenseTensor*> outs = {out_norm};
-      MT p_order_ = static_cast<MT>(1.f / porder);
-      phi::funcs::ElementwiseKernel<T>(
-          dev_ctx, ins, &outs, UnsignedPowFunctor<MT>(p_order_));
-    }
+    std::vector<const DenseTensor*> ins = {&out_temp};
+    std::vector<DenseTensor*> outs = {out_norm};
+    MT p_order_ = static_cast<MT>(1.f / porder);
+    phi::funcs::ElementwiseKernel<T>(
+        dev_ctx, ins, &outs, UnsignedPowFunctor<MT>(p_order_));
 #endif
   }
 }