[CI] add bmg g31 and update docker file (vllm-project#144)

* add safe dir

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* limit thread

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* limit thread to 128

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* upgrade umd

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* install ocloc

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* test

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* fix

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* fix

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* fix

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

* add g31

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

---------

Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>

Author: jikunshang

.github/workflows/ut.yaml

@@ -73,9 +73,10 @@ jobs:
 
       - name: build & install wheel
         run: |
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
           python3 -m pip config set global.break-system-packages true
           pip install -r requirements.txt
-          pip install --extra-index-url=https://download.pytorch.org/whl/xpu -e . -v
+          MAX_JOB=128 pip install --extra-index-url=https://download.pytorch.org/whl/xpu -e . -v
 
       - name: test 
         run: |
@@ -107,9 +108,10 @@ jobs:
 
       - name: build & install wheel
         run: |
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
           python3 -m pip config set global.break-system-packages true
           pip install -r requirements.txt
-          pip install --extra-index-url=https://download.pytorch.org/whl/xpu -e . -v
+          MAX_JOBS=128 pip install --extra-index-url=https://download.pytorch.org/whl/xpu -e . -v
 
       - name: test 
         run: |

CMakeLists.txt

@@ -35,7 +35,7 @@ install(CODE "set(CMAKE_INSTALL_LOCAL_ONLY TRUE)" ALL_COMPONENTS)
 set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12")
 
 # Supported Intel GPU architectures.
-set(SYCL_SUPPORTED_ARCHS "intel_gpu_pvc;intel_gpu_bmg_g21")
+set(SYCL_SUPPORTED_ARCHS "intel_gpu_pvc;intel_gpu_bmg_g21;intel_gpu_bmg_g31")
 
 #
 # Supported/expected torch versions for XPU.
@@ -180,8 +180,8 @@ if(VLLM_GPU_LANG STREQUAL "SYCL")
   )
 
   # TODO: make AOT configurable
-  set(AOT_DEVICES "pvc,bmg-g21-a0")
-  set(XE2_AOT_DEVICES "pvc,bmg-g21-a0")
+  set(AOT_DEVICES "pvc,bmg-g21-a0,bmg-g31-a0")
+  set(XE2_AOT_DEVICES "pvc,bmg-g21-a0,bmg-g31-a0")
 
   # Final link option be like: icpx -fsycl -fsycl-target=spir64_gen
   # ${SYCL_DEVICE_LINK_FLAGS} -Xsycl-target-backend=spir64_gen

Dockerfile.xpu

@@ -24,7 +24,16 @@ RUN apt clean && apt-get update -y && \
 RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1
 
-RUN apt install -y libze1 libze-dev libze-intel-gpu1 intel-opencl-icd libze-intel-gpu-raytracing intel-ocloc
+RUN apt install -y libze1 libze-dev
+
+RUN mkdir neo && cd neo && \
+    wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.22.2/intel-igc-core-2_2.22.2+20121_amd64.deb && \
+    wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.22.2/intel-igc-opencl-2_2.22.2+20121_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.44.36015.8/intel-ocloc_25.44.36015.8-0_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.44.36015.8/intel-opencl-icd_25.44.36015.8-0_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.44.36015.8/libigdgmm12_22.8.2_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.44.36015.8/libze-intel-gpu1_25.44.36015.8-0_amd64.deb && \
+    dpkg -i *.deb && cd .. && rm -rf neo
 
 RUN python3 -m pip config set global.break-system-packages true 
 

csrc/utils.h

@@ -30,7 +30,9 @@ get_device_architecture(at::DeviceIndex device_index = -1) {
 
 static inline bool is_bmg(at::DeviceIndex device_index = -1) {
   return get_device_architecture(device_index) ==
-         syclex::architecture::intel_gpu_bmg_g21;
+             syclex::architecture::intel_gpu_bmg_g21 ||
+         get_device_architecture(device_index) ==
+             syclex::architecture::intel_gpu_bmg_g31;
 }
 
 static inline bool is_pvc(at::DeviceIndex device_index = -1) {
@@ -41,6 +43,7 @@ static inline bool is_pvc(at::DeviceIndex device_index = -1) {
 static inline bool is_xe2_arch(at::DeviceIndex device_index = -1) {
   auto arch = get_device_architecture(device_index);
   return arch == syclex::architecture::intel_gpu_bmg_g21 ||
+         arch == syclex::architecture::intel_gpu_bmg_g31 ||
          arch == syclex::architecture::intel_gpu_pvc;
 }