Skip to content

Commit e098add

Browse files
committed
Update package versions, small enhancements
1 parent 771a657 commit e098add

7 files changed

+47
-45
lines changed

build.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ cd src
77
echo -e "\nBuilding images\n"
88

99
docker build . -f base.Dockerfile -t nvaitc/ai-lab:$TAG-base
10-
docker build . -f tf.Dockerfile -t nvaitc/ai-lab:$TAG-tf
10+
#docker build . -f tf.Dockerfile -t nvaitc/ai-lab:$TAG-tf
1111
docker build . -f tf2.Dockerfile -t nvaitc/ai-lab:$TAG-tf2
1212
docker build . -f full.Dockerfile -t nvaitc/ai-lab:$TAG
1313
docker build . -f vnc.Dockerfile -t nvaitc/ai-lab:$TAG-vnc
1414

1515
docker build . -f base.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG-base
16-
docker build . -f tf.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG-tf
16+
#docker build . -f tf.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG-tf
1717
docker build . -f tf2.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG-tf2
1818
docker build . -f full.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG
1919
docker build . -f vnc.Dockerfile -t nvcr.io/nvidian/sae/ai-lab:$TAG-vnc
2020

2121
echo -e "\nPushing images\n"
2222

2323
docker push nvaitc/ai-lab:$TAG-base
24-
docker push nvaitc/ai-lab:$TAG-tf
24+
#docker push nvaitc/ai-lab:$TAG-tf
2525
docker push nvaitc/ai-lab:$TAG-tf2
2626
docker push nvaitc/ai-lab:$TAG
2727
docker push nvaitc/ai-lab:$TAG-vnc
2828

2929
docker push nvcr.io/nvidian/sae/ai-lab:$TAG-base
30-
docker push nvcr.io/nvidian/sae/ai-lab:$TAG-tf
30+
#docker push nvcr.io/nvidian/sae/ai-lab:$TAG-tf
3131
docker push nvcr.io/nvidian/sae/ai-lab:$TAG-tf2
3232
docker push nvcr.io/nvidian/sae/ai-lab:$TAG
3333
docker push nvcr.io/nvidian/sae/ai-lab:$TAG-vnc

src/base-batch.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ RUN cd /tmp/ && \
117117
conda install --quiet --yes \
118118
-c nvidia -c numba -c pytorch -c conda-forge -c rapidsai -c defaults \
119119
'python=3.6' \
120-
'numpy=1.16.1' \
120+
'numpy' \
121121
'pandas' \
122122
'cudatoolkit=10.1' \
123123
'pytorch' \
@@ -187,7 +187,7 @@ RUN conda install \
187187
-c rapidsai/label/cuda10.1 \
188188
-c numba -c conda-forge -c defaults \
189189
'python=3.6' \
190-
'numpy=1.16.1' \
190+
'numpy' \
191191
'dask' \
192192
'cudf' \
193193
'cuml' \

src/base.Dockerfile

+22-14
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,25 @@ RUN cd /tmp/ && \
122122
conda install --quiet --yes \
123123
-c nvidia -c numba -c pytorch -c conda-forge -c rapidsai -c defaults \
124124
'python=3.6' \
125-
'numpy=1.16.1' \
125+
'numpy' \
126126
'pandas' \
127127
'cudatoolkit=10.1' \
128128
'tk' \
129129
'tini' \
130130
'blas=*=openblas' && \
131131
conda install --quiet --yes \
132-
'notebook=5.7.*' \
132+
'notebook=6.0.*' \
133133
'jupyterhub=1.0.*' \
134134
'jupyterlab=1.*' \
135135
'widgetsnbextension' \
136136
'jupyter_contrib_nbextensions' \
137137
'ipywidgets=7.5.*' && \
138138
pip install --no-cache-dir -r $HOME/requirements.txt && \
139139
rm $HOME/requirements.txt && \
140+
git clone --depth 1 https://github.com/huggingface/neuralcoref && \
141+
cd neuralcoref && \
142+
pip install --no-cache-dir -r requirements.txt && \
143+
pip install --no-cache-dir . && \
140144
cd $HOME && \
141145
pip uninstall opencv-python opencv-contrib-python -y && \
142146
pip install --no-cache-dir opencv-contrib-python && \
@@ -145,22 +149,25 @@ RUN cd /tmp/ && \
145149
jupyter notebook --generate-config && \
146150
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
147151
jupyter contrib nbextension install --sys-prefix && \
152+
echo "Installing System Monitor" && \
153+
pip --no-cache-dir install nbresuse && \
154+
jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor && \
148155
echo "Installing @jupyter-widgets/jupyterlab-manager" && \
149-
jupyter labextension install @jupyter-widgets/jupyterlab-manager && \
156+
jupyter labextension install @jupyter-widgets/jupyterlab-manager && \
150157
echo "Installing @jupyterlab/toc" && \
151-
jupyter labextension install @jupyterlab/toc && \
158+
jupyter labextension install @jupyterlab/toc && \
152159
echo "Installing @jupyterlab/git" && \
153-
jupyter labextension install @jupyterlab/git && \
154-
pip install --no-cache-dir --upgrade jupyterlab-git && \
155-
jupyter serverextension enable --py --sys-prefix jupyterlab_git && \
160+
jupyter labextension install @jupyterlab/git && \
161+
pip install --no-cache-dir --upgrade jupyterlab-git && \
162+
jupyter serverextension enable --py --sys-prefix jupyterlab_git && \
156163
jupyter labextension install jupyterlab_bokeh && \
157164
echo "Installing jupyterlab-server-proxy" && \
158-
cd /tmp/ && \
159-
git clone --depth 1 https://github.com/qrtt1/jupyter_tensorboard && \
160-
git clone --depth 1 https://github.com/jupyterhub/jupyter-server-proxy && \
161-
cd /tmp/jupyter-server-proxy/jupyterlab-server-proxy && \
162-
npm install && npm run build && jupyter labextension link . && \
163-
npm run build && jupyter lab build && \
165+
cd /tmp/ && \
166+
git clone --depth 1 https://github.com/qrtt1/jupyter_tensorboard && \
167+
git clone --depth 1 https://github.com/jupyterhub/jupyter-server-proxy && \
168+
cd /tmp/jupyter-server-proxy/jupyterlab-server-proxy && \
169+
npm install && npm run build && jupyter labextension link . && \
170+
npm run build && jupyter lab build && \
164171
cd /tmp/jupyter_tensorboard && \
165172
pip --no-cache-dir install . && \
166173
jupyter labextension install jupyterlab_tensorboard && \
@@ -227,7 +234,8 @@ COPY ld.so.conf /etc/
227234
ENV NB_PASSWD="" \
228235
SUDO_PASSWD=volta
229236

230-
RUN mkdir /results/ && \
237+
RUN ldconfig && \
238+
mkdir /results/ && \
231239
chmod -R 777 /results/ && \
232240
echo "${SUDO_PASSWD}\n${SUDO_PASSWD}\n" | (passwd $NB_USER)
233241

src/batch-tf2.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ USER root
1212
ENV DEBIAN_FRONTEND=noninteractive \
1313
TF_FORCE_GPU_ALLOW_GROWTH=true
1414

15-
ENV TENSORFLOW_URL=https://github.com/tlkh/getcuda/releases/download/0c/tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl \
16-
TENSORFLOW_FILENAME=tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl
15+
ENV TENSORFLOW_URL=https://github.com/tlkh/getcuda/releases/download/0e/tensorflow-2.1.0-cp36-cp36m-linux_x86_64.whl \
16+
TENSORFLOW_FILENAME=tensorflow-2.1.0-cp36-cp36m-linux_x86_64.whl
1717

1818
RUN cd /tmp/ && \
1919
wget -O ${TENSORFLOW_FILENAME} ${TENSORFLOW_URL} && \

src/full.Dockerfile

+5-13
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ USER $NB_UID
1414

1515
RUN conda install -c pytorch --quiet --yes \
1616
'python=3.6' \
17-
'numpy=1.16.1' \
1817
'pytorch' \
1918
'torchvision' \
2019
'cudatoolkit=10.1' && \
2120
pip install --no-cache-dir torchtext && \
2221
conda install -c pytorch -c fastai --quiet --yes \
2322
'python=3.6' \
24-
'numpy=1.16.1' \
2523
'fastai' \
2624
'dataclasses' && \
2725
pip uninstall pillow -y && \
@@ -75,19 +73,12 @@ RUN apt-get update && \
7573
USER $NB_UID
7674

7775
RUN conda install \
78-
-c nvidia/label/cuda10.1 \
79-
-c rapidsai/label/cuda10.1 \
76+
-c nvidia \
77+
-c rapidsai \
8078
-c numba -c conda-forge -c defaults \
8179
'python=3.6' \
82-
'numpy=1.16.1' \
83-
'dask' \
84-
'cudf' \
85-
'cuml' \
86-
'cugraph' \
87-
'dask-cuda' \
88-
'dask-cudf' \
89-
'dask-cuml' \
90-
'nvstrings' && \
80+
'rapids=0.11' \
81+
'cudatoolkit=10.1' && \
9182
conda install \
9283
-c rapidsai/label/xgboost \
9384
'xgboost' \
@@ -122,6 +113,7 @@ RUN apt-get update && \
122113
cuda-libraries-dev-$CUDA_PKG_VERSION \
123114
cuda-minimal-build-$CUDA_PKG_VERSION \
124115
libnccl-dev=$NCCL_VERSION-1+cuda10.1 && \
116+
pip uninstall horovod -y && \
125117
pip install --no-cache-dir horovod && \
126118
apt-get remove -yq \
127119
cuda-nvml-dev-$CUDA_PKG_VERSION \

src/tf2.Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ RUN apt-get update && \
3030

3131
USER $NB_UID
3232

33-
ENV TENSORFLOW_URL=https://github.com/tlkh/getcuda/releases/download/0c/tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl \
34-
TENSORFLOW_FILENAME=tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl
33+
ENV TENSORFLOW_URL=https://github.com/tlkh/getcuda/releases/download/0e/tensorflow-2.1.0-cp36-cp36m-linux_x86_64.whl \
34+
TENSORFLOW_FILENAME=tensorflow-2.1.0-cp36-cp36m-linux_x86_64.whl
3535

3636
RUN cd $HOME/ && \
3737
conda install -c pytorch --quiet --yes \
3838
'python=3.6' \
39-
'numpy=1.16.1' \
4039
'pytorch' \
4140
'cudatoolkit=10.1' && \
4241
echo -c "Downloading ${TENSORFLOW_FILENAME} from ${TENSORFLOW_URL}" && \

src/vnc.Dockerfile

+10-7
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ RUN apt-get update && \
5252
xkb-data \
5353
x11proto-gl-dev \
5454
# install Nsight profiling tools
55+
libqt5x11extras5 \
5556
openjdk-8-jre \
5657
cuda-visual-tools-10-0 \
5758
cuda-nsight-systems-10-1 \
@@ -95,12 +96,12 @@ RUN apt-get update && \
9596
add-apt-repository ppa:ubuntu-desktop/ubuntu-make -y && \
9697
apt-get update && \
9798
apt-get install --no-upgrade -yq \
98-
xvfb libosmesa6-dev mesa-utils \
99+
xvfb libosmesa6-dev mesa-utils libgles2-mesa \
99100
mesa-common-dev libgl1-mesa-dev freeglut3-dev libglu1-mesa-dev \
100101
novnc supervisor xinit ubuntu-make \
101102
xubuntu-desktop idle3 && \
102103
apt-get purge -yq \
103-
libreoffice* thunderbird* pidgin* sgt-puzzles* \
104+
libreoffice* thunderbird* pidgin* sgt-puzzles* xscreensaver \
104105
gnome* blueman* bluez* unity* cups* totem* xfce4-dict* \
105106
empathy* evolution* rhythmbox* shotwell* xfburn* \
106107
account-plugin-* example-content* duplicity* \
@@ -135,14 +136,16 @@ WORKDIR /home/$NB_USER
135136
USER $NB_USER
136137

137138
RUN pip install --no-cache-dir \
138-
keras-rl pyopengl \
139-
gym[atari] ray[rllib] roboschool \
139+
pyopengl gym[atari] \
140140
jupyter-vscode-server jedi pysc2 \
141-
python-language-server[yapf] \
142-
setuptools wheel && \
141+
python-language-server[yapf] && \
143142
pip uninstall opencv-python opencv-python-headless opencv-contrib-python -y && \
144143
pip install --no-cache-dir opencv-contrib-python -U && \
145-
rm -rf /tmp/* && \
144+
cd /tmp/ && \
145+
git clone --depth 1 https://github.com/tlkh/keras-rl2.git && \
146+
cd keras-rl2 && \
147+
pip install --no-cache-dir . && \
148+
rm -rf /tmp/* && cd && \
146149
rm -rf $HOME/.cache && \
147150
rm -rf $HOME/.node-gyp && \
148151
fix-permissions $CONDA_DIR && \

0 commit comments

Comments
 (0)