From 67afd0ea78681d22a9e6782fcf0e627aa2501b2b Mon Sep 17 00:00:00 2001 From: Yang Jun01 Date: Thu, 11 Sep 2025 11:12:01 +0800 Subject: [PATCH] remove unrelated dockerfile --- Dockerfile.310p | 61 --------------------------------------- Dockerfile.310p.openEuler | 59 ------------------------------------- Dockerfile.a3 | 60 -------------------------------------- Dockerfile.a3.openEuler | 58 ------------------------------------- Dockerfile.openEuler | 58 ------------------------------------- 5 files changed, 296 deletions(-) delete mode 100644 Dockerfile.310p delete mode 100644 Dockerfile.310p.openEuler delete mode 100644 Dockerfile.a3 delete mode 100644 Dockerfile.a3.openEuler delete mode 100644 Dockerfile.openEuler diff --git a/Dockerfile.310p b/Dockerfile.310p deleted file mode 100644 index 4eb3c63..0000000 --- a/Dockerfile.310p +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This file is a part of the vllm-ascend project. -# - -FROM quay.io/ascend/cann:8.2.rc1-310p-ubuntu22.04-py3.11 - -ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" -ARG COMPILE_CUSTOM_KERNELS=1 - -# Define environments -ENV DEBIAN_FRONTEND=noninteractive -ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS} - -RUN apt-get update -y && \ - apt-get install -y python3-pip git vim wget net-tools gcc g++ cmake libnuma-dev && \ - rm -rf /var/cache/apt/* && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /workspace - -COPY . /vllm-workspace/vllm-ascend/ - -RUN pip config set global.index-url ${PIP_INDEX_URL} - -# Install vLLM -ARG VLLM_REPO=https://github.com/vllm-project/vllm.git -ARG VLLM_TAG=v0.10.1.1 -RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm -# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it. -RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -v -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip uninstall -y triton && \ - python3 -m pip cache purge - -# Install vllm-ascend -# Append `libascend_hal.so` path (devlib) to LD_LIBRARY_PATH -RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - source /usr/local/Ascend/nnal/atb/set_env.sh && \ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \ - export SOC_VERSION=ASCEND310P3 && \ - python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip cache purge - -# Install modelscope (for fast download) and ray (for multinode) -RUN python3 -m pip install modelscope 'ray>=2.47.1' 'protobuf>3.20.0' && \ - python3 -m pip cache purge - -CMD ["/bin/bash"] diff --git a/Dockerfile.310p.openEuler b/Dockerfile.310p.openEuler deleted file mode 100644 index a9d7b34..0000000 --- a/Dockerfile.310p.openEuler +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This file is a part of the vllm-ascend project. -# - -FROM quay.io/ascend/cann:8.2.rc1-310p-openeuler24.03-py3.11 - -ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" -ARG COMPILE_CUSTOM_KERNELS=1 - -ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS} - -RUN yum update -y && \ - yum install -y python3-pip git vim wget net-tools gcc gcc-c++ make cmake numactl-devel && \ - rm -rf /var/cache/yum - -RUN pip config set global.index-url ${PIP_INDEX_URL} - -WORKDIR /workspace - -COPY . /vllm-workspace/vllm-ascend/ - -# Install vLLM -ARG VLLM_REPO=https://github.com/vllm-project/vllm.git -ARG VLLM_TAG=v0.10.1.1 - -RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm -# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it. -RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip uninstall -y triton && \ - python3 -m pip cache purge - -# Install vllm-ascend -RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - source /usr/local/Ascend/nnal/atb/set_env.sh && \ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \ - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \ - export SOC_VERSION=ASCEND310P3 && \ - python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip cache purge - -# Install modelscope (for fast download) and ray (for multinode) -RUN python3 -m pip install modelscope 'ray>=2.47.1' 'protobuf>3.20.0' && \ - python3 -m pip cache purge - -CMD ["/bin/bash"] diff --git a/Dockerfile.a3 b/Dockerfile.a3 deleted file mode 100644 index 8bdfb0e..0000000 --- a/Dockerfile.a3 +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This file is a part of the vllm-ascend project. -# - -FROM quay.io/ascend/cann:8.2.rc1-a3-ubuntu22.04-py3.11 - -ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" -ARG COMPILE_CUSTOM_KERNELS=1 - -# Define environments -ENV DEBIAN_FRONTEND=noninteractive -ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS} - -RUN apt-get update -y && \ - apt-get install -y python3-pip git vim wget net-tools gcc g++ cmake libnuma-dev && \ - rm -rf /var/cache/apt/* && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /workspace - -COPY . /vllm-workspace/vllm-ascend/ - -RUN pip config set global.index-url ${PIP_INDEX_URL} - -# Install vLLM -ARG VLLM_REPO=https://github.com/vllm-project/vllm.git -ARG VLLM_TAG=v0.10.1.1 -RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm -# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it. -RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -v -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip uninstall -y triton && \ - python3 -m pip cache purge - -# Install vllm-ascend -# Append `libascend_hal.so` path (devlib) to LD_LIBRARY_PATH -RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - source /usr/local/Ascend/nnal/atb/set_env.sh && \ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \ - python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip cache purge - -# Install modelscope (for fast download) and ray (for multinode) -RUN python3 -m pip install modelscope 'ray>=2.47.1' 'protobuf>3.20.0' && \ - python3 -m pip cache purge - -CMD ["/bin/bash"] \ No newline at end of file diff --git a/Dockerfile.a3.openEuler b/Dockerfile.a3.openEuler deleted file mode 100644 index aff585b..0000000 --- a/Dockerfile.a3.openEuler +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This file is a part of the vllm-ascend project. -# - -FROM quay.io/ascend/cann:8.2.rc1-a3-openeuler24.03-py3.11 - -ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" -ARG COMPILE_CUSTOM_KERNELS=1 - -ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS} - -RUN yum update -y && \ - yum install -y python3-pip git vim wget net-tools gcc gcc-c++ make cmake numactl-devel && \ - rm -rf /var/cache/yum - -RUN pip config set global.index-url ${PIP_INDEX_URL} - -WORKDIR /workspace - -COPY . /vllm-workspace/vllm-ascend/ - -# Install vLLM -ARG VLLM_REPO=https://github.com/vllm-project/vllm.git -ARG VLLM_TAG=v0.10.1.1 - -RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm -# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it. -RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip uninstall -y triton && \ - python3 -m pip cache purge - -# Install vllm-ascend -RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - source /usr/local/Ascend/nnal/atb/set_env.sh && \ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \ - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \ - python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip cache purge - -# Install modelscope (for fast download) and ray (for multinode) -RUN python3 -m pip install modelscope 'ray>=2.47.1' 'protobuf>3.20.0' && \ - python3 -m pip cache purge - -CMD ["/bin/bash"] \ No newline at end of file diff --git a/Dockerfile.openEuler b/Dockerfile.openEuler deleted file mode 100644 index 47a0c60..0000000 --- a/Dockerfile.openEuler +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# This file is a part of the vllm-ascend project. -# - -FROM quay.io/ascend/cann:8.2.rc1-910b-openeuler24.03-py3.11 - -ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" -ARG COMPILE_CUSTOM_KERNELS=1 - -ENV COMPILE_CUSTOM_KERNELS=${COMPILE_CUSTOM_KERNELS} - -RUN yum update -y && \ - yum install -y python3-pip git vim wget net-tools gcc gcc-c++ make cmake numactl-devel && \ - rm -rf /var/cache/yum - -RUN pip config set global.index-url ${PIP_INDEX_URL} - -WORKDIR /workspace - -COPY . /vllm-workspace/vllm-ascend/ - -# Install vLLM -ARG VLLM_REPO=https://github.com/vllm-project/vllm.git -ARG VLLM_TAG=v0.10.1.1 - -RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm -# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it. -RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip uninstall -y triton && \ - python3 -m pip cache purge - -# Install vllm-ascend -RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - source /usr/local/Ascend/nnal/atb/set_env.sh && \ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \ - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \ - python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \ - python3 -m pip cache purge - -# Install modelscope (for fast download) and ray (for multinode) -RUN python3 -m pip install modelscope 'ray>=2.47.1' 'protobuf>3.20.0' && \ - python3 -m pip cache purge - -CMD ["/bin/bash"]