[XPU] fix clip grad ut (#71171)

houj04 · web-flow · commit 8b49d554aa5e · 2025-02-19T11:38:58.000+08:00
diff --git a/paddle/phi/kernels/impl/clip_kernel_impl.h b/paddle/phi/kernels/impl/clip_kernel_impl.h
@@ -55,8 +55,6 @@ void ClipKernel(const Context& dev_ctx,
                               static_cast<float>(max_)));
 
   T* out_data = dev_ctx.template Alloc<T>(out);
-  // const T* x_data = x->data<T>();
-  // int64_t numel = x->numel();
   const T* x_data = x.data<T>();
   int64_t numel = x.numel();
   if (dev_ctx.GetPlace().GetType() == phi::AllocationType::GPU) {
diff --git a/paddle/phi/kernels/xpu/clip_kernel.cc b/paddle/phi/kernels/xpu/clip_kernel.cc
@@ -29,6 +29,17 @@ void ClipKernel(const Context& dev_ctx,
                 const Scalar& min,
                 const Scalar& max,
                 DenseTensor* out) {
+  auto max_ = max.to<T>();
+  auto min_ = min.to<T>();
+
+  PADDLE_ENFORCE_LE(
+      min_,
+      max_,
+      errors::InvalidArgument("max should be greater than or equal to min. "
+                              "But received min = %f, max = %f",
+                              static_cast<float>(min_),
+                              static_cast<float>(max_)));
+
   dev_ctx.template Alloc<T>(out);
   using XPUDataType = typename XPUTypeTrait<T>::Type;
   auto x_data = reinterpret_cast<const XPUDataType*>(x.data<T>());
@@ -37,8 +48,8 @@ void ClipKernel(const Context& dev_ctx,
                      x_data,
                      out_data,
                      x.numel(),
-                     static_cast<XPUDataType>(min.to<T>()),
-                     static_cast<XPUDataType>(max.to<T>()));
+                     static_cast<XPUDataType>(min_),
+                     static_cast<XPUDataType>(max_));
   PADDLE_ENFORCE_XDNN_SUCCESS(r, "clamp");
 }
 
diff --git a/tools/xpu/disable_ut_xpu_kl3.local b/tools/xpu/disable_ut_xpu_kl3.local
@@ -44,7 +44,6 @@ test_c_comm_init_op
 test_c_concat
 test_c_split
 test_cast_mixed_precision_op_fuse_pass
-test_clip_grad_value_
 test_comp_batch_norm_grad_deprecated
 test_comp_eager_batch_norm_grad
 test_comp_eager_matmul_double_grad
@@ -85,7 +84,6 @@ test_distribution_lkj_cholesky
 test_distribution_multivariate_normal
 test_distribution_normal
 test_dlpack
-test_dygraph_multi_forward
 test_eager_tensor
 test_eager_trace_op
 test_eig_op
