2.5.10 dockerfile + compile bundle update (#5087)

* update dockerfiles to work with conda

* change rpath setting mechanism

* simplify compile bundle bash script usage

* update dependent dpcpp rt to 2025.0.2

* remove undesired environment variable configuration scripts installed from intel-opencl-rt pypi package

* variable setting bug fix in compile bundle

* update dpcpp-cpp-rt to 2025.0.3 to fix the OCL_ICD_VENDORS issue

* add USE_AOT_DEVLIST retrieval api

* update dpcpp-cpp-rt to 2025.0.4

Author: jingxu10

csrc/gpu/CMakeLists.txt

@@ -70,13 +70,6 @@ set(IPEX_GPU_CORE_SRC
         ${IPEX_GPU_GEN_FILES}
         ${IPEX_UTILS_SRCS})
 
-if(NOT WINDOWS)
-  foreach(RPATH ${RPATHS_LIST})
-    set(IPEX_SYCL_LINK_FLAGS ${IPEX_SYCL_LINK_FLAGS} ${RPATH})
-  endforeach()
-  set(IPEX_SYCL_LINK_FLAGS ${IPEX_SYCL_LINK_FLAGS} "-Wl,--disable-new-dtags")
-endif()
-
 # This workaround enables some definitions in PyTorch header file protected by USE_XPU macro.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_XPU")
 

dependency_version.json

@@ -4,36 +4,39 @@
     "min-version": "12.3.0"
   },
   "llvm": {
-    "version": "16.0.6"
+    "commit": "llvmorg-16.0.6"
   },
   "pytorch": {
-    "version": "2.3.1+cxx11.abi",
-    "commit": "v2.3.1"
+    "version": "2.5.1.post0+xpu",
+    "commit": "v2.5.1"
   },
   "torchaudio": {
-    "version": "2.3.1+cxx11.abi",
-    "commit": "v2.3.1"
+    "version": "2.5.1.post0+xpu",
+    "commit": "v2.5.1"
   },
   "torchvision": {
-    "version": "0.18.1+cxx11.abi",
-    "commit": "v0.18.1"
+    "version": "0.20.1.post0+xpu",
+    "commit": "v0.20.1"
   },
   "torch-ccl": {
-    "version": "2.3.100+xpu",
-    "commit": "v2.3.100+xpu"
+    "version": "2.5.10+xpu",
+    "commit": "v2.5.10+xpu"
   },
   "basekit": {
     "dpcpp-cpp-rt": {
-      "version": "2024.2.1"
+      "version": "2025.0.4"
     },
     "mkl-dpcpp": {
-      "version": "2024.2.1"
+      "version": "2025.0.1"
     },
     "oneccl-devel": {
-      "version": "2021.13.1"
+      "version": "2021.14.1"
     },
     "impi-devel": {
-      "version": "2021.13.1"
+      "version": "2021.14.0"
+    },
+    "intel-pti": {
+      "version": "0.10.0"
     }
   }
 }

docker/Dockerfile.compile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache 2.0
+
 # NOTE: To build this you will need a docker version >= 19.03 and DOCKER_BUILDKIT=1
 #
 #       If you do not use buildkit you are not going to have a good time
@@ -14,14 +17,16 @@ RUN apt update && \
     apt full-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
     git \
-    wget \
     curl \
+    wget \
     vim \
     patch \
     gcc \
     g++ \
     make \
     pkg-config \
+    unzip \
+    zip \
     software-properties-common \
     gnupg \
     gpg-agent
@@ -30,10 +35,9 @@ RUN bash ./basekit_driver_install_helper.sh driver
 
 WORKDIR /root
 
-RUN curl -fsSL -v -o miniforge.sh -O https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Miniforge3-24.1.2-0-Linux-x86_64.sh && \
+RUN curl -fsSL -v -o miniforge.sh -O https://github.com/conda-forge/miniforge/releases/download/24.7.1-2/Miniforge3-24.7.1-2-Linux-x86_64.sh && \
     bash miniforge.sh -b -p ./miniforge3 && \
-    rm miniforge.sh && \
-    echo "source ~/miniforge3/bin/activate" >> ./.bashrc
+    rm miniforge.sh
 
 FROM base AS dev
 RUN bash /basekit_driver_install_helper.sh dev
@@ -58,8 +62,13 @@ RUN . ./miniforge3/bin/activate && \
     python -m pip install ./wheels/*.whl && \
     python -m pip cache purge && \
     conda clean -a -y && \
-    rm -rf ./wheels && \
-    echo "conda activate py310" >> ./.bashrc && \
-    echo "export OCL_ICD_VENDORS=/etc/OpenCL/vendors" >> ./.bashrc && \
-    echo "export CCL_ROOT=${CONDA_PREFIX}" >> ./.bashrc && \
-    ldpreload=$(bash get_libstdcpp_lib.sh) && echo "export LD_PRELOAD=${ldpreload}" >> ./.bashrc && rm get_libstdcpp_lib.sh
+    rm -rf ./wheels
+RUN ENTRYPOINT=/usr/local/bin/entrypoint.sh && \
+    echo "#!/bin/bash" > ${ENTRYPOINT} && \
+    echo "CMDS=(); while [ \$# -gt 0 ]; do CMDS+=(\"\$1\"); shift; done;" >> ${ENTRYPOINT} && \
+    echo ". ~/miniforge3/bin/activate" >> ${ENTRYPOINT} && \
+    echo "conda activate py310" >> ${ENTRYPOINT} && \
+    ldpreload=$(bash get_libstdcpp_lib.sh) && echo "export LD_PRELOAD=${ldpreload}" >> ${ENTRYPOINT} && rm get_libstdcpp_lib.sh && \
+    echo "\"\${CMDS[@]}\"" >> ${ENTRYPOINT} && \
+    chmod +x ${ENTRYPOINT}
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

examples/gpu/llm/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache 2.0
+
 ARG BASE_IMAGE=ubuntu:22.04
 FROM ${BASE_IMAGE} AS base
 SHELL ["/bin/bash", "-c"]
@@ -8,15 +11,17 @@ RUN apt update && \
     apt full-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
     git \
-    wget \
     curl \
+    wget \
     vim \
     patch \
     gcc \
     g++ \
     make \
     libgomp1 \
     pkg-config \
+    unzip \
+    zip \
     software-properties-common \
     gnupg \
     gpg-agent
@@ -25,10 +30,9 @@ RUN bash ./basekit_driver_install_helper.sh driver
 
 WORKDIR /root
 
-RUN curl -fsSL -v -o miniforge.sh -O https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Miniforge3-24.1.2-0-Linux-x86_64.sh && \
+RUN curl -fsSL -v -o miniforge.sh -O https://github.com/conda-forge/miniforge/releases/download/24.7.1-2/Miniforge3-24.7.1-2-Linux-x86_64.sh && \
     bash miniforge.sh -b -p ./miniforge3 && \
-    rm miniforge.sh && \
-    echo "source ~/miniforge3/bin/activate" >> ./.bashrc
+    rm miniforge.sh
 
 FROM base AS dev
 # --build-arg COMPILE=ON to compile from source
@@ -50,8 +54,15 @@ RUN apt clean && \
     rm /basekit_driver_install_helper.sh
 RUN . ./miniforge3/bin/activate && \
     conda create -y -n py310 python=3.10 && conda activate py310 && conda install -y libstdcxx-ng && \
-    echo "conda activate py310" >> ./.bashrc && \
     cd ./llm && \
     bash tools/env_setup.sh 1 && \
     python -m pip cache purge && \
     conda clean -a -y
+RUN ENTRYPOINT=/usr/local/bin/entrypoint.sh && \
+    echo "#!/bin/bash" > ${ENTRYPOINT} && \
+    echo "CMDS=(); while [ \$# -gt 0 ]; do CMDS+=(\"\$1\"); shift; done;" >> ${ENTRYPOINT} && \
+    echo ". ~/miniforge3/bin/activate" >> ${ENTRYPOINT} && \
+    echo "conda activate py310" >> ${ENTRYPOINT} && \
+    echo "\"\${CMDS[@]}\"" >> ${ENTRYPOINT} && \
+    chmod +x ${ENTRYPOINT}
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

examples/gpu/llm/README.md

@@ -51,8 +51,8 @@ conda activate llm
 # Setup the environment with the provided script
 cd examples/gpu/llm
 # If you want to install Intel® Extension for PyTorch\* from source, use the commands below:
-# e.g. bash ./tools/env_setup.sh 3 /opt/intel/oneapi/compiler/latest /opt/intel/oneapi/mkl/latest /opt/intel/oneapi/ccl/latest /opt/intel/oneapi/mpi/latest /opt/intel/oneapi/pti/latest pvc
-bash ./tools/env_setup.sh 3 <DPCPP_ROOT> <ONEMKL_ROOT> <ONECCL_ROOT> <MPI_ROOT> <PTI_ROOT> <AOT>
+# e.g. bash ./tools/env_setup.sh 3 /opt/intel/oneapi pvc
+bash ./tools/env_setup.sh 3 <ONEAPI_ROOT_DIR> <AOT>
 
 conda deactivate
 conda activate llm

examples/gpu/llm/tools/env_activate.sh

@@ -13,8 +13,6 @@ fi
 
 BASEFOLDER=$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}" )" &> /dev/null && pwd )
 export LD_PRELOAD=$(bash ${BASEFOLDER}/get_libstdcpp_lib.sh)
-export OCL_ICD_VENDORS=/etc/OpenCL/vendors
-export CCL_ROOT=${CONDA_PREFIX}
 export TORCH_LLM_ALLREDUCE=1
 
 cd ${BASEFOLDER}/../${MODE}