fix enforce usage

huangjiyi · Feb 26, 2023 · 5f521f0 · 5f521f0
1 parent ec9d8b6
commit 5f521f0
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/paddle/phi/kernels/funcs/selected_rows_functor.cc b/paddle/phi/kernels/funcs/selected_rows_functor.cc
@@ -73,18 +73,18 @@ struct SelectedRowsAdd<phi::CPUContext, T> {
             out_value->numel() / out_rows.size()));
 
     auto in1_place = input1.place();
-    PADDLE_ENFORCE_EQ(in1_place.GetType() == phi::AllocationType::CPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in1_place.GetType(),
+                      phi::AllocationType::CPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the CPU place."));
     auto in2_place = input2.place();
-    PADDLE_ENFORCE_EQ(in2_place.GetType() == phi::AllocationType::CPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in2_place.GetType(),
+                      phi::AllocationType::CPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the CPU place."));
     auto out_place = context.GetPlace();
-    PADDLE_ENFORCE_EQ(out_place.GetType() == phi::AllocationType::CPU,
-                      true,
+    PADDLE_ENFORCE_EQ(out_place.GetType(),
+                      phi::AllocationType::CPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the CPU place."));
 
@@ -204,13 +204,13 @@ struct SelectedRowsAddTo<phi::CPUContext, T> {
     mixv_in2_rows.Extend(in1_rows.begin(), in1_rows.end());
 
     auto in1_place = input1.place();
-    PADDLE_ENFORCE_EQ(in1_place.GetType() == phi::AllocationType::CPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in1_place.GetType(),
+                      phi::AllocationType::CPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the CPU place."));
     auto in2_place = input2->place();
-    PADDLE_ENFORCE_EQ(in2_place.GetType() == phi::AllocationType::CPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in2_place.GetType(),
+                      phi::AllocationType::CPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the CPU place."));
 

diff --git a/paddle/phi/kernels/funcs/selected_rows_functor.cu b/paddle/phi/kernels/funcs/selected_rows_functor.cu
@@ -76,18 +76,18 @@ struct SelectedRowsAdd<phi::GPUContext, T> {
     auto* in1_data = in1_value.data<T>();
 
     auto in1_place = input1.place();
-    PADDLE_ENFORCE_EQ(in1_place.GetType() == phi::AllocationType::GPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in1_place.GetType(),
+                      phi::AllocationType::GPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the GPU place."));
     auto in2_place = input2.place();
-    PADDLE_ENFORCE_EQ(in2_place.GetType() == phi::AllocationType::GPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in2_place.GetType(),
+                      phi::AllocationType::GPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the GPU place."));
     auto out_place = context.GetPlace();
-    PADDLE_ENFORCE_EQ(out_place.GetType() == phi::AllocationType::GPU,
-                      true,
+    PADDLE_ENFORCE_EQ(out_place.GetType(),
+                      phi::AllocationType::GPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the GPU place."));
 
@@ -237,13 +237,13 @@ struct SelectedRowsAddTo<phi::GPUContext, T> {
     }
 
     auto in1_place = input1.place();
-    PADDLE_ENFORCE_EQ(in1_place.GetType() == phi::AllocationType::GPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in1_place.GetType(),
+                      phi::AllocationType::GPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the GPU place."));
     auto in2_place = input2->place();
-    PADDLE_ENFORCE_EQ(in1_place.GetType() == phi::AllocationType::GPU,
-                      true,
+    PADDLE_ENFORCE_EQ(in1_place.GetType(),
+                      phi::AllocationType::GPU,
                       phi::errors::InvalidArgument(
                           "The running environment is not on the GPU place."));
 

diff --git a/paddle/phi/kernels/gpu/put_along_axis_grad_kernel.cu b/paddle/phi/kernels/gpu/put_along_axis_grad_kernel.cu
@@ -32,8 +32,8 @@ void PutAlongAxisGradKernel(const Context& dev_ctx,
                             const std::string& reduce,
                             DenseTensor* x_grad,
                             DenseTensor* value_grad) {
-  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == phi::AllocationType::GPU,
-                    true,
+  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType(),
+                    phi::AllocationType::GPU,
                     errors::PreconditionNotMet(
                         "PutAlongAxisGradOpCUDAKernel only runs on GPU."));
 

diff --git a/paddle/phi/kernels/gpu/put_along_axis_kernel.cu b/paddle/phi/kernels/gpu/put_along_axis_kernel.cu
@@ -31,8 +31,8 @@ void PutAlongAxisKernel(const Context& dev_ctx,
                         int axis,
                         const std::string& reduce,
                         DenseTensor* out) {
-  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == phi::AllocationType::GPU,
-                    true,
+  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType(),
+                    phi::AllocationType::GPU,
                     errors::PreconditionNotMet(
                         "PutAlongAxisCUDAKernel only runs on GPU device."));
 

diff --git a/paddle/phi/kernels/onednn/activation_kernel.cc b/paddle/phi/kernels/onednn/activation_kernel.cc
@@ -49,8 +49,8 @@ void EltwiseForward(const OneDNNContext& dev_ctx,
                     float beta,
                     DenseTensor* out,
                     dnnl::algorithm algorithm) {
-  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == phi::AllocationType::CPU,
-                    true,
+  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType(),
+                    phi::AllocationType::CPU,
                     phi::errors::PreconditionNotMet(
                         "Operator DNNL eletwise_forward must use ONEDNNPlace"));
 

diff --git a/paddle/phi/kernels/onednn/matmul_kernel.cc b/paddle/phi/kernels/onednn/matmul_kernel.cc
@@ -491,8 +491,8 @@ void MatmulWithFlattenKernelINT8(const Context &dev_ctx,
                                  int x_num_col_dims,
                                  int y_num_col_dims,
                                  DenseTensor *out) {
-  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == AllocationType::CPU,
-                    true,
+  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType(),
+                    AllocationType::CPU,
                     errors::PreconditionNotMet(
                         "oneDNN MatmulWithFlatten kernel must use CPUPlace"));
 

diff --git a/paddle/phi/kernels/onednn/transpose_grad_kernel.cc b/paddle/phi/kernels/onednn/transpose_grad_kernel.cc
@@ -22,8 +22,8 @@ void TransposeGradKernel(const Context& dev_ctx,
                          const DenseTensor& out_grad,
                          const std::vector<int>& axis,
                          DenseTensor* x_grad) {
-  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == AllocationType::CPU,
-                    true,
+  PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType(),
+                    AllocationType::CPU,
                     errors::PreconditionNotMet(
                         "oneDNN TransposeGrad kernel must use CPUPlace"));
   if (!x_grad) return;