From 58a478f8790e5278472179c228f79662c1bd0f71 Mon Sep 17 00:00:00 2001
From: houj04 <35131887+houj04@users.noreply.github.com>
Date: Thu, 29 Sep 2022 10:02:38 +0800
Subject: [PATCH] [XPU] update xpu cmake to 0928. (#46437)

* [XPU] update xpu cmake to 0923. test=kunlun

* [XPU] update xpu cmake to 0928. test=kunlun
---
 cmake/external/xpu.cmake                    |  4 ++--
 paddle/phi/kernels/xpu/activation_kernel.cc | 26 ++++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
index 9c69a5db93..1383bfe0cb 100644
--- a/cmake/external/xpu.cmake
+++ b/cmake/external/xpu.cmake
@@ -10,7 +10,7 @@ set(XPU_RT_LIB_NAME "libxpurt.so")
 if(NOT DEFINED XPU_BASE_URL)
   set(XPU_BASE_URL_WITHOUT_DATE
       "https://baidu-kunlun-product.su.bcebos.com/KL-SDK/klsdk-dev")
-  set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20220919")
+  set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20220928")
 else()
   set(XPU_BASE_URL "${XPU_BASE_URL}")
 endif()
@@ -19,7 +19,7 @@ endif()
 if(NOT DEFINED XPU_XDNN_BASE_URL)
   set(XPU_XDNN_BASE_URL_WITHOUT_DATE
       "https://klx-sdk-release-public.su.bcebos.com/xdnn/dev")
-  set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL_WITHOUT_DATE}/20220919")
+  set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL_WITHOUT_DATE}/20220928")
 else()
   set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL}")
 endif()
diff --git a/paddle/phi/kernels/xpu/activation_kernel.cc b/paddle/phi/kernels/xpu/activation_kernel.cc
index 3bb59f52bb..bd4b34892d 100644
--- a/paddle/phi/kernels/xpu/activation_kernel.cc
+++ b/paddle/phi/kernels/xpu/activation_kernel.cc
@@ -123,20 +123,28 @@ int xpu_activation_1attr_func(const Context& dev_ctx,
 }
 
 template <typename Context, typename T, typename XPUType>
-int xpu_activation_2attr_func(
-    const Context& dev_ctx,
-    const DenseTensor& x,
-    DenseTensor* out,
-    float attr1,
-    float attr2,
-    std::function<
-        int(xpu::Context*, const XPUType*, XPUType*, int, float, float)> func) {
+int xpu_activation_2attr_func(const Context& dev_ctx,
+                              const DenseTensor& x,
+                              DenseTensor* out,
+                              float attr1,
+                              float attr2,
+                              std::function<int(xpu::Context*,
+                                                const XPUType*,
+                                                XPUType*,
+                                                int,
+                                                float,
+                                                float,
+                                                const float*,
+                                                float*)> func) {
+  // does not support "const float* max_x, float* max_y" now
   int r = func(dev_ctx.x_context(),
                reinterpret_cast<const XPUType*>(x.data<T>()),
                reinterpret_cast<XPUType*>(out->data<T>()),
                x.numel(),
                attr1,
-               attr2);
+               attr2,
+               nullptr,
+               nullptr);
   return r;
 }
 
-- 
GitLab