Skip to content

Commit 6281c12

Browse files
authored
[CI][Image] Remove CPLUS_INCLUDE_PATH and add patch (#6576)
### What this PR does / why we need it? This PR makes two changes to the openEuler Dockerfiles (`Dockerfile.310p.openEuler`, `Dockerfile.a3.openEuler`, `Dockerfile.openEuler`): 1. Adds the `patch` package to the `yum install` command. This utility is required for applying patches during the build process. 2. Removes the `export CPLUS_INCLUDE_PATH` from the `vllm-ascend` installation step. This environment variable is no longer necessary and its removal cleans up the build configuration. ### Does this PR introduce _any_ user-facing change? No. This only affects the build environment for developers and CI. ### How was this patch tested? CI is expected to pass with these changes. The changes are validated by successfully building the Docker images. Signed-off-by: wjunLu <wjunlu217@gmail.com>
1 parent 6c188ba commit 6281c12

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

Dockerfile.310p.openEuler

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ENV SOC_VERSION=$SOC_VERSION \
2525
OMP_NUM_THREADS=1
2626

2727
RUN yum update -y && \
28-
yum install -y python3-pip git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
28+
yum install -y patch python3-pip git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
2929
rm -rf /var/cache/yum
3030

3131
RUN pip config set global.index-url ${PIP_INDEX_URL}
@@ -48,7 +48,6 @@ RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
4848
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
4949
source /usr/local/Ascend/nnal/atb/set_env.sh && \
5050
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
51-
export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \
5251
export SOC_VERSION=ASCEND310P3 && \
5352
python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \
5453
python3 -m pip cache purge

Dockerfile.a3.openEuler

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . /vllm-workspace/vllm-ascend/
3434
SHELL ["/bin/bash", "-c"]
3535

3636
RUN yum update -y && \
37-
yum install -y git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
37+
yum install -y patch git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
3838
git clone --depth 1 --branch ${MOONCAKE_TAG} https://github.com/kvcache-ai/Mooncake /vllm-workspace/Mooncake && \
3939
cp /vllm-workspace/vllm-ascend/tools/mooncake_installer.sh /vllm-workspace/Mooncake/ && \
4040
ARCH=$(uname -m) && \
@@ -62,7 +62,6 @@ RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
6262
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
6363
source /usr/local/Ascend/nnal/atb/set_env.sh && \
6464
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
65-
export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \
6665
python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \
6766
python3 -m pip cache purge
6867

Dockerfile.openEuler

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . /vllm-workspace/vllm-ascend/
3434
SHELL ["/bin/bash", "-c"]
3535

3636
RUN yum update -y && \
37-
yum install -y git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
37+
yum install -y patch git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc && \
3838
git clone --depth 1 --branch ${MOONCAKE_TAG} https://github.com/kvcache-ai/Mooncake /vllm-workspace/Mooncake && \
3939
cp /vllm-workspace/vllm-ascend/tools/mooncake_installer.sh /vllm-workspace/Mooncake/ && \
4040
ARCH=$(uname -m) && \
@@ -62,7 +62,6 @@ RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
6262
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
6363
source /usr/local/Ascend/nnal/atb/set_env.sh && \
6464
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
65-
export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/c++/12:/usr/include/c++/12/`uname -i`-openEuler-linux && \
6665
python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \
6766
python3 -m pip cache purge
6867

0 commit comments

Comments
 (0)