Add upport for IPEX 2.7

Author: simonlui

Dockerfile

@@ -1,57 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
-ARG UBUNTU_VERSION=22.04
-FROM ubuntu:${UBUNTU_VERSION} AS oneapi-lib-installer
+ARG UBUNTU_VERSION=24.04
+FROM ubuntu:${UBUNTU_VERSION}
 
 # Make sure Dockerfile doesn't succeed if there are errors.
 RUN ["/bin/sh", "-c", "/bin/bash", "-o", "pipefail", "-c"]
 
-# Install prerequisites to install oneAPI runtime libraries.
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
-    ca-certificates \
-    gnupg2 \
-    gpg-agent \
-    unzip \
-    wget
-
-# hadolint ignore=DL4006
-RUN wget --progress=dot:giga -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
-
-# Define and install oneAPI runtime libraries for less space.
-ARG DPCPP_VER=2024.2.1-1079
-ARG MKL_VER=2024.2.2-15
-ARG CMPLR_COMMON_VER=2024.2
-# intel-oneapi-compiler-shared-common provides `sycl-ls` and other utilities like the compiler
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
-    intel-oneapi-dpcpp-cpp-${CMPLR_COMMON_VER}=${DPCPP_VER} \
-    intel-oneapi-compiler-shared-common-${CMPLR_COMMON_VER}=${DPCPP_VER} \
-    intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
-    intel-oneapi-runtime-mkl=${MKL_VER} && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Add and prepare Intel Graphics driver index. This is dependent on being able to pass your GPU with a working driver on the host side where the image will run.
-# hadolint ignore=DL4006
-RUN wget --progress=dot:giga -qO - https://repositories.intel.com/graphics/intel-graphics.key | \
-    gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg
-# hadolint ignore=DL4006
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy unified" | \
-    tee /etc/apt/sources.list.d/intel.gpu.jammy.list
-
-ARG UBUNTU_VERSION=22.04
-FROM ubuntu:${UBUNTU_VERSION}
-
-# Copy all the files from the oneAPI runtime libraries image into the actual final image.
-RUN mkdir -p /opt/intel
-COPY --from=oneapi-lib-installer /opt/intel/ /opt/intel/
-COPY --from=oneapi-lib-installer /usr/share/keyrings/intel-graphics.gpg /usr/share/keyrings/intel-graphics.gpg
-COPY --from=oneapi-lib-installer /etc/apt/sources.list.d/intel.gpu.jammy.list /etc/apt/sources.list.d/intel.gpu.jammy.list
-
 # Set apt install to not be interactive for some packages that require it.
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -62,42 +15,62 @@ ENV LD_LIBRARY_PATH=/opt/intel/oneapi/redist/lib:/opt/intel/oneapi/redist/lib/in
 # hadolint ignore=DL3008
 RUN apt-get update && \
     apt-get install -y --no-install-recommends --fix-missing \
-    build-essential \
     ca-certificates \
     fonts-noto \
     git \
     gnupg2 \
     gpg-agent \
     software-properties-common \
+    unzip \
     wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Add and prepare Intel Graphics driver index. This is dependent on being able to pass your GPU with a working driver on the host side where the image will run.
+# hadolint ignore=DL4006
+# Install the Intel graphics GPG public key  
+RUN wget --progress=dot:giga -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
+RUN wget --progress=dot:giga -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
+    gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg
+RUN echo "deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu noble unified" | \
+    tee /etc/apt/sources.list.d/intel-gpu-noble.list
+
 # Sets versions of Level-Zero, OpenCL and memory allocator chosen.
-ARG ICD_VER=23.17.26241.33-647~22.04
-ARG LEVEL_ZERO_GPU_VER=1.3.26241.33-647~22.04
-ARG ALLOCATOR=tcmalloc
-ENV ALLOCATOR=${ALLOCATOR}
-ARG ALLOCATOR_PACKAGE=libgoogle-perftools-dev
-ARG ALLOCATOR_LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libtcmalloc.so
-RUN if [ "${ALLOCATOR}" = "jemalloc" ] ; then \
-       ALLOCATOR_PACKAGE=libjemalloc-dev; \
-       ALLOCATOR_LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so; \
-    fi
+ARG CMPLR_COMMON_VER=2025.0
+ARG DPCPP_VER=2025.0.4-1519
+ARG LIBZE_VER=1.20.2.0-1098~24.04
+ARG OCLOC_VER=25.05.32567.18-1099~24.04
 
 # Install Level-Zero and OpenCL backends.
 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} && \
+    clinfo \
+    intel-gsc \
+    intel-oneapi-common-vars \
+    intel-oneapi-dpcpp-cpp-${CMPLR_COMMON_VER}=${DPCPP_VER} \
+    intel-oneapi-compiler-shared-common-${CMPLR_COMMON_VER}=${DPCPP_VER} \
+    intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
+    intel-opencl-icd=${OCLOC_VER} \
+    libze-intel-gpu1=${OCLOC_VER} \
+    libze-dev=${LIBZE_VER} && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Make sure everything is up to date.
+# hadolint ignore=DL3008
+RUN apt-get update && \
+    apt-get upgrade -y --no-install-recommends --fix-missing && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf  /var/lib/apt/lists/*
+
 # Install Python and other associated packages from PPA since default is 3.10
-ARG PYTHON=python3.11
+ARG PYTHON=python3.12
 # hadolint ignore=DL3008
-RUN add-apt-repository ppa:deadsnakes/ppa && \
-    apt-get update && \
+RUN apt-get update && \
     apt-get install -y --no-install-recommends --fix-missing \
     ${PYTHON} \
     ${PYTHON}-dev \
@@ -107,67 +80,18 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Update pip
-# hadolint ignore=DL3013
-RUN python3 -m pip install -U \
-    pip \
-    setuptools
-
-# Softlink Python to make it default.
-RUN ln -sf "$(which ${PYTHON})" /usr/local/bin/python && \
-    ln -sf "$(which ${PYTHON})" /usr/local/bin/python3 && \
-    ln -sf "$(which ${PYTHON})" /usr/bin/python && \
-    ln -sf "$(which ${PYTHON})" /usr/bin/python3
-
-# Install Comfy UI/Pytorch dependencies.
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends --fix-missing \
-    ${ALLOCATOR_PACKAGE} \
-    libgl1 \
-    libglib2.0-0 \
-    libgomp1 \
-    numactl && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Getting the latest versions of Intel's Compute Runtime and associated packages on Github and installing it will update everything we installed before.
-RUN mkdir neo
-WORKDIR /neo
-RUN wget --progress=dot:giga https://github.com/intel/intel-graphics-compiler/releases/download/v2.5.6/intel-igc-core-2_2.5.6+18417_amd64.deb && \
-    wget --progress=dot:giga https://github.com/intel/intel-graphics-compiler/releases/download/v2.5.6/intel-igc-opencl-2_2.5.6+18417_amd64.deb && \
-    wget --progress=dot:giga https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/intel-level-zero-gpu_1.6.32224.5_amd64.deb && \
-    wget --progress=dot:giga https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/intel-opencl-icd_24.52.32224.5_amd64.deb && \
-    wget --progress=dot:giga https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/libigdgmm12_22.5.5_amd64.deb && \
-    wget --progress=dot:giga https://github.com/oneapi-src/level-zero/releases/download/v1.19.2/level-zero_1.19.2+u22.04_amd64.deb && \
-    wget --progress=dot:giga https://github.com/oneapi-src/level-zero/releases/download/v1.19.2/level-zero-devel_1.19.2+u22.04_amd64.deb && \
-    dpkg -i -- *.deb
-WORKDIR /
-
-# Make sure everything is up to date.
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get upgrade -y --no-install-recommends --fix-missing && \
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf  /var/lib/apt/lists/*
-
-# Remove linux-libc-dev for security reasons without disturbing anything else.
-RUN dpkg -r --force-depends linux-libc-dev
-
 # Copy the startup script to the /bin/ folder and make executable.
 COPY startup.sh /bin/
 RUN chmod 755 /bin/startup.sh
 
 # Volumes that can be used by the image when making containers.
-VOLUME [ "/deps" ]
+VOLUME [ "/deps2" ]
 VOLUME [ "/ComfyUI" ]
 VOLUME [ "/models" ]
 VOLUME [ "/root/.cache/huggingface" ]
 
-# Setup location of Python virtual environment and make sure LD_PRELOAD contains the path of the allocator chosen.
-ENV VENVDir=/deps/venv
-ENV LD_PRELOAD=${ALLOCATOR_LD_PRELOAD}
+# Setup location of Python virtual environment
+ENV VENVDir=/deps2/venv
 
 # Enable Level Zero system management
 # See https://spec.oneapi.io/level-zero/latest/sysman/PROG.html
@@ -178,11 +102,10 @@ ENV ZES_ENABLE_SYSMAN=1
 ENV NEOReadDebugKeys=1
 ENV ClDeviceGlobalMemSizeAvailablePercent=100
 
-# Enable double precision emulation. Turned on by default to enable torch.compile to work for various kernels. Turn this off if you need to enable attention
-# slicing to address the 4GB single allocation limit with Intel Xe GPUs and lower and don't use torch.compile.
+# Enable double precision emulation. Turned off by default to enable attention slicing to address the 4GB single allocation limit with Intel Xe GPUs and lower.
 # See https://github.com/intel/compute-runtime/blob/master/opencl/doc/FAQ.md#feature-double-precision-emulation-fp64
-ENV OverrideDefaultFP64Settings=1
-ENV IGC_EnableDPEmulation=1
+#ENV OverrideDefaultFP64Settings=1
+#ENV IGC_EnableDPEmulation=1
 
 # Enable SYCL variables for cache reuse and single threaded mode.
 # See https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md
@@ -191,17 +114,12 @@ ENV SYCL_PI_LEVEL_ZERO_SINGLE_THREAD_MODE=1
 
 # Setting to turn on for Intel Xe GPUs that do not have XMX cores which include any iGPUs from Intel Ice Lake to Meteor Lake.
 #ENV BIGDL_LLM_XMX_DISABLED=1
+
 # Linux only setting that speeds up compute workload submissions allowing them to run concurrently on a single hardware queue. Turned off by default since
 # this was only introduced recently with the Xe graphics driver you need to turn on by default manually and development focus has been on using this feature
 # with Data Center GPU Max Series. Only also seems to benefit LLMs mostly when Intel encourages turning it on on Intel Arc cards. Also need kernel 6.2 or up.
 # See https://www.intel.com/content/www/us/en/developer/articles/guide/level-zero-immediate-command-lists.html
 #ENV SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1
-# Only use if something with Intel's low level libraries aren't working, see https://github.com/intel/xetla/tree/main for more details on what this affects.
-#ENV USE_XETLA=OFF
-
-# Set variable for better training performance in case.
-# See https://github.com/intel/intel-extension-for-pytorch/issues/296#issuecomment-1461118993
-ENV IPEX_XPU_ONEDNN_LAYOUT=1
 
 # Set to false if CPU is to be used to launch ComfyUI. XPU is default.
 ARG UseXPU=true
@@ -217,7 +135,7 @@ ENV UseIPEXRUN=${UseIPEXRUN}
 ARG IPEXRUNArgs=""
 ENV IPEXRUNArgs=${IPEXRUNArgs}
 
-# Pass in ComfyUI arguments as an environment variable so it can be used in startup.sh which passes it on.
+# Pass in ComfyUI arguments as an environment variable so it can be used in startup_nightly.sh which passes it on.
 ARG ComfyArgs=""
 ENV ComfyArgs=${ComfyArgs}
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2023-2024] [Simon Lui]
+   Copyright [2023-2025] [Simon Lui]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

startup.sh

@@ -28,12 +28,13 @@ fi
 if [ "$FirstLaunch" = "true" ]
 then
     echo "Installing ComfyUI Python dependencies."
-    python -m pip install torch==2.3.1+cxx11.abi torchvision==0.18.1+cxx11.abi torchaudio==2.3.1+cxx11.abi intel-extension-for-pytorch==2.3.110+xpu oneccl_bind_pt==2.3.100+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/
-    # Install dependency to make torch.compile work.
-    pip install --pre pytorch-triton-xpu==3.1.0+91b14bf559  --index-url https://download.pytorch.org/whl/nightly/xpu
+    python -m pip install uv
+    uv pip install dpcpp-cpp-rt==2025.0.4 mkl-dpcpp==2025.0.1 oneccl-devel==2021.14.1 impi-devel==2021.14.1 ruamel-yaml
+    uv pip install torch==2.7.0 torchvision==0.22.0 torchaudio==2.7.0 --index-url https://download.pytorch.org/whl/xpu
+    uv pip install intel-extension-for-pytorch==2.7.10+xpu oneccl_bind_pt==2.7.0+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
     # Comment out the above command and uncomment the following one instead if you are a user from the PRC.
-    #python -m pip install torch==2.3.1+cxx11.abi torchvision==0.18.1+cxx11.abi torchaudio==2.3.1+cxx11.abi intel-extension-for-pytorch==2.3.110+xpu oneccl_bind_pt==2.3.100+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/
-    pip install -r requirements.txt
+    #uv pip install intel-extension-for-pytorch==2.7.10+xpu oneccl_bind_pt==2.7.0+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/cn/
+    uv pip install -r requirements.txt
 fi
 
 # Launch ComfyUI based on whether ipexrun is set to be used or not. Explicit string splitting is done by the shell here so shellcheck warning is ignored.