[XPU] update xhpc to 1118 (#69440)

cqulilujia · web-flow · commit aa323f6eafd2 · 2024-11-18T19:05:10.000+08:00
diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
@@ -29,7 +29,7 @@ set(XPU_XFA_LIB_NAME "libxpu_flash_attention.so")
 set(XPU_XPUDNN_LIB_NAME "libxpu_dnn.so")
 
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
-  set(XPU_XHPC_BASE_DATE "dev/20241115")
+  set(XPU_XHPC_BASE_DATE "dev/20241118")
 endif()
 set(XPU_XCCL_BASE_VERSION "3.0.0.5") # For XRE5
 if(NOT DEFINED XPU_XFT_BASE_VERSION)
diff --git a/paddle/phi/kernels/xpu/logical_kernel.cc b/paddle/phi/kernels/xpu/logical_kernel.cc
@@ -23,7 +23,7 @@ template <typename T, typename Context>
 void LogicalNotKernel(const Context& ctx,
                       const DenseTensor& x,
                       DenseTensor* out) {
-  ctx.template Alloc<T>(out);
+  ctx.template Alloc<bool>(out);
   int r =
       xpu::logical_not(ctx.x_context(), x.data<T>(), out->data<T>(), x.numel());
   PADDLE_ENFORCE_XDNN_SUCCESS(r, "logical_not");
@@ -36,9 +36,9 @@ void LogicalBinaryKernel(
     const DenseTensor& y,
     DenseTensor* out,
     std::function<int(
-        xpu::Context*, const XPUType*, const XPUType*, XPUType*, int64_t)> func,
-    std::string funcname = "unknown") {
-  dev_ctx.template Alloc<T>(out);
+        xpu::Context*, const XPUType*, const XPUType*, bool*, int64_t)> func,
+    std::string funcname = "logical") {
+  dev_ctx.template Alloc<bool>(out);
 
   int r = xpu::SUCCESS;
   const auto* x_data = x.data<T>();
@@ -49,7 +49,7 @@ void LogicalBinaryKernel(
     r = func(dev_ctx.x_context(),
              reinterpret_cast<const XPUType*>(x_data),
              reinterpret_cast<const XPUType*>(y_data),
-             reinterpret_cast<XPUType*>(out_data),
+             reinterpret_cast<bool*>(out_data),
              out->numel());
     PADDLE_ENFORCE_XDNN_SUCCESS(r, funcname);
     return;
@@ -131,7 +131,7 @@ void LogicalBinaryKernel(
   r = func(xpu_context,
            reinterpret_cast<const XPUType*>(x_data),
            reinterpret_cast<const XPUType*>(y_data),
-           reinterpret_cast<XPUType*>(out_data),
+           reinterpret_cast<bool*>(out_data),
            out->numel());
   PADDLE_ENFORCE_XDNN_SUCCESS(r, funcname);
 }
@@ -142,8 +142,8 @@ void LogicalAndKernel(const Context& dev_ctx,
                       const DenseTensor& y,
                       DenseTensor* out) {
   using XPUType = typename XPUTypeTrait<T>::Type;
-  return LogicalBinaryKernel<T, XPUType>(
-      dev_ctx, x, y, out, xpu::logical_and<XPUType>, "logical_and");
+  LogicalBinaryKernel<T, XPUType>(
+      dev_ctx, x, y, out, xpu::logical_and<XPUType, XPUType>, "logical_and");
 }
 
 template <typename T, typename Context>
@@ -152,8 +152,8 @@ void LogicalOrKernel(const Context& dev_ctx,
                      const DenseTensor& y,
                      DenseTensor* out) {
   using XPUType = typename XPUTypeTrait<T>::Type;
-  return LogicalBinaryKernel<T, XPUType>(
-      dev_ctx, x, y, out, xpu::logical_or<XPUType>, "logical_or");
+  LogicalBinaryKernel<T, XPUType>(
+      dev_ctx, x, y, out, xpu::logical_or<XPUType, XPUType>, "logical_or");
 }
 
 template <typename T, typename Context>
@@ -162,8 +162,8 @@ void LogicalXorKernel(const Context& dev_ctx,
                       const DenseTensor& y,
                       DenseTensor* out) {
   using XPUType = typename XPUTypeTrait<T>::Type;
-  return LogicalBinaryKernel<T, XPUType>(
-      dev_ctx, x, y, out, xpu::logical_xor<XPUType>, "logical_xor");
+  LogicalBinaryKernel<T, XPUType>(
+      dev_ctx, x, y, out, xpu::logical_xor<XPUType, XPUType>, "logical_xor");
 }
 }  // namespace phi
 
