Skip to content

Commit 4135872

Browse files
authored
Update package versions (#67)
* add paddle docker image * pin ubuntu version to focal * upgrade cuda 116
1 parent ef1a8ad commit 4135872

File tree

11 files changed

+190
-108
lines changed

11 files changed

+190
-108
lines changed

.gitattributes

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,25 @@
1-
* text=auto eol=lf
1+
# Ignore all differences in line endings
2+
* text=auto eol=lf
3+
*.md text eol=lf
4+
*.py text eol=lf
5+
*.sh text eol=lf
6+
*.yml text eol=lf
7+
*.yaml text eol=lf
8+
*.json text eol=lf
9+
*.properties text eol=lf
10+
*.conf text eol=lf
11+
*.ipynb text eol=lf
12+
Dockerfile* text eol=lf
13+
.gitattributes text eol=lf
14+
.gitignore text eol=lf
15+
.dockerignore text eol=lf
16+
17+
# Files using LFS to track
18+
*.tgz filter=lfs diff=lfs merge=lfs -text
19+
*.h5 filter=lfs diff=lfs merge=lfs -text
20+
*.jsonl filter=lfs diff=lfs merge=lfs -text
21+
*.xlsx filter=lfs diff=lfs merge=lfs -text
22+
*.bin filter=lfs diff=lfs merge=lfs -text
23+
*.png filter=lfs diff=lfs merge=lfs -text
24+
*.jpg filter=lfs diff=lfs merge=lfs -text
25+
*.jpeg filter=lfs diff=lfs merge=lfs -text

.github/workflows/docker.yml

Lines changed: 103 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,6 @@ jobs:
2929
build_image atom latest docker_atom/Dockerfile && push_image
3030
build_image base latest docker_base/Dockerfile && alias_image base latest python latest && push_image
3131
32-
# latest cuda supported by torch: https://pytorch.org/get-started/locally/
33-
qpod_cuda_11_5:
34-
name: qpod/cuda_11.5
35-
runs-on: ubuntu-latest
36-
steps:
37-
- uses: actions/checkout@v2
38-
- run: |
39-
source ./tool.sh
40-
build_image cuda_11.5 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.5.2-cudnn8-devel-ubuntu20.04"
41-
build_image cuda_11.5 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_11.5"
42-
build_image cuda_11.5 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_11.5"
43-
alias_image cuda_11.5 latest cuda latest
44-
push_image
45-
46-
# For legacy torch support
47-
qpod_cuda_10_2:
48-
name: qpod/cuda_10.2
49-
runs-on: ubuntu-latest
50-
steps:
51-
- uses: actions/checkout@v2
52-
- run: |
53-
source ./tool.sh
54-
build_image cuda_10.2 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04"
55-
build_image cuda_10.2 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.2"
56-
build_image cuda_10.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.2" && push_image
57-
58-
# cuda_10.0 - for legacy tensorflow 1.15 support
59-
qpod_cuda_10_0:
60-
name: qpod/cuda_10.0
61-
runs-on: ubuntu-latest
62-
steps:
63-
- uses: actions/checkout@v2
64-
- run: |
65-
source ./tool.sh
66-
build_image cuda_10.0 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04"
67-
build_image cuda_10.0 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.0"
68-
build_image cuda_10.0 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.0" && push_image
69-
7032
qpod_core:
7133
name: qpod/core
7234
needs: qpod_base
@@ -91,22 +53,6 @@ jobs:
9153
- uses: actions/checkout@v2
9254
- run: source ./tool.sh && build_image py-data latest docker_core/Dockerfile --build-arg "ARG_PROFILE_PYTHON=datascience,database" && push_image
9355

94-
qpod_py-nlp:
95-
name: qpod/py-nlp
96-
needs: qpod_base
97-
runs-on: ubuntu-latest
98-
steps:
99-
- uses: actions/checkout@v2
100-
- run: source ./tool.sh && build_image py-nlp latest docker_core/Dockerfile --build-arg "ARG_PROFILE_PYTHON=datascience,nlp" && push_image
101-
102-
qpod_py-cv:
103-
name: qpod/py-cv
104-
needs: qpod_base
105-
runs-on: ubuntu-latest
106-
steps:
107-
- uses: actions/checkout@v2
108-
- run: source ./tool.sh && build_image py-cv latest docker_core/Dockerfile --build-arg "ARG_PROFILE_PYTHON=datascience,cv" && push_image
109-
11056
qpod_py-chem:
11157
name: qpod/py-chem
11258
needs: qpod_base
@@ -207,6 +153,61 @@ jobs:
207153
- uses: actions/checkout@v2
208154
- run: source ./tool.sh && build_image go latest docker_core/Dockerfile --build-arg "ARG_PROFILE_GO=base" && push_image
209155

156+
157+
# cuda docker image tags: https://hub.docker.com/r/nvidia/cuda/tags
158+
# latest cuda supported by torch: https://pytorch.org/get-started/locally/
159+
# latest cuda supported by tensorflow: https://tensorflow.google.cn/install/source_windows?hl=en#gpu
160+
qpod_cuda_11_6:
161+
name: qpod/cuda_11.6
162+
runs-on: ubuntu-latest
163+
steps:
164+
- uses: actions/checkout@v2
165+
- run: |
166+
source ./tool.sh
167+
build_image cuda_11.6 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04"
168+
build_image cuda_11.6 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_11.6"
169+
build_image cuda_11.6 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_11.6"
170+
alias_image cuda_11.6 latest cuda latest
171+
push_image
172+
173+
qpod_cuda_11_2:
174+
name: qpod/cuda_11.2
175+
runs-on: ubuntu-latest
176+
steps:
177+
- uses: actions/checkout@v2
178+
- run: |
179+
source ./tool.sh
180+
build_image cuda_11.2 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04"
181+
build_image cuda_11.2 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_11.2"
182+
build_image cuda_11.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_11.2"
183+
alias_image cuda_11.2 latest cuda latest
184+
push_image
185+
186+
# For legacy torch/paddle support
187+
qpod_cuda_10_2:
188+
name: qpod/cuda_10.2
189+
runs-on: ubuntu-latest
190+
steps:
191+
- uses: actions/checkout@v2
192+
- run: |
193+
source ./tool.sh
194+
build_image cuda_10.2 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04"
195+
build_image cuda_10.2 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.2"
196+
build_image cuda_10.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.2" && push_image
197+
198+
# cuda_10.0 - for legacy tensorflow 1.15 support
199+
qpod_cuda_10_0:
200+
name: qpod/cuda_10.0
201+
runs-on: ubuntu-latest
202+
steps:
203+
- uses: actions/checkout@v2
204+
- run: |
205+
source ./tool.sh
206+
build_image cuda_10.0 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04"
207+
build_image cuda_10.0 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.0"
208+
build_image cuda_10.0 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.0" && push_image
209+
210+
210211
qpod_tf1:
211212
name: qpod/tf1
212213
needs: qpod_cuda_10_0
@@ -221,26 +222,26 @@ jobs:
221222
222223
qpod_tf2:
223224
name: qpod/tf2
224-
needs: qpod_cuda_11_5
225+
needs: qpod_cuda_11_2
225226
runs-on: ubuntu-latest
226227
steps:
227228
- uses: actions/checkout@v2
228229
- run: |
229230
source ./tool.sh
230-
build_image tf2-cu115 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.5" --build-arg "ARG_PROFILE_PYTHON=tf2"
231-
alias_image tf2-cu115 latest torch latest
231+
build_image tf2-cu112 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.2" --build-arg "ARG_PROFILE_PYTHON=tf2"
232+
alias_image tf2-cu112 latest torch latest
232233
push_image
233234
234-
qpod_torch_cu115:
235-
name: qpod/torch-cuda115
236-
needs: qpod_cuda_11_5
235+
qpod_torch_cu116:
236+
name: qpod/torch-cuda116
237+
needs: qpod_cuda_11_6
237238
runs-on: ubuntu-latest
238239
steps:
239240
- uses: actions/checkout@v2
240241
- run: |
241242
source ./tool.sh
242-
build_image torch-cu115 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.5" --build-arg "ARG_PROFILE_PYTHON=torch"
243-
alias_image torch-cu115 latest torch latest
243+
build_image torch-cu116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=torch"
244+
alias_image torch-cu116 latest torch latest
244245
push_image
245246
246247
qpod_torch_cu102:
@@ -254,22 +255,58 @@ jobs:
254255
build_image torch-cu102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=torch"
255256
push_image
256257
258+
qpod_paddle_cu116:
259+
name: qpod/paddle-cuda116
260+
needs: qpod_cuda_11_6
261+
runs-on: ubuntu-latest
262+
steps:
263+
- uses: actions/checkout@v2
264+
- run: |
265+
source ./tool.sh
266+
build_image paddle-cu116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=paddle"
267+
alias_image paddle-cu116 latest paddle latest
268+
push_image
269+
270+
271+
qpod_py-nlp:
272+
name: qpod/py-nlp
273+
needs: qpod_base
274+
runs-on: ubuntu-latest
275+
steps:
276+
- uses: actions/checkout@v2
277+
- run: |
278+
source ./tool.sh
279+
build_image py-nlp latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=datascience,torch,nlp"
280+
push_image
281+
282+
qpod_py-cv:
283+
name: qpod/py-cv
284+
needs: qpod_base
285+
runs-on: ubuntu-latest
286+
steps:
287+
- uses: actions/checkout@v2
288+
- run: |
289+
source ./tool.sh
290+
build_image py-cv latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=datascience,torch,cv"
291+
push_image
292+
293+
257294
qpod_core-cuda:
258295
name: qpod/core-cuda
259-
needs: qpod_cuda_11_5
296+
needs: qpod_cuda_11_6
260297
runs-on: ubuntu-latest
261298
steps:
262299
- uses: actions/checkout@v2
263300
- run: |
264301
source ./tool.sh && free_diskspace
265-
build_image full-cuda-11.5 latest docker_core/Dockerfile \
266-
--build-arg "BASE_IMG=cuda_11.5" \
302+
build_image full-cuda-11.6 latest docker_core/Dockerfile \
303+
--build-arg "BASE_IMG=cuda_11.6" \
267304
--build-arg "ARG_PROFILE_PYTHON=base,datascience,database,nlp,cv,chem,tf2,torch" \
268305
--build-arg "ARG_PROFILE_R=base,datascience,rstudio,rshiny" \
269306
--build-arg "ARG_PROFILE_NODEJS=base" \
270307
--build-arg "ARG_PROFILE_JAVA=base,maven" \
271308
--build-arg "ARG_PROFILE_LATEX=base,cjk"
272-
alias_image full-cuda-11.5 latest core-cuda latest && push_image
309+
alias_image full-cuda-11.6 latest core-cuda latest && push_image
273310
274311
qpod_core-dev:
275312
name: qpod/core-dev

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ nosetests.xml
4646
coverage.xml
4747
*,cover
4848

49+
# IDE
50+
.vscode/
51+
.idea/
52+
4953
# Sphinx documentation
5054
docs/_build/
5155

docker_atom/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# default value: Latest LTS version of Ubuntu (https://hub.docker.com/_/ubuntu)
44

5-
ARG BASE_IMG="ubuntu:latest"
5+
ARG BASE_IMG="ubuntu:focal" # latest
66
FROM ${BASE_IMG}
77

88
LABEL maintainer="haobibo@gmail.com"
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
% This file contains apt packages to be installed with apt-get install line by line.
22
% Use percent char as line comment separator.
33

4-
htop vim git jq tree % Process Management, Editor, Version Control
5-
build-essential cmake % build essentials
6-
wget iputils-ping % download, network (ping)
7-
unzip bzip2 p7zip-full % zip/unzip
8-
rsync % file transfer
9-
openssh-client % Provide ssh client and generate keys
10-
openssh-server % Provide ssh server (sshd)
11-
% tini % tini - which will be entry point later; not avaliable on ubuntu<=18
4+
htop vim git jq tree % Process Management, Editor, Version Control
5+
build-essential cmake % build essentials
6+
wget iputils-ping telnet % download, network (ping)
7+
unzip bzip2 p7zip-full % zip/unzip
8+
rsync % file transfer
9+
openssh-client % Provide ssh client and generate keys
10+
openssh-server % Provide ssh server (sshd)
11+
% tini % tini - which will be entry point later; not available on ubuntu<=18

docker_atom/work/script-setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ setup_conda_postprocess() {
3434

3535
setup_conda_with_mamba() {
3636
VERSION_PTYHON=$1; shift 1;
37-
mamba install -y --root-prefix="${CONDA_PREFIX}" --prefix="${CONDA_PREFIX}" -c "conda-forge" conda pip python="${VERSION_PTYHON:-3.9}"
37+
mamba install -y --root-prefix="${CONDA_PREFIX}" --prefix="${CONDA_PREFIX}" -c "conda-forge" conda pip python="${VERSION_PTYHON:-3.10}"
3838
rm -rf /opt/conda/pkgs/*
3939
setup_conda_postprocess
4040
}
@@ -111,7 +111,7 @@ setup_node() {
111111

112112
setup_R_base() {
113113
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 \
114-
&& echo "deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/" > /etc/apt/sources.list.d/cran.list \
114+
&& echo "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" > /etc/apt/sources.list.d/cran.list \
115115
&& install_apt /opt/utils/install_list_R_base.apt \
116116
&& echo "options(repos=structure(c(CRAN=\"https://cloud.r-project.org\")))" >> /etc/R/Rprofile.site \
117117
&& R -e "install.packages(c('devtools'),clean=T,quiet=T);" \

docker_atom/work/script-utils.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ install__clean(){
4848
find /opt/conda/lib | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
4949
which npm && npm cache clean --force
5050
rm -rf /opt/conda/share/jupyter/lab/staging
51-
( rm -rf /root/.* /tmp/.* /tmp/* /var/log/* /var/cache/* || true )
51+
( rm -rf /tmp/.* /tmp/* /var/log/* /var/cache/* /root/.cache /root/.* || true )
5252
chmod ugo+rwXt /tmp
5353
ls -alh /root /tmp
54-
echo "@ System environment variables:" && for e in $(echo $(printenv) | tr " " "\n") ; do echo $e ; done
55-
echo "@ Version of image: building finished at:" `date` `uname -a`
54+
echo "@ System release info:" && cat /etc/*release*
55+
echo "@ System environment variables:" && printenv | sort
56+
echo "@ Version of image: building finished at:" $(date)
5657
true
5758
}
5859

0 commit comments

Comments
 (0)