Skip to content

Commit 45d62b6

Browse files
zhupengyangmaxiaolong001
authored andcommitted
[xpu] fix compile (PaddlePaddle#74492)
1 parent 642096b commit 45d62b6

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

cmake/external/xpu.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ if(WITH_XPU_XRE5)
253253
DOWNLOAD_COMMAND
254254
bash ${CMAKE_SOURCE_DIR}/tools/xpu/pack_paddle_dependence.sh
255255
${XPU_XRE_URL} ${XPU_XRE_DIR_NAME} ${XPU_XHPC_URL} ${XPU_XHPC_DIR_NAME}
256-
${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 1 ${WITH_MKL}
257-
"${CMAKE_SOURCE_DIR}/build" && wget ${XPU_XFT_GET_DEPENCE_URL} && bash
258-
${XFT_COMMAND} ${XPU_XFT_URL} ${XPU_XFT_DIR_NAME} && bash
256+
${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 1 ${WITH_MKL} "${CMAKE_BINARY_DIR}"
257+
&& wget ${XPU_XFT_GET_DEPENCE_URL} && bash ${XFT_COMMAND} ${XPU_XFT_URL}
258+
${XPU_XFT_DIR_NAME} && bash
259259
${CMAKE_SOURCE_DIR}/tools/xpu/get_xpti_dependence.sh ${XPU_XPTI_URL}
260260
${XPU_XPTI_DIR_NAME} && bash
261261
${CMAKE_SOURCE_DIR}/tools/xpu/get_xpufft_dependence.sh ${XPU_FFT_URL}

tools/xpu/pack_paddle_dependence.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,8 @@ function xhpc_prepare() {
9494
cp -r ${XHPC_DIR_NAME}/xpudnn/so/libxpu_dnn.so xpu/lib/
9595

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

162160
if [[ "${WITH_MKL}" == "ON" ]]; then
163-
cp -r ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/
164-
pushd xpu/lib
165-
ln -sf libiomp5.so libomp.so
166-
popd
161+
# Now xpu/lib/libomp.so is invalid. When we need libomp.so, libomp.so is valid.
162+
ln -sf ${BUILD_DIR}/third_party/install/mklml/lib/libiomp5.so xpu/lib/libomp.so
167163
else
168164
cp -r ${XHPC_DIR_NAME}/xpudnn/so/libomp.so xpu/lib/
169165
pushd xpu/lib

0 commit comments

Comments
 (0)