diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake index 9c69a5db93b9620c48f70a9ff4d2162b0491675a..1383bfe0cbf1a66794e0cc4b3e472577eb5ea1ab 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 3bb59f52bbf886014e7fb7f1d59f3a7b9da1fc80..bd4b34892d57f05a90160bc437a58c96237df089 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 -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 func) { + // does not support "const float* max_x, float* max_y" now int r = func(dev_ctx.x_context(), reinterpret_cast(x.data()), reinterpret_cast(out->data()), x.numel(), attr1, - attr2); + attr2, + nullptr, + nullptr); return r; }