[XPU] bump XHPC to 20240704 and XRE5 to 5.0.11.1 (#65554)

dynamicheart · web-flow · commit 7472c44423fc · 2024-07-05T14:02:42.000+08:00
* [XPU] bump XHPC to 20240628

* [XPU] bump XHPC to 20240701 and XRE5 to 5.0.11.1

* revert XRE5 update

* update XRE5 to 5.0.11.1

* temporarily disable layernorm unittest

* [XPU] bump XHPC to 20240704

* remove skipIf
diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
@@ -30,7 +30,7 @@ if(NOT DEFINED XPU_XRE_BASE_VERSION)
   set(XPU_XRE_BASE_VERSION "4.32.0.1")
 endif()
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
-  set(XPU_XHPC_BASE_DATE "20240626")
+  set(XPU_XHPC_BASE_DATE "20240704")
 endif()
 set(XPU_XCCL_BASE_VERSION "1.2.3")
 if(NOT DEFINED XPU_XFT_BASE_VERSION)
@@ -60,7 +60,7 @@ if(WITH_XPTI)
 endif()
 
 if(WITH_XPU_XRE5)
-  set(XPU_XRE_BASE_VERSION "5.0.3.1")
+  set(XPU_XRE_BASE_VERSION "5.0.11.1")
   set(XPU_XRE_BASE_URL
       "https://klx-sdk-release-public.su.bcebos.com/xre/kl3-release/${XPU_XRE_BASE_VERSION}"
   )
diff --git a/tools/xpu/pack_paddle_depence.sh b/tools/xpu/pack_paddle_depence.sh
@@ -72,11 +72,6 @@ function xhpc_prepare() {
   cp -r ${XHPC_DIR_NAME}/xdnn/so/libxpuapi.so xpu/lib
 
   check_files ${XHPC_DIR_NAME}/xfa/include/flash_api.h ${XHPC_DIR_NAME}/xfa/so/libxpu_flash_attention.so
-
-  # remove '#include "xpu/flash_impl.h"' in flash_api.h
-  # TODO(houj04): remove this hack when compile issue is resolved in XHPC
-  sed -i '3d' ${XHPC_DIR_NAME}/xfa/include/flash_api.h
-
   cp -r ${XHPC_DIR_NAME}/xfa/include/* xpu/include/xhpc/xfa
   cp -r ${XHPC_DIR_NAME}/xfa/so/libxpu_flash_attention.so xpu/lib/
 }
