Fix Installation & Build issues in compile_bundle.bat (#5147)

* Fix versions of torch torchaudio torchvision * fix version of torch-ccl * change /us to /cn * WA: add environment variables for torch build on windows occurs in some environment
intel · Dec 20, 2024 · 2bca097 · 2bca097
1 parent 974beb7
commit 2bca097
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/docker/build.sh b/docker/build.sh
@@ -18,11 +18,11 @@ if [[ ${IMAGE_TYPE} = "xpu" ]]; then
                  --build-arg TORCHVISION_VERSION=0.20.1+cxx11.abi \
                  --build-arg TORCHAUDIO_VERSION=2.5.1+cxx11.abi \
                  --build-arg ONECCL_BIND_PT_VERSION=2.5.0+xpu \
-                 --build-arg TORCH_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ \
-                 --build-arg IPEX_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ \
-                 --build-arg TORCHVISION_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ \
-                 --build-arg TORCHAUDIO_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ \
-                 --build-arg ONECCL_BIND_PT_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ \
+                 --build-arg TORCH_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/ \
+                 --build-arg IPEX_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/ \
+                 --build-arg TORCHVISION_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/ \
+                 --build-arg TORCHAUDIO_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/ \
+                 --build-arg ONECCL_BIND_PT_WHL_URL=https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/ \
                  -t ${IMAGE_NAME} \
                  -f Dockerfile.prebuilt .
 fi
diff --git a/docs/tutorials/features/DDP.md b/docs/tutorials/features/DDP.md
@@ -25,9 +25,9 @@ For more detailed information, check [Installation Guide](https://intel.github.i
 
 ```
 # Generic Python* for CPU
-REPO_URL: https://pytorch-extension.intel.com/release-whl/stable/cpu/us/
+REPO_URL: https://pytorch-extension.intel.com/release-whl/stable/cpu/cn/
 # Generic Python* for GPU
-REPO_URL: https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
+REPO_URL: https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/
 ```
 
 Installation from either repository shares the command below. Replace the place holder `<REPO_URL>` with a real URL mentioned above.

diff --git a/examples/gpu/llm/tools/env_setup.sh b/examples/gpu/llm/tools/env_setup.sh
@@ -65,7 +65,7 @@ if [ $((${MODE} & 0x02)) -ne 0 ]; then
     echo "#!/bin/bash" > ${AUX_INSTALL_SCRIPT}
     echo "set -e" >> ${AUX_INSTALL_SCRIPT}
     if [ $((${MODE} & 0x04)) -ne 0 ]; then
-        echo "python -m pip install torch==${VER_TORCH} intel-extension-for-pytorch==${VER_IPEX} oneccl-bind-pt==${VER_TORCHCCL} --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/" >> ${AUX_INSTALL_SCRIPT}
+        echo "python -m pip install torch==${VER_TORCH} intel-extension-for-pytorch==${VER_IPEX} oneccl-bind-pt==${VER_TORCHCCL} --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/" >> ${AUX_INSTALL_SCRIPT}
     else
         DPCPP_ROOT=
         ONEMKL_ROOT=

diff --git a/scripts/compile_bundle.bat b/scripts/compile_bundle.bat
@@ -3,6 +3,9 @@ setlocal
 
 set "VER_IPEX=v2.5.10+xpu"
 set "ENABLE_ONEAPI_INTEGRATION=1"
+set CMAKE_SHARED_LINKER_FLAGS=/FORCE:MULTIPLE
+set CMAKE_MODULE_LINKER_FLAGS=/FORCE:MULTIPLE
+set CMAKE_EXE_LINKER_FLAGS=/FORCE:MULTIPLE
 
 if "%~2"=="" (
     echo Usage: %~nx0 ^<DPCPPROOT^> ^<MKLROOT^> [AOT]
@@ -56,6 +59,10 @@ rem Save current directory path
 set "BASEFOLDER=%~dp0"
 cd "%BASEFOLDER%"
 
+rem Check required packages version
+if not exist intel-extension-for-pytorch (
+    git clone https://github.com/intel/intel-extension-for-pytorch.git
+)
 
 rem Checkout the latest Intel(R) Extension for PyTorch source
 cd intel-extension-for-pytorch
@@ -86,9 +93,6 @@ if not exist vision (
 if not exist audio (
     git clone https://github.com/pytorch/audio.git
 )
-if not exist intel-extension-for-pytorch (
-    git clone https://github.com/intel/intel-extension-for-pytorch.git
-)
 
 rem Checkout required branch/commit and update submodules
 cd pytorch