Skip to content

Commit 0b2fc79

Browse files
haobibohaobibo
authored
add paddle-cu102 (#68)
1 parent 4135872 commit 0b2fc79

File tree

5 files changed

+53
-43
lines changed

5 files changed

+53
-43
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66
paths-ignore:
77
- "*.md"
8-
8+
99
pull_request:
1010
branches: [ main ]
1111
paths-ignore:
@@ -216,8 +216,8 @@ jobs:
216216
- uses: actions/checkout@v2
217217
- run: |
218218
source ./tool.sh
219-
build_image tf1-cu100 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.0" --build-arg "ARG_PROFILE_PYTHON=tf1"
220-
alias_image tf1-cu100 latest tf1 latest
219+
build_image tf1-cuda100 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.0" --build-arg "ARG_PROFILE_PYTHON=tf1"
220+
alias_image tf1-cuda100 latest tf1 latest
221221
push_image
222222
223223
qpod_tf2:
@@ -228,43 +228,54 @@ jobs:
228228
- uses: actions/checkout@v2
229229
- run: |
230230
source ./tool.sh
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
231+
build_image tf2-cuda112 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.2" --build-arg "ARG_PROFILE_PYTHON=tf2"
232+
alias_image tf2-cuda112 latest torch latest
233233
push_image
234234
235-
qpod_torch_cu116:
235+
qpod_torch_cuda116:
236236
name: qpod/torch-cuda116
237237
needs: qpod_cuda_11_6
238238
runs-on: ubuntu-latest
239239
steps:
240240
- uses: actions/checkout@v2
241241
- run: |
242242
source ./tool.sh
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
243+
build_image torch-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=torch"
244+
alias_image torch-cuda116 latest torch latest
245245
push_image
246246
247-
qpod_torch_cu102:
248-
name: qpod/torch-cu102
247+
qpod_torch_cuda102:
248+
name: qpod/torch-cuda102
249249
needs: qpod_cuda_10_2
250250
runs-on: ubuntu-latest
251251
steps:
252252
- uses: actions/checkout@v2
253253
- run: |
254254
source ./tool.sh
255-
build_image torch-cu102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=torch"
255+
build_image torch-cuda102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=torch"
256256
push_image
257257
258-
qpod_paddle_cu116:
258+
qpod_paddle_cuda116:
259259
name: qpod/paddle-cuda116
260260
needs: qpod_cuda_11_6
261261
runs-on: ubuntu-latest
262262
steps:
263263
- uses: actions/checkout@v2
264264
- run: |
265265
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
266+
build_image paddle-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=paddle"
267+
alias_image paddle-cuda116 latest paddle latest
268+
push_image
269+
270+
qpod_paddle_cuda102:
271+
name: qpod/paddle-cuda102
272+
needs: qpod_cuda_10_2
273+
runs-on: ubuntu-latest
274+
steps:
275+
- uses: actions/checkout@v2
276+
- run: |
277+
source ./tool.sh
278+
build_image paddle-cuda102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=paddle"
268279
push_image
269280
270281

‎docker_atom/work/script-setup.sh‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ setup_conda_postprocess() {
2424
&& conda update --all --quiet --yes
2525

2626
# These conda pkgs shouldn't be removed (otherwise will cause RemoveError) since they are directly reqiuired by conda: pip setuptools pycosat pyopenssl requests ruamel_yaml
27-
CONDA_PY_PKGS=`conda list | grep "py3" | cut -d " " -f 1 | sed "/#/d;/conda/d;/pip/d;/setuptools/d;/pycosat/d;/pyopenssl/d;/requests/d;/ruamel_yaml/d;"` \
28-
&& conda remove --force -yq $CONDA_PY_PKGS \
29-
&& pip install -UIq pip setuptools $CONDA_PY_PKGS
27+
CONDA_PY_PKGS=$(conda list | grep "py3" | cut -d " " -f 1 | sed "/#/d;/conda/d;/pip/d;/setuptools/d;/pycosat/d;/pyopenssl/d;/requests/d;/ruamel_yaml/d;") \
28+
&& conda remove --force -yq "${CONDA_PY_PKGS}" \
29+
&& pip install -UIq pip setuptools "${CONDA_PY_PKGS}"
3030

3131
# Print Conda and Python packages information in the docker build log
3232
echo "@ Version of Conda & Python:" && conda info && conda list | grep -v "<pip>"
3333
}
3434

3535
setup_conda_with_mamba() {
36-
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.10}"
36+
VERSION_PYTHON=$1; shift 1;
37+
mamba install -y --root-prefix="${CONDA_PREFIX}" --prefix="${CONDA_PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON:-3.10}"
3838
rm -rf /opt/conda/pkgs/*
3939
setup_conda_postprocess
4040
}
@@ -59,27 +59,27 @@ setup_nvtop() {
5959
# Install Utilities `nvtop`
6060
sudo apt-get -qq update --fix-missing && sudo apt-get -qq install -y --no-install-recommends libncurses5-dev
6161

62-
DIRECTORY=`pwd`
62+
DIRECTORY=$(pwd)
6363

6464
cd /tmp \
6565
&& git clone https://github.com/Syllo/nvtop.git \
6666
&& mkdir -pv nvtop/build && cd nvtop/build \
67-
&& LIB_PATH=`find / -name "libnvidia-ml*" 2>/dev/null` \
68-
&& cmake .. -DCMAKE_LIBRARY_PATH="`dirname $LIB_PATH`" .. \
67+
&& LIB_PATH=$(find / -name "libnvidia-ml*" 2>/dev/null) \
68+
&& cmake .. -DCMAKE_LIBRARY_PATH="$(dirname ${LIB_PATH})" .. \
6969
&& make && sudo make install \
7070
&& nvtop --version
7171

72-
cd $DIRECTORY && rm -rf /tmp/nvtop
72+
cd "${DIRECTORY}" && rm -rf /tmp/nvtop
7373

7474
sudo apt-get -qq remove -y libncurses5-dev
7575
}
7676

7777

7878
setup_java_base() {
7979
VERSION_JDK=11 \
80-
&& URL_OPENJDK=`curl -sL https://jdk.java.net/archive/ | grep 'linux-x64_bin.tar' | grep -v sha256 | sed -n 's/.*href="\([^"]*\).*/\1/p' | grep "jdk${VERSION_JDK}" | head -n 1` \
80+
&& URL_OPENJDK=$(curl -sL https://jdk.java.net/archive/ | grep 'linux-x64_bin.tar' | grep -v sha256 | sed -n 's/.*href="\([^"]*\).*/\1/p' | grep "jdk${VERSION_JDK}" | head -n 1) \
8181
&& echo "Installing JDK from: ${URL_OPENJDK}" \
82-
&& install_tar_gz ${URL_OPENJDK} && mv /opt/jdk-* /opt/jdk \
82+
&& install_tar_gz "${URL_OPENJDK}" && mv /opt/jdk-* /opt/jdk \
8383
&& ln -sf /opt/jdk/bin/* /usr/bin/ \
8484
&& echo "@ Version of Java (java/javac):" && java -version && javac -version
8585
}
@@ -104,8 +104,8 @@ setup_node() {
104104
&& export PATH=/opt/node/bin:$PATH \
105105
&& npm install -g npm yarn \
106106
&& ln -sf /opt/node/bin/* /usr/bin/ \
107-
&& echo "@ Version of Node, npm, and yarn:" `node -v` `npm -v` \
108-
&& echo "@ Version of Yarn:" `yarn -v`
107+
&& echo "@ Version of Node, npm, and yarn: $(node -v) $(npm -v)" \
108+
&& echo "@ Version of Yarn: $(yarn -v)"
109109
}
110110

111111

@@ -116,7 +116,7 @@ setup_R_base() {
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);" \
118118
&& ( type java && type R && R CMD javareconf || true ) \
119-
&& echo "@ Version of R:" && R --version
119+
&& echo "@ Version of R: $(R --version)"
120120
}
121121

122122

@@ -147,7 +147,7 @@ setup_R_rstudio() {
147147
# Remove RStudio's pandoc and pandoc-proc to reduce size if they are already installed in the jpy-latex step.
148148
( which pandoc && rm /opt/rstudio-server/bin/pandoc/pandoc || true ) \
149149
&& ( which pandoc-citeproc && rm /opt/rstudio-server/bin/pandoc/pandoc-citeproc || true ) \
150-
&& echo "@ Version of rstudio-server:" && rstudio-server version
150+
&& echo "@ Version of rstudio-server: $(rstudio-server version)"
151151
}
152152

153153

@@ -168,7 +168,7 @@ setup_R_rshiny() {
168168

169169
# hack shiny-server to allow run in root user: https://github.com/rstudio/shiny-server/pull/391
170170
sed -i "s/throw new Error/logger.warn/g" /opt/shiny-server/lib/worker/app-worker.js \
171-
&& echo "@ Version of shiny-server:" && shiny-server --version
171+
&& echo "@ Version of shiny-server: $(shiny-server --version)"
172172
}
173173

174174

@@ -184,9 +184,9 @@ setup_R_datascience() {
184184
setup_GO() {
185185
GO_VERSION=$(curl -sL https://github.com/golang/go/releases.atom | grep 'releases/tag' | head -1 | grep -Po '\d[\d.]+') \
186186
&& GO_URL="https://dl.google.com/go/go$GO_VERSION.linux-$(dpkg --print-architecture).tar.gz" \
187-
&& install_tar_gz $GO_URL go \
187+
&& install_tar_gz "${GO_URL}" go \
188188
&& ln -sf /opt/go/bin/go /usr/bin/ \
189-
&& echo "@ Version of golang:" && go version
189+
&& echo "@ Version of golang: $(go version)"
190190
}
191191

192192

@@ -198,7 +198,7 @@ setup_julia() {
198198
&& mkdir -p /opt/julia/pkg \
199199
&& echo "import Libdl; push!(Libdl.DL_LOAD_PATH, \"/opt/conda/lib\")" >> /opt/julia/etc/julia/startup.jl \
200200
&& echo "DEPOT_PATH[1]=\"/opt/julia/pkg\"" >> /opt/julia/etc/julia/startup.jl \
201-
&& echo "@ Version of Julia" && julia --version
201+
&& echo "@ Version of Julia: $(julia --version)"
202202
}
203203

204204

@@ -215,15 +215,14 @@ setup_octave() {
215215

216216
install_apt /opt/utils/install_list_octave.apt \
217217
&& install_octave /opt/utils/install_list_octave.pkg \
218-
&& echo "@ Version of Octave and installed packages:" \
219-
&& /opt/octave/bin/octave --version
218+
&& echo "@ Version of Octave and installed packages: $(/opt/octave/bin/octave --version)"
220219
}
221220

222221

223222
setup_traefik() {
224223
TRAEFIK_VERSION=$(curl -sL https://github.com/traefik/traefik/releases.atom | grep 'releases/tag' | head -1 | grep -Po '\d[\d.]+') \
225224
&& TRAEFIK_URL="https://github.com/traefik/traefik/releases/download/v${TRAEFIK_VERSION}/traefik_v${TRAEFIK_VERSION}_linux_$(dpkg --print-architecture).tar.gz" \
226-
&& install_tar_gz $TRAEFIK_URL traefik \
225+
&& install_tar_gz "${TRAEFIK_URL}" traefik \
227226
&& ln -sf /opt/traefik /usr/bin/ \
228-
&& echo "@ Version of traefik:" && traefik version
227+
&& echo "@ Version of traefik: $(traefik version)"
229228
}

‎docker_atom/work/script-utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ install_conda() { cat $1 | cut -d "%" -f 1 | sed '/^$/d' | xargs -r -n1 conda
1111
install_mamba() { cat $1 | cut -d "%" -f 1 | sed '/^$/d' | xargs -r -n1 mamba install -yq --root-prefix="${CONDA_PREFIX}" --prefix="${CONDA_PREFIX}" ; }
1212

1313
# function to install python packages with pip from a text file which lists package names (add comments with % char)
14-
install_pip() { cat $1 | cut -d "%" -f 1 | sed '/^$/d' | xargs -r -n1 pip install -U --pre ; }
14+
install_pip() { cat $1 | cut -d "%" -f 1 | sed '/^$/d' | xargs -r -n1 pip install -U --root-user-action=ignore --pre ; }
1515

1616
# function to install R packages from a text file which lists package names (add comments with % char, use quiet=T to be less verbose)
1717
install_R() { R -e "options(Ncpus=4);lapply(scan('$1','c',comment.char='%'),function(x){cat(x,system.time(install.packages(x,clean=T,quiet=T)),'\n')})"; }

‎docker_core/work/install_list_PY_datascience.pip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ sortedcontainers sortedcollections % Enhanced Data Structur
77
lxml beautifulsoup4 pyquery numpydoc sphinx % Parse/Build documents
88
pandas pyarrow xlrd openpyxl beautifulsoup4 % Data preparation
99
patsy statsmodels sympy pywavelets numexpr pycrypto % Statistics, Maths, and related Utilities
10-
scikit-learn scipy mlflow % Statistical ML, Data Mining
10+
scikit-learn scipy % Statistical ML, Data Mining
1111
bokeh seaborn altair vincent % Data visualization

‎docker_dev/work/script-extend.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ setup_jupyter_base() {
55
pip install -Uq jupyterhub jupyterlab notebook ipywidgets qpod_hub "mistune>=0.8.1,<2" \
66
&& jupyter nbextension enable --py widgetsnbextension \
77
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager \
8-
&& echo "@ Version of Jupyter Notebook/JupyterLab:" \
9-
`jupyter notebook --version` `jupyter lab --version`
8+
&& echo "@ Version of Jupyter Notebook/JupyterLab: $(jupyter notebook --version)" \
9+
&& echo "@ Version of Jupyter Notebook/JupyterLab: $(jupyter lab --version)"
1010
}
1111

1212

@@ -74,7 +74,7 @@ setup_vscode_base() {
7474
&& install_tar_gz "https://github.com/cdr/code-server/releases/download/v${VERSION_CODER}/code-server-${VERSION_CODER}-linux-amd64.tar.gz" \
7575
&& mv /opt/code-server* /opt/code-server \
7676
&& ln -s /opt/code-server/bin/code-server /usr/bin/ \
77-
&& printf "#!/bin/bash\n/opt/code-server/bin/code-server --port=8888 --auth=none --disable-telemetry $HOME\n" > /usr/local/bin/start-code-server.sh \
77+
&& printf "#!/bin/bash\n/opt/code-server/bin/code-server --port=8888 --auth=none --disable-telemetry ${HOME}\n" > /usr/local/bin/start-code-server.sh \
7878
&& chmod u+x /usr/local/bin/start-code-server.sh \
79-
&& echo "@ coder-server Version:" && code-server -v
79+
&& echo "@ coder-server Version: $(code-server -v)"
8080
}

0 commit comments

Comments
 (0)