improve soc version (#4522)

Make SOC_VERSION be readable for users. Now users can set simply
"910b"、“910c”、“310p”


- vLLM version: v0.11.2
- vLLM main: https://github.com/vllm-project/vllm/commit/v0.11.2

Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>

.github/Dockerfile.buildwheel

@@ -18,7 +18,7 @@ ARG PY_VERSION=3.11
 FROM quay.io/ascend/manylinux:8.3.rc2-910b-manylinux_2_28-py${PY_VERSION}
 
 ARG COMPILE_CUSTOM_KERNELS=1
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend910b1"
 
 # Define environments
 ENV DEBIAN_FRONTEND=noninteractive

.github/workflows/image_310p_openeuler.yml

@@ -132,5 +132,4 @@ jobs:
         file: Dockerfile.310p.openEuler
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend310p1
         provenance: false

.github/workflows/image_310p_ubuntu.yml

@@ -128,5 +128,4 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend310p1
         provenance: false

.github/workflows/image_a3_openeuler.yml

@@ -131,6 +131,5 @@ jobs:
         file: Dockerfile.a3.openEuler
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend910_9391
         provenance: false
 

.github/workflows/image_a3_ubuntu.yml

@@ -127,6 +127,5 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend910_9391
         provenance: false
 

.github/workflows/image_openeuler.yml

@@ -131,5 +131,4 @@ jobs:
         file: Dockerfile.openEuler
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend910b1
         provenance: false

.github/workflows/image_ubuntu.yml

@@ -128,5 +128,4 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         build-args: |
           PIP_INDEX_URL=https://pypi.org/simple
-          SOC_VERSION=ascend910b1
         provenance: false

.github/workflows/release_whl.yml

@@ -69,7 +69,6 @@ jobs:
         ls
         docker build -f ./.github/Dockerfile.buildwheel \
         --build-arg PY_VERSION=${{ matrix.python-version }} \
-        --build-arg SOC_VERSION=ascend910b1 \
         -t wheel:v1 .
         docker run --rm \
         -u $(id -u):$(id -g) \

.github/workflows/vllm_ascend_test_310p.yaml

@@ -100,7 +100,6 @@ jobs:
         run: |
           export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/x86_64-linux/devlib
-          export SOC_VERSION=ASCEND310P3 
           pip install -r requirements-dev.txt
           pip install -v -e .
 

Dockerfile

@@ -20,7 +20,7 @@ FROM quay.io/ascend/cann:8.3.rc2-910b-ubuntu22.04-py3.11
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
 ARG MOONCAKE_TAG="v0.3.7.post2"
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend910b1"
 
 # Define environments
 ENV DEBIAN_FRONTEND=noninteractive

Dockerfile.310p

@@ -19,7 +19,7 @@ FROM quay.io/ascend/cann:8.3.rc2-310p-ubuntu22.04-py3.11
 
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend310p1"
 
 # Define environments
 ENV DEBIAN_FRONTEND=noninteractive

Dockerfile.310p.openEuler

@@ -19,7 +19,7 @@ FROM quay.io/ascend/cann:8.3.rc2-310p-openeuler24.03-py3.11
 
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend310p1"
 
 ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS}
 ENV SOC_VERSION=$SOC_VERSION

Dockerfile.a3

@@ -20,7 +20,7 @@ FROM quay.io/ascend/cann:8.3.rc2-a3-ubuntu22.04-py3.11
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
 ARG MOONCAKE_TAG=v0.3.7.post2
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend910_9391"
 
 COPY . /vllm-workspace/vllm-ascend/
 # Define environments

Dockerfile.a3.openEuler

@@ -20,7 +20,7 @@ FROM quay.io/ascend/cann:8.3.rc2-a3-openeuler24.03-py3.11
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
 ARG MOONCAKE_TAG="v0.3.7.post2"
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend910_9391"
 
 ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS}
 ENV SOC_VERSION=$SOC_VERSION

Dockerfile.openEuler

@@ -20,7 +20,7 @@ FROM quay.io/ascend/cann:8.3.rc2-910b-openeuler24.03-py3.11
 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 ARG COMPILE_CUSTOM_KERNELS=1
 ARG MOONCAKE_TAG="v0.3.7.post2"
-ARG SOC_VERSION
+ARG SOC_VERSION="ascend910b1"
 
 ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS}
 ENV SOC_VERSION=$SOC_VERSION

setup.py

@@ -137,6 +137,9 @@ def gen_build_info():
 
     # TODO(zzzzwwjj): Add A5 case
     soc_to_device = {
+        "910b": "_910B",
+        "910c": "_910_93",
+        "310p": "_310P",
         "ascend910b1": "_910B",
         "ascend910b2": "_910B",
         "ascend910b2c": "_910B",
@@ -307,7 +310,14 @@ class cmake_build_ext(build_ext):
 
         cmake_args += [f"-DCMAKE_PREFIX_PATH={pybind11_cmake_path}"]
 
-        cmake_args += [f"-DSOC_VERSION={envs.SOC_VERSION}"]
+        soc_version_map = {
+            "910b": "ascend910b1",
+            "910c": "ascend910_9392",
+            "310p": "ascend310p1",
+        }
+        CANN_SOC_VERSION = soc_version_map.get(envs.SOC_VERSION,
+                                               envs.SOC_VERSION)
+        cmake_args += [f"-DSOC_VERSION={CANN_SOC_VERSION}"]
 
         # Override the base directory for FetchContent downloads to $ROOT/.deps
         # This allows sharing dependencies between profiles,