Skip to content

Commit 9b1dcac

Browse files
Del xpu sudo 1 (#73514)
* Update _Linux-XPU.yml
1 parent 2ac106b commit 9b1dcac

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

.github/workflows/_Linux-XPU.yml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
env:
77
dockerfile: dockerfile
8-
docker_image: aa13dc110ab3
8+
docker_image: 08d38377a9c7
99
PR_ID: ${{ github.event.pull_request.number }}
1010
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
1111
ci_scripts: /paddle/ci
@@ -50,8 +50,6 @@ jobs:
5050
WITH_DISTRIBUTE: "ON"
5151
PY_VERSION: "3.10"
5252
XPU_VISIBLE_DEVICES: "0,1"
53-
CUDA_VERSION:
54-
CUDNN_VERSION:
5553
WITH_XPU_BKCL: "ON"
5654
WITH_XPU_FFT: "ON"
5755
WITH_XPU_XRE5: "ON"
@@ -84,8 +82,6 @@ jobs:
8482
-e WITH_DISTRIBUTE \
8583
-e PY_VERSION \
8684
-e XPU_VISIBLE_DEVICES \
87-
-e CUDA_VERSION \
88-
-e CUDNN_VERSION \
8985
-e WITH_XPU_BKCL \
9086
-e WITH_XPU_FFT \
9187
-e WITH_XPU_XRE5 \
@@ -181,19 +177,12 @@ jobs:
181177
group: Kunlun
182178

183179
steps:
184-
- name: Download build.tar.gz
185-
run: |
186-
sudo rm -rf * .[^.]*
187-
wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/xpu/${PR_ID}/${COMMIT_ID}/build.tar.gz --no-check-certificate
188-
sudo yum install zstd -y
189-
sudo tar --use-compress-program="pzstd" -xf build.tar.gz --strip-components=1
190-
rm build.tar.gz
191-
192180
- name: Determine the runner
193181
run: |
194182
runner_name=`(echo $PWD|awk -F '/' '{print $3}')`
195183
echo $runner_name
196-
source ${ci_scripts_runner}/utils.sh
184+
wget -q https://xly-devops.bj.bcebos.com/PR/utils.sh
185+
source utils.sh
197186
determine_kunlun_runner ${runner_name}
198187
199188
- name: Check docker image and run container
@@ -209,8 +198,6 @@ jobs:
209198
PY_VERSION: "3.10"
210199
XPU_VISIBLE_DEVICES: ${{ env.CUDA_VISIBLE_DEVICES }}
211200
CUDA_VISIBLE_DEVICES: ${{ env.CUDA_VISIBLE_DEVICES }}
212-
CUDA_VERSION:
213-
CUDNN_VERSION:
214201
WITH_XPU_BKCL: "ON"
215202
CACHE_DIR: /root/.cache
216203
CCACHE_DIR: /root/.ccache
@@ -223,14 +210,14 @@ jobs:
223210
run: |
224211
container_name=${TASK}-$(date +%Y%m%d-%H%M%S)
225212
echo "container_name=${container_name}" >> ${{ github.env }}
226-
sudo mkdir -p /run/user/0
227-
docker run --cap-add=SYS_PTRACE --privileged --ulimit nofile=102400 --ulimit core=-1 --shm-size=32g -d -t --name ${container_name} \
213+
docker run --ulimit nofile=102400 --ulimit core=-1 --shm-size=32g -d -t --name ${container_name} \
228214
-v /ssd1/cibuild/.cache:/root/.cache \
229215
-v /ssd1/cibuild/.ccache:/root/.ccache \
230216
-v ${{ github.workspace }}/../../..:${{ github.workspace }}/../../.. \
231217
-v ${{ github.workspace }}:/paddle \
232218
--device ${XPU_CODE_1} \
233219
--device ${XPU_CODE_2} \
220+
--device /dev/xpuctrl \
234221
--shm-size=32g \
235222
-e BRANCH \
236223
-e PR_ID \
@@ -247,8 +234,6 @@ jobs:
247234
-e PY_VERSION \
248235
-e XPU_VISIBLE_DEVICES \
249236
-e CUDA_VISIBLE_DEVICES \
250-
-e CUDA_VERSION \
251-
-e CUDNN_VERSION \
252237
-e WITH_XPU_BKCL \
253238
-e CACHE_DIR \
254239
-e CCACHE_DIR \
@@ -264,16 +249,20 @@ jobs:
264249
-e CI_name \
265250
-w /paddle --network host ${docker_image} /bin/bash
266251
252+
- name: Download build.tar.gz
253+
run: |
254+
wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/xpu/${PR_ID}/${COMMIT_ID}/build.tar.gz --no-check-certificate
255+
tar --use-compress-program="pzstd" -xf build.tar.gz --strip-components=1
256+
rm build.tar.gz
257+
267258
- name: Run test
268259
run: |
269-
sudo mkdir -p /run/user/0
270260
docker exec -t ${{ env.container_name }} /bin/bash -c '
271261
bash ${ci_scripts}/kunlun_test.sh
272262
'
273263
274264
- name: Terminate and delete the container
275265
if: always()
276266
run: |
277-
sudo mkdir -p /run/user/0
278-
sudo rm -rf * .[^.]*
267+
docker exec -t ${container_name} /bin/bash -c 'rm -rf * .[^.]*'
279268
docker rm -f ${container_name}

0 commit comments

Comments
 (0)