Skip to content

Commit ac7b0e7

Browse files
haobibohaobibo
authored
Downgrade Python to 3.10 to fit paddlepaddle (#77)
* 3.11 -> 3.10 * cuda-versions
1 parent a6ce1bc commit ac7b0e7

File tree

3 files changed

+31
-29
lines changed

3 files changed

+31
-29
lines changed

‎.github/workflows/docker.yml

+29-27
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ jobs:
2727
- run: |
2828
source ./tool.sh
2929
build_image atom latest docker_atom/Dockerfile && push_image
30-
build_image base latest docker_base/Dockerfile && alias_image base latest python latest && push_image
30+
build_image python-3.7 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.7" && push_image
31+
build_image python-3.10 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.10" && alias_image python-3.10 latest base latest && push_image
32+
build_image python-3.11 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.11" && push_image
3133
3234
qpod_core:
3335
name: qpod/core
@@ -168,17 +170,17 @@ jobs:
168170
# cuda docker image tags: https://hub.docker.com/r/nvidia/cuda/tags
169171
# latest cuda supported by torch: https://pytorch.org/get-started/locally/
170172
# latest cuda supported by tensorflow: https://tensorflow.google.cn/install/source_windows?hl=en#gpu
171-
qpod_cuda_11_6:
172-
name: qpod/cuda_11.6
173+
qpod_cuda_11_7:
174+
name: qpod/cuda_11.7
173175
runs-on: ubuntu-latest
174176
steps:
175177
- uses: actions/checkout@v3
176178
- run: |
177179
source ./tool.sh
178-
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04" && docker rmi nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
180+
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04" && docker rmi nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04
179181
build_image tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=tmp"
180-
build_image cuda_11.6 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
181-
alias_image cuda_11.6 latest cuda latest
182+
build_image cuda_11.7 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
183+
alias_image cuda_11.7 latest cuda latest
182184
push_image cuda
183185
184186
qpod_cuda_11_2:
@@ -245,16 +247,16 @@ jobs:
245247
alias_image tf2-cuda112 latest torch latest
246248
push_image
247249
248-
qpod_torch_cuda116:
249-
name: qpod/torch-cuda116
250-
needs: qpod_cuda_11_6
250+
qpod_torch_cuda117:
251+
name: qpod/torch-cuda117
252+
needs: qpod_cuda_11_7
251253
runs-on: ubuntu-latest
252254
steps:
253255
- uses: actions/checkout@v3
254256
- run: |
255257
source ./tool.sh
256-
build_image torch-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=torch"
257-
alias_image torch-cuda116 latest torch latest
258+
build_image torch-cuda117 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=torch"
259+
alias_image torch-cuda117 latest torch latest
258260
push_image
259261
260262
qpod_torch_cuda112:
@@ -268,16 +270,16 @@ jobs:
268270
build_image torch-cuda112 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.2" --build-arg "ARG_PROFILE_PYTHON=torch"
269271
push_image
270272
271-
qpod_paddle_cuda116:
272-
name: qpod/paddle-cuda116
273-
needs: qpod_cuda_11_6
273+
qpod_paddle_cuda117:
274+
name: qpod/paddle-cuda117
275+
needs: qpod_cuda_11_7
274276
runs-on: ubuntu-latest
275277
steps:
276278
- uses: actions/checkout@v3
277279
- run: |
278280
source ./tool.sh
279-
build_image paddle-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=paddle,mkl"
280-
alias_image paddle-cuda116 latest paddle latest
281+
build_image paddle-cuda117 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=paddle,mkl"
282+
alias_image paddle-cuda117 latest paddle latest
281283
push_image
282284
283285
qpod_paddle_cuda112:
@@ -292,16 +294,16 @@ jobs:
292294
push_image
293295
294296
295-
qpod_py-nlp-cuda116:
296-
name: qpod/py-nlp-cuda116
297-
needs: qpod_cuda_11_6
297+
qpod_py-nlp-cuda117:
298+
name: qpod/py-nlp-cuda117
299+
needs: qpod_cuda_11_7
298300
runs-on: ubuntu-latest
299301
steps:
300302
- uses: actions/checkout@v3
301303
- run: |
302304
source ./tool.sh
303-
build_image py-nlp-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,nlp"
304-
alias_image py-nlp-cuda116 latest py-nlp latest
305+
build_image py-nlp-cuda117 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,nlp"
306+
alias_image py-nlp-cuda117 latest py-nlp latest
305307
push_image
306308
307309
qpod_py-nlp-cuda112:
@@ -318,32 +320,32 @@ jobs:
318320
319321
qpod_py-cv:
320322
name: qpod/py-cv
321-
needs: qpod_cuda_11_6
323+
needs: qpod_cuda_11_7
322324
runs-on: ubuntu-latest
323325
steps:
324326
- uses: actions/checkout@v3
325327
- run: |
326328
source ./tool.sh
327-
build_image py-cv latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,cv"
329+
build_image py-cv latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,cv"
328330
push_image
329331
330332
331333
qpod_core-cuda:
332334
name: qpod/core-cuda
333-
needs: qpod_cuda_11_6
335+
needs: qpod_cuda_11_7
334336
runs-on: ubuntu-latest
335337
steps:
336338
- uses: actions/checkout@v3
337339
- run: |
338340
source ./tool.sh && free_diskspace
339-
build_image full-cuda-11.6 latest docker_core/Dockerfile \
340-
--build-arg "BASE_IMG=cuda_11.6" \
341+
build_image full-cuda-11.7 latest docker_core/Dockerfile \
342+
--build-arg "BASE_IMG=cuda_11.7" \
341343
--build-arg "ARG_PROFILE_PYTHON=base,datascience,mkl,database,nlp,cv,chem,tf2,torch" \
342344
--build-arg "ARG_PROFILE_R=base,datascience,rstudio,rshiny" \
343345
--build-arg "ARG_PROFILE_NODEJS=base" \
344346
--build-arg "ARG_PROFILE_JAVA=base,maven" \
345347
--build-arg "ARG_PROFILE_LATEX=base,cjk"
346-
alias_image full-cuda-11.6 latest core-cuda latest && push_image
348+
alias_image full-cuda-11.7 latest core-cuda latest && push_image
347349
348350
qpod_core-dev:
349351
name: qpod/core-dev

‎docker_atom/work/script-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ EOF
5555
setup_conda_with_mamba() {
5656
local PREFIX="${CONDA_PREFIX:-/opt/conda}"
5757
mkdir -pv "${PREFIX}"
58-
VERSION_PYTHON=${1:-"3.11"}; shift 1;
58+
VERSION_PYTHON=${1:-"3.10"}; shift 1;
5959
mamba install -y --root-prefix="${PREFIX}" --prefix="${PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON}"
6060
setup_conda_postprocess
6161
}

‎docker_base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BASE_IMG="atom"
55
FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
66
LABEL maintainer="haobibo@gmail.com"
77

8-
ARG PYTHON_VERSION="3.11"
8+
ARG PYTHON_VERSION="3.10"
99

1010
ENV CONDA_PREFIX=/opt/conda
1111
ENV PATH=$PATH:${CONDA_PREFIX}/bin

0 commit comments

Comments
 (0)