Skip to content

Commit 45315d1

Browse files
tianshuo78520atianshuo78520a
authored
Update NPU RC2 (#1404)
1 parent 3b04fd1 commit 45315d1

File tree

2 files changed

+48
-64
lines changed

2 files changed

+48
-64
lines changed

‎backends/npu/tools/dockerfile/Dockerfile.npu.ubuntu20.gcc84‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,72 @@ LABEL maintainer="PaddlePaddle Authors <[email protected]>"
77
RUN groupadd -g 1000 HwHiAiUser && \
88
useradd -u 1000 -g 1000 -m -d /home/HwHiAiUser HwHiAiUser
99

10-
# copy /etc/ascend_install.info to current dir fist
11-
COPY ascend_install.info /etc/ascend_install.info
12-
13-
# copy /usr/local/Ascend/driver/version.info to current dir fist
1410
RUN mkdir -p /usr/local/Ascend/driver
15-
COPY version.info /usr/local/Ascend/driver/version.info
16-
17-
# Download packages from https://www.hiascend.com/software/cann/community
1811
WORKDIR /usr/local/Ascend
1912
ARG CANN_VERSION
13+
ARG SYSTEM
2014

2115
# install CANN requirement
2216
# https://www.hiascend.com/document/detail/zh/CANNCommunityEdition/700alpha003/softwareinstall/instg/instg_0026.html
2317
RUN apt-get update -y && apt-get install -y zlib1g zlib1g-dev libsqlite3-dev openssl libssl-dev libffi-dev libbz2-dev \
2418
libxslt1-dev unzip pciutils net-tools libblas-dev gfortran libblas3 liblapack-dev liblapack3 libopenblas-dev
2519

26-
# install CANN requirement
27-
# https://www.hiascend.com/document/detail/zh/CANNCommunityEdition/700alpha003/softwareinstall/instg/instg_0026.html
28-
RUN pip install --upgrade pip setuptools wheel
29-
RUN pip install 'numpy>=1.19.2' 'decorator>=4.4.0' 'sympy>=1.5.1' 'cffi>=1.12.3' 'protobuf>=3.13.0'
30-
RUN pip install attrs pyyaml pathlib2 scipy requests psutil absl-py
20+
RUN pip3.8 install --upgrade pip setuptools wheel && \
21+
pip3.9 install --upgrade pip setuptools wheel && \
22+
pip3.10 install --upgrade pip setuptools wheel
23+
24+
RUN pip3.8 install 'numpy>=1.19.2' 'decorator>=4.4.0' 'sympy>=1.5.1' 'cffi>=1.12.3' 'protobuf>=3.13.0' && \
25+
pip3.9 install 'numpy>=1.19.2' 'decorator>=4.4.0' 'sympy>=1.5.1' 'cffi>=1.12.3' 'protobuf>=3.13.0' && \
26+
pip3.10 install 'numpy>=1.19.2' 'decorator>=4.4.0' 'sympy>=1.5.1' 'cffi>=1.12.3' 'protobuf>=3.13.0'
27+
28+
RUN pip3.8 install attrs pyyaml pathlib2 scipy requests psutil absl-py && \
29+
pip3.9 install attrs pyyaml pathlib2 scipy requests psutil absl-py && \
30+
pip3.10 install attrs pyyaml pathlib2 scipy requests psutil absl-py
3131

3232
# update envs for driver
3333
ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64:$LD_LIBRARY_PATH
3434
ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common:$LD_LIBRARY_PATH
3535
ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/driver:$LD_LIBRARY_PATH
3636

3737
# Install Ascend toolkit
38-
COPY Ascend-cann-toolkit_${CANN_VERSION}_linux-*.run /usr/local/Ascend/
39-
RUN chmod +x Ascend-cann-toolkit_${CANN_VERSION}_linux-*.run && \
38+
RUN wget -q https://paddle-ascend.bj.bcebos.com/cvmodel/ascend-materials/Ascend-cann-toolkit_${CANN_VERSION}_linux-${SYSTEM}.run --no-check-certificate && \
39+
chmod +x Ascend-cann-toolkit_${CANN_VERSION}_linux-*.run && \
4040
./Ascend-cann-toolkit_${CANN_VERSION}_linux-*.run --install --quiet && \
41+
echo "source /usr/local/Ascend/ascend-toolkit/set_env.sh" >>~/.bashrc && \
4142
rm -rf Ascend-cann-toolkit_${CANN_VERSION}_linux-*.run
42-
# udpate envs for toolkit
43-
RUN echo "source /usr/local/Ascend/ascend-toolkit/set_env.sh" >> /root/.bashrc
4443

4544
# Install Ascend Kernels
46-
ARG ASCEND_KLS=Ascend-cann-kernels-910*_${CANN_VERSION}_linux.run
47-
COPY ${ASCEND_KLS} /usr/local/Ascend/
48-
RUN chmod +x ${ASCEND_KLS} && ./${ASCEND_KLS} --install --quiet && rm -rf ${ASCEND_KLS}
45+
ARG ASCEND_KLS=Ascend-cann-kernels-910b_${CANN_VERSION}_linux.run
46+
RUN wget -q https://paddle-ascend.bj.bcebos.com/cvmodel/ascend-materials/${ASCEND_KLS} --no-check-certificate && \
47+
chmod +x ${ASCEND_KLS} && ./${ASCEND_KLS} --install --quiet && rm -rf ${ASCEND_KLS}
48+
49+
# Install Ascend nnal
50+
RUN wget -q https://paddle-ascend.bj.bcebos.com/cvmodel/ascend-materials/Ascend-cann-nnal_${CANN_VERSION}_linux-${SYSTEM}.run --no-check-certificate && \
51+
chmod +x Ascend-cann-nnal_${CANN_VERSION}_linux-${SYSTEM}.run && \
52+
. /usr/local/Ascend/ascend-toolkit/set_env.sh && \
53+
./Ascend-cann-nnal_${CANN_VERSION}_linux-${SYSTEM}.run --install --quiet &&\
54+
rm -rf Ascend-cann-nnal_${CANN_VERSION}_linux-${SYSTEM}.run
4955

5056
# Install Ascend Transformer Boost
51-
ARG ASCEND_ATB=Ascend-mindie-atb*linux*_abi1.run
52-
COPY ${ASCEND_ATB} /usr/local/Ascend/
53-
RUN . /usr/local/Ascend/ascend-toolkit/set_env.sh && \
57+
ARG ASCEND_ATB=Ascend-cann-atb_${CANN_VERSION}_linux-${SYSTEM}.run
58+
RUN wget -q https://paddle-ascend.bj.bcebos.com/atb/${ASCEND_ATB} --no-check-certificate && \
59+
. /usr/local/Ascend/ascend-toolkit/set_env.sh && \
5460
chmod +x ${ASCEND_ATB} && ./${ASCEND_ATB} --install --quiet && rm -rf ${ASCEND_ATB}
61+
62+
5563
# fix accuracy to turn off memory optim and cache by default
5664
RUN sed -i "s/ATB_OPSRUNNER_SETUP_CACHE_ENABLE=[0-9]/ATB_OPSRUNNER_SETUP_CACHE_ENABLE=0/g" /usr/local/Ascend/atb/set_env.sh && \
5765
sed -i "s/ATB_WORKSPACE_MEM_ALLOC_GLOBAL=[0-9]/ATB_WORKSPACE_MEM_ALLOC_GLOBAL=0/g" /usr/local/Ascend/atb/set_env.sh && \
5866
sed -i "s/ATB_WORKSPACE_MEM_ALLOC_ALG_TYPE=[0-9]/ATB_WORKSPACE_MEM_ALLOC_ALG_TYPE=0/g" /usr/local/Ascend/atb/set_env.sh && \
5967
echo "source /usr/local/Ascend/atb/set_env.sh" >> /root/.bashrc
6068

6169
# install post process ops
62-
COPY code-share /usr/local/Ascend/code-share/
63-
RUN . /usr/local/Ascend/ascend-toolkit/set_env.sh && \
64-
cd code-share/build && bash build_ops.sh > /dev/null && \
70+
RUN wget -q https://paddle-ascend.bj.bcebos.com/code-share-master.zip --no-check-certificate && \
71+
. /usr/local/Ascend/ascend-toolkit/set_env.sh && \
72+
unzip code-share-master.zip && \
73+
cd code-share-master/build && bash build_ops.sh > /dev/null && \
6574
chmod +x aie_ops.run && ./aie_ops.run --extract=/usr/local/Ascend/ && \
66-
rm -rf /usr/local/Ascend/code-share
75+
rm -rf /usr/local/Ascend/code-share-master
6776
# update env for ascendc
6877
ENV ASCEND_CUSTOM_OPP_PATH=/usr/local/Ascend/vendors/aie_ascendc
6978

‎backends/npu/tools/dockerfile/build-image.sh‎

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ set -ex
2020
# export CANN_VERSION=8.0.RC1
2121
# bash build-image.sh ${CANN_VERSION}
2222

23-
CANN_VERSION=${1:-8.0.T13} # default 8.0.T13
23+
CANN_VERSION=${1:-8.0.RC2} # default 8.0.RC2
24+
SYSTEM=${2:-x86_64} # default 8.0.RC2
2425

2526
# DOCKER_VERSION=${CANN_VERSION//[^0-9]/} # 801i3
2627
DOCKER_VERSION=${CANN_VERSION//[^0-9A-Z]/} # 80T13
@@ -33,48 +34,22 @@ if [ ! -f Ascend-cann-toolkit_${CANN_VERSION}_linux-$(uname -m).run ]; then
3334
fi
3435

3536
# copy file to current directory
36-
cp /etc/ascend_install.info ./
37-
cp /usr/local/Ascend/driver/version.info ./
38-
37+
#cp /etc/ascend_install.info ./
38+
#cp /usr/local/Ascend/driver/version.info ./
39+
#ubuntu20-npu-base-x86_64-gcc84
3940
# ubuntu20-$(uname -m)-gcc84-py38
40-
sed "s#<baseimg>#registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py38#g" Dockerfile.npu.ubuntu20.gcc84 > Dockerfile.npu.ubuntu20.gcc84.py38
41-
docker pull registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py38
42-
docker build --network=host -f Dockerfile.npu.ubuntu20.gcc84.py38 \
43-
--build-arg CANN_VERSION=${CANN_VERSION} \
44-
--build-arg http_proxy=${proxy} \
45-
--build-arg https_proxy=${proxy} \
46-
--build-arg ftp_proxy=${proxy} \
47-
--build-arg no_proxy=bcebos.com \
48-
-t registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py38 .
49-
docker push registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py38
50-
rm -rf Dockerfile.npu.ubuntu20.gcc84.py38
51-
52-
# ubuntu20-$(uname -m)-gcc84-py39
53-
sed "s#<baseimg>#registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py39#g" Dockerfile.npu.ubuntu20.gcc84 > Dockerfile.npu.ubuntu20.gcc84.py39
54-
docker pull registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py39
55-
docker build --network=host -f Dockerfile.npu.ubuntu20.gcc84.py39 \
41+
sed "s#<baseimg>#registry.baidubce.com/device/paddle-cpu:ubuntu20-npu-base-$(uname -m)-gcc84#g" Dockerfile.npu.ubuntu20.gcc84 > Dockerfile.npu.ubuntu20.gcc84.test
42+
#docker pull registry.baidubce.com/device/paddle-cpu:ubuntu20-npu-base-$(uname -m)-gcc84
43+
docker build --network=host -f Dockerfile.npu.ubuntu20.gcc84.test \
5644
--build-arg CANN_VERSION=${CANN_VERSION} \
45+
--build-arg SYSTEM=${SYSTEM} \
5746
--build-arg http_proxy=${proxy} \
5847
--build-arg https_proxy=${proxy} \
5948
--build-arg ftp_proxy=${proxy} \
6049
--build-arg no_proxy=bcebos.com \
61-
-t registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py39 .
62-
docker push registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py39
63-
rm -rf Dockerfile.npu.ubuntu20.gcc84.py39
64-
65-
# ubuntu20-$(uname -m)-gcc84-py310
66-
sed "s#<baseimg>#registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py310#g" Dockerfile.npu.ubuntu20.gcc84 > Dockerfile.npu.ubuntu20.gcc84.py310
67-
docker pull registry.baidubce.com/device/paddle-cpu:ubuntu20-$(uname -m)-gcc84-py310
68-
docker build --network=host -f Dockerfile.npu.ubuntu20.gcc84.py310 \
69-
--build-arg CANN_VERSION=${CANN_VERSION} \
70-
--build-arg http_proxy=${proxy} \
71-
--build-arg https_proxy=${proxy} \
72-
--build-arg ftp_proxy=${proxy} \
73-
--build-arg no_proxy=bcebos.com \
74-
-t registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py310 .
75-
docker push registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-$(uname -m)-gcc84-py310
76-
rm -rf Dockerfile.npu.ubuntu20.gcc84.py310
77-
50+
-t registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-npu-base-$(uname -m)-gcc84 .
51+
docker push registry.baidubce.com/device/paddle-npu:cann${DOCKER_VERSION}-ubuntu20-npu-base-$(uname -m)-gcc84
52+
rm -rf Dockerfile.npu.ubuntu20.gcc84.test
7853

7954
# clean driver info
80-
rm -rf *.info
55+
#rm -rf *.info

0 commit comments

Comments
 (0)