Merge branch 'first_b' of https://github.com/hohdiy/Paddle into first_b

Author: hohdiy

cmake/external/xpu.cmake

@@ -253,9 +253,9 @@ if(WITH_XPU_XRE5)
     DOWNLOAD_COMMAND
       bash ${CMAKE_SOURCE_DIR}/tools/xpu/pack_paddle_dependence.sh
       ${XPU_XRE_URL} ${XPU_XRE_DIR_NAME} ${XPU_XHPC_URL} ${XPU_XHPC_DIR_NAME}
-      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 1 ${WITH_MKL}
-      "${CMAKE_SOURCE_DIR}/build" && wget ${XPU_XFT_GET_DEPENCE_URL} && bash
-      ${XFT_COMMAND} ${XPU_XFT_URL} ${XPU_XFT_DIR_NAME} && bash
+      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 1 ${WITH_MKL} "${CMAKE_BINARY_DIR}"
+      && wget ${XPU_XFT_GET_DEPENCE_URL} && bash ${XFT_COMMAND} ${XPU_XFT_URL}
+      ${XPU_XFT_DIR_NAME} && bash
       ${CMAKE_SOURCE_DIR}/tools/xpu/get_xpti_dependence.sh ${XPU_XPTI_URL}
       ${XPU_XPTI_DIR_NAME} && bash
       ${CMAKE_SOURCE_DIR}/tools/xpu/get_xpufft_dependence.sh ${XPU_FFT_URL}

tools/xpu/pack_paddle_dependence.sh

@@ -94,10 +94,8 @@ function xhpc_prepare() {
     cp -r ${XHPC_DIR_NAME}/xpudnn/so/libxpu_dnn.so xpu/lib/
 
     if [[ "${WITH_MKL}" == "ON" ]]; then
-      cp -r ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/
-      pushd xpu/lib
-      ln -sf libiomp5.so libomp.so
-      popd
+      # Now xpu/lib/libomp.so is invalid. When we need libomp.so, libomp.so is valid.
+      ln -sf ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/libomp.so
     else
       cp -r ${XHPC_DIR_NAME}/xpudnn/so/libomp.so xpu/lib/
       pushd xpu/lib
@@ -160,10 +158,8 @@ function local_assemble() {
       cp -r ${LOCAL_PATH}/${XHPC_DIR_NAME}/xpudnn/so/libxpu_dnn.so xpu/lib/
 
       if [[ "${WITH_MKL}" == "ON" ]]; then
-        cp -r ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/
-        pushd xpu/lib
-        ln -sf libiomp5.so libomp.so
-        popd
+        # Now xpu/lib/libomp.so is invalid. When we need libomp.so, libomp.so is valid.
+        ln -sf ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/libomp.so
       else
         cp -r ${XHPC_DIR_NAME}/xpudnn/so/libomp.so xpu/lib/
         pushd xpu/lib