2.5.10-xpu dockerfile updates (#5086)

* update layers for 2.5.10 xpu

* add pti and ocloc

* update docker and validate RC2

* validate on patched wheels

* remove copy

* remove env var

Author: sramakintel

docker/Dockerfile.prebuilt

@@ -23,7 +23,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
+    apt-get install -y --no-install-recommends \
         apt-utils \
         build-essential \
         ca-certificates \
@@ -40,50 +40,37 @@ RUN apt-get update && \
     rm -rf  /var/lib/apt/lists/*
 
 RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
-    gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy/lts/2350 unified" | \
+    gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
     tee /etc/apt/sources.list.d/intel-gpu-jammy.list
 
 ARG ICD_VER
-ARG LEVEL_ZERO_GPU_VER
+ARG OCLOC_VER
 ARG LEVEL_ZERO_VER
 ARG LEVEL_ZERO_DEV_VER
+ARG XPU_SMI_VER
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
-    intel-opencl-icd=${ICD_VER} \
-    intel-level-zero-gpu=${LEVEL_ZERO_GPU_VER} \
-    level-zero=${LEVEL_ZERO_VER} \
-    level-zero-dev=${LEVEL_ZERO_DEV_VER} && \
+    apt-get install -y --no-install-recommends \
+        intel-opencl-icd=${ICD_VER} \
+        intel-ocloc=${OCLOC_VER} \
+        libze1=${LEVEL_ZERO_VER} \
+        libze-dev=${LEVEL_ZERO_DEV_VER} \
+        xpu-smi=${XPU_SMI_VER} && \
     apt-get clean && \
     rm -rf  /var/lib/apt/lists/*
 
-RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
-   | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
-   echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
-   | tee /etc/apt/sources.list.d/oneAPI.list
-
-ARG DPCPP_VER
-ARG MKL_VER
-ARG CCL_VER
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
-        intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
-        intel-oneapi-runtime-mkl=${MKL_VER} \
-        intel-oneapi-runtime-ccl=${CCL_VER} && \
-    apt-get clean && \
-    rm -rf  /var/lib/apt/lists/*
+RUN rm -rf /etc/apt/sources.list.d/intel-gpu-jammy.list
 
 ARG PYTHON
 RUN apt-get update && apt install -y software-properties-common 
 RUN add-apt-repository -y ppa:deadsnakes/ppa 
 
 RUN apt-cache policy $PYTHON && apt-get update && apt-get install -y \
-    --no-install-recommends --fix-missing $PYTHON 
+    --no-install-recommends $PYTHON 
 
-RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
-    ${PYTHON} lib${PYTHON} python3-pip ${PYTHON}-distutils && \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        ${PYTHON} lib${PYTHON} python3-pip ${PYTHON}-distutils && \
     apt-get clean && \
     rm -rf  /var/lib/apt/lists/*
 
@@ -107,7 +94,7 @@ ARG TORCHVISION_WHL_URL
 ARG TORCHAUDIO_WHL_URL
 ARG ONECCL_BIND_PT_WHL_URL
 
-RUN python -m pip install numpy 
+RUN python -m pip install numpy
 
 RUN python -m pip install torch==${TORCH_VERSION} --extra-index-url ${TORCH_WHL_URL} && \
     python -m pip install intel_extension_for_pytorch==${IPEX_VERSION} --extra-index-url ${IPEX_WHL_URL} && \

docker/README.md

@@ -33,18 +33,20 @@ Alternatively, `./build.sh` script has docker build command to install prebuilt
 To pull docker images use the following command:
 
 ```bash
-docker pull intel/intel-extension-for-pytorch:xpu
+docker pull intel/intel-extension-for-pytorch:2.5.10-xpu
 ```
+
 ### Running container:
 
 Run the following commands to start Intel® Extension for PyTorch\* GPU container. You can use `-v` option to mount your
 local directory into the container. The `-v` argument can be omitted if you do not need
 access to a local directory in the container. Pass the video and render groups to your
 docker container so that the GPU is accessible.
 
+```bash
+IMAGE_NAME=intel/intel-extension-for-pytorch:2.5.10-xpu
 ```
-IMAGE_NAME=intel/intel-extension-for-pytorch:xpu
-```
+
 ```bash
 docker run --rm \
     -v <your-local-dir>:/workspace \
@@ -58,44 +60,57 @@ docker run --rm \
 
 #### Verify if XPU is accessible from PyTorch:
 You are inside the container now. Run the following command to verify XPU is visible to PyTorch:
+
 ```bash
 python -c "import torch;print(torch.device('xpu'))"
 ```
+
 Sample output looks like below:
-```
+
+```bash
 xpu
 ```
+
 Then, verify that the XPU device is available to Intel® Extension for PyTorch\*:
+
 ```bash
-python -c "import intel_extension_for_pytorch as ipex;print(ipex.xpu.is_available())"
+python -c "import torch;import intel_extension_for_pytorch as ipex;print(torch.xpu.has_xpu())"
 ```
+
 Sample output looks like below:
-```
+
+```bash
 True
 ```
+
 Use the following command to check whether MKL is enabled as default:
+
 ```bash
-python -c "import intel_extension_for_pytorch as ipex;print(ipex.xpu.has_onemkl())"
+python -c "import torch;import intel_extension_for_pytorch as ipex;print(torch.xpu.has_onemkl())"
 ```
+
 Sample output looks like below:
-```
+
+```bash
 True
 ```
+
 Finally, use the following command to show detailed info of detected device:
+
 ```bash
-python -c "import torch; import intel_extension_for_pytorch as ipex; print(torch.__version__); print(ipex.__version__); [print(f'[{i}]: {ipex.xpu.get_device_properties(i)}') for i in range(ipex.xpu.device_count())];"
+python -c "import torch; import intel_extension_for_pytorch as ipex; print(torch.__version__); print(ipex.__version__); [print(f'[{i}]: {torch.xpu.get_device_properties(i)}') for i in range(torch.xpu.device_count())];"
 ```
 
 Sample output looks like below:
+
+```bash
+2.5.1+cxx11.abi
+2.5.10+xpu
+[0]: _XpuDeviceProperties(name='Intel(R) Data Center GPU Max 1550', platform_name='Intel(R) Level-Zero', type='gpu', driver_version='1.3.30049', total_memory=65536MB, max_compute_units=448, gpu_eu_count=448, gpu_subslice_count=56, max_work_group_size=1024, max_num_sub_groups=64, sub_group_sizes=[16 32], has_fp16=1, has_fp64=1, has_atomic64=1)
+[1]: _XpuDeviceProperties(name='Intel(R) Data Center GPU Max 1550', platform_name='Intel(R) Level-Zero', type='gpu', driver_version='1.3.30049', total_memory=65536MB, max_compute_units=448, gpu_eu_count=448, gpu_subslice_count=56, max_work_group_size=1024, max_num_sub_groups=64, sub_group_sizes=[16 32], has_fp16=1, has_fp64=1, has_atomic64=1)
 ```
-2.1.0.post2+cxx11.abi
-2.1.30+xpu
-[0]: _DeviceProperties(name='Intel(R) Data Center GPU Max 1550', platform_name='Intel(R) Level-Zero', dev_type='gpu', driver_version='1.3.27642', has_fp64=1, total_memory=65536MB, max_compute_units=448, gpu_eu_count=448)
-[1]: _DeviceProperties(name='Intel(R) Data Center GPU Max 1550', platform_name='Intel(R) Level-Zero', dev_type='gpu', driver_version='1.3.27642', has_fp64=1, total_memory=65536MB, max_compute_units=448, gpu_eu_count=448)
-```
+
 #### Running your own script
 
 Now you are inside container with Python 3.10, PyTorch, and Intel® Extension for PyTorch\* preinstalled. You can run your own script
 to run on Intel GPU.
-
-

docker/build.sh

@@ -1,25 +1,23 @@
 #!/bin/bash
 
 if [[ ${IMAGE_TYPE} = "xpu" ]]; then
-    IMAGE_NAME=intel/intel-extension-for-pytorch:2.1.30-$IMAGE_TYPE
+    IMAGE_NAME=intel/intel-extension-for-pytorch:2.5.10-$IMAGE_TYPE
     docker build --build-arg http_proxy=$http_proxy \
                  --build-arg https_proxy=$https_proxy \
                  --build-arg no_proxy=" " \
                  --build-arg NO_PROXY=" " \
                  --build-arg UBUNTU_VERSION=22.04 \
                  --build-arg PYTHON=python3.10 \
-                 --build-arg ICD_VER=23.43.27642.40-803~22.04 \
-                 --build-arg LEVEL_ZERO_GPU_VER=1.3.27642.40-803~22.04 \
-                 --build-arg LEVEL_ZERO_VER=1.14.0-744~22.04 \
-                 --build-arg LEVEL_ZERO_DEV_VER=1.14.0-744~22.04 \
-                 --build-arg DPCPP_VER=2024.1.0-963 \
-                 --build-arg MKL_VER=2024.1.0-691 \
-                 --build-arg CCL_VER=2021.12.0-309 \
-                 --build-arg TORCH_VERSION=2.1.0.post2+cxx11.abi  \
-                 --build-arg IPEX_VERSION=2.1.30+xpu \
-                 --build-arg TORCHVISION_VERSION=0.16.0.post2+cxx11.abi \
-                 --build-arg TORCHAUDIO_VERSION=2.1.0.post2+cxx11.abi \
-                 --build-arg ONECCL_BIND_PT_VERSION=2.1.300+xpu \
+                 --build-arg ICD_VER=24.39.31294.20-1032~22.04 \
+                 --build-arg OCLOC_VER=24.39.31294.21-1032~22.04 \
+                 --build-arg LEVEL_ZERO_VER=1.17.44.0-1022~22.04 \
+                 --build-arg LEVEL_ZERO_DEV_VER=1.17.44.0-1022~22.04 \
+                 --build-arg XPU_SMI_VER=1.2.39-66~22.04 \
+                 --build-arg TORCH_VERSION=2.5.1+cxx11.abi  \
+                 --build-arg IPEX_VERSION=2.5.10+xpu \
+                 --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/ \