Commit 1164d8d3 authored by Hou Junjie's avatar Hou Junjie 🐣

Merge branch 'master' into 'master'

use configurated dali version

See merge request !16
parents c75bbe85 179e981b
Pipeline #9570 passed with stage
in 9 seconds
......@@ -5,3 +5,6 @@ tag: cuda100
cuda:
version: '10.0'
short_name: cu100
dali:
version: '10.0'
......@@ -5,3 +5,6 @@ tag: cuda102
cuda:
version: '10.2'
short_name: cu102
dali:
version: '10.0'
......@@ -5,7 +5,7 @@
# caffe {{env.Getenv "VERSION"}} (git)
# ==================================================================
FROM ava-root:{{ (ds "arch").tag }}
FROM atom-root:{{ (ds "arch").tag }}
# ==================================================================
# opencv
......
......@@ -4,7 +4,7 @@
# mxnet {{env.Getenv "VERSION"}} (pip)
# ==================================================================
FROM ava-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
FROM atom-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
{{ if eq .Env.PY "2" }}
RUN pip2 --no-cache-dir install --upgrade --index-url {{ (ds "conf").pip.reg }} \
......
......@@ -5,16 +5,16 @@
# tensorboardX TensroBoard Log Generation
# ==================================================================
FROM ava-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
FROM atom-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
{{ if eq .Env.PY "2" }}
RUN pip2 install --upgrade torch=={{ .Env.VERSION }} torchvision tensorboardx --index-url {{ (ds "conf").pip.reg }}
{{ if ne (ds "arch").tag "cpu"}}
RUN pip2 install --index-url {{ (ds "conf").pip.reg }} --extra-index-url https://developer.download.nvidia.com/compute/redist/cuda/{{ (ds "arch").cuda.version }} nvidia-dali
RUN pip2 install --index-url {{ (ds "conf").pip.reg }} --extra-index-url https://developer.download.nvidia.com/compute/redist/cuda/{{ (ds "arch").dali.version }} nvidia-dali
{{ end }}
{{ else if eq .Env.PY "3" }}
RUN pip3 install --upgrade torch=={{ .Env.VERSION }} torchvision tensorboardx --index-url {{ (ds "conf").pip.reg }}
{{ if ne (ds "arch").tag "cpu"}}
RUN pip3 install --index-url {{ (ds "conf").pip.reg }} --extra-index-url https://developer.download.nvidia.com/compute/redist/cuda/{{ (ds "arch").cuda.version }} nvidia-dali
RUN pip3 install --index-url {{ (ds "conf").pip.reg }} --extra-index-url https://developer.download.nvidia.com/compute/redist/cuda/{{ (ds "arch").dali.version }} nvidia-dali
{{ end }}
{{ end }}
......@@ -23,11 +23,7 @@ RUN sed -i s/archive.ubuntu.com/{{(ds "conf").apt.reg}}/g /etc/apt/sources.list
openssh-server \
tmux \
tzdata \
{{ if eq .Env.PY "2" }}
python-dev \
{{ else if eq .Env.PY "3" }}
python3-dev \
{{ end }}
{{ if eq .Env.PY "2" }} python-dev {{ else if eq .Env.PY "3" }} python3-dev {{ end }} \
&& \
ldconfig && \
apt-get clean && \
......
......@@ -4,7 +4,7 @@
# tensorflow {{env.Getenv "VERSION"}} (pip)
# ==================================================================
FROM ava-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
FROM atom-root:{{ (ds "arch").tag }}-py{{ .Env.PY }}
{{ if eq .Env.PY "2" }}
RUN pip2 --no-cache-dir install --upgrade --index-url {{ (ds "conf").pip.reg }} \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment