Skip to content

Commit 720380d

Browse files
hephaexhephaex
committed
solve conflict library with tensorboard 2.x
1 parent 225f681 commit 720380d

File tree

2 files changed

+79
-55
lines changed

2 files changed

+79
-55
lines changed

‎python-tensorflow/Dockerfile.2.1-py36-cuda10.1

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lablup/common-base:20.06-py36-cuda10.1
1+
FROM lablup/common-base:20.07-py36-cuda10.1
22

33
# Install TensorFlow, Keras, PyTorch and MXNet
44
ENV TENSORFLOW_VERSION=2.1.1
@@ -11,43 +11,51 @@ ENV PYTHONUNBUFFERED=1 \
1111
# Set default shell to /bin/bash
1212
SHELL ["/bin/bash", "-cu"]
1313

14-
RUN python3 -m pip install pip --no-cache-dir --upgrade \
14+
RUN python3 -m pip install --no-cache-dir --upgrade \
15+
gast==0.2.2 \
16+
'httplib2<0.18.0,>=0.8' \
17+
'coverage<5.0,>=4.5' \
18+
'mock<4.0,>=3.0' \
19+
tensorflow==${TENSORFLOW_VERSION} \
20+
tensorboard==2.1.1
21+
22+
RUN python3 -m pip install --no-cache-dir --upgrade \
23+
-q git+https://github.com/google-research/tensorflow_constrained_optimization
24+
RUN python3 -m pip install --no-cache-dir --upgrade \
25+
-q git+https://github.com/tensorflow/fairness-indicators
26+
RUN python3 -m pip install --no-cache-dir \
27+
cachetools==3.1.0 \
1528
tensorflow-transform==0.21.2 \
1629
tensorflow_model_analysis==0.21.6 \
17-
ngraph-tensorflow-bridge \
18-
adanet==0.8.0
19-
20-
RUN python3 -m pip install pip --no-cache-dir --upgrade \
21-
tensorflow-gpu==${TENSORFLOW_VERSION} \
22-
tensorboard==2.1.1 \
30+
ngraph-tensorflow-bridge==0.18.0 \
2331
tensorflow-metadata==0.21.1 \
2432
tensorflow-datasets==2.1.0 \
25-
tensorflow_probability==0.9.0 \
33+
tensorflow_probability \
2634
tensorflow-addons==0.8.3 \
2735
neural-structured-learning \
28-
tensorflow-model-optimization==0.2.1 \
29-
tensorflow-hub==0.7.0 \
30-
tensorflow_text==2.1.1 \
36+
tensorflow-model-optimization
37+
RUN python3 -m pip install --no-cache-dir \
38+
tfx==0.22.0 \
39+
tfx-bsl==0.22.0 \
40+
tf-agents==0.5.0
41+
RUN python3 -m pip install --no-cache-dir \
42+
tensorflow_constrained_optimization \
43+
tensorflow-hub==0.8.0 \
44+
tensorflow_text==2.2.1 \
3145
tensorflow-graphics-gpu==1.0.0 \
3246
tensorflow-gan==2.0.0 \
33-
tensorflow_text==2.1.1 \
34-
tensorflow-data-validation==0.21.5 \
35-
fairness-indicators==0.1.2 \
36-
tensorboard-plugin-fairness-indicators==0.0.3 \
37-
fairness==0.1.8 \
38-
tfx==0.21.2 \
39-
tfx-bsl==0.21.4 \
40-
tf-agents==0.3.0 \
41-
tensorflow-lattice-gpu==0.9.8 \
42-
tensorflow-lattice==2.0.3 \
43-
tensorflow_ranking==0.2.3 \
44-
tensorflow-compression==1.3 \
45-
tensor2tensor==1.15.4 \
46-
mesh-tensorflow \
47-
tensorflow-io==0.12.0 \
47+
tensorflow-data-validation==0.22.0
48+
RUN python3 -m pip install --no-cache-dir \
4849
jupyter-tensorboard==0.2.0 \
49-
tensorwatch==0.8.10 \
50-
jupyterlab-nvdashboard==0.2.0
50+
tensorflow-plot==0.3.2 \
51+
tensorflow-lattice==2.0.5 \
52+
tensorflow_ranking==0.3.1 \
53+
tensorflow-compression==1.3 \
54+
tensor2tensor \
55+
mesh-tensorflow==0.1.13 \
56+
tensorwatch==0.9.1 \
57+
tensorflow-io==0.13.0 \
58+
jupyterlab-nvdashboard==0.3.1
5159

5260
# Install Horovod, temporarily using CUDA stubs
5361
RUN ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
@@ -58,12 +66,16 @@ RUN ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
5866

5967
RUN python3 -m pip install --no-cache-dir \
6068
mpi4py==3.0.3 \
61-
nni
69+
nni==1.6 \
70+
scikit-nni==0.2.1
6271

6372
# Install ipython kernelspec
6473
Run python3 -m ipykernel install --display-name "TensorFlow 2.1 on Python 3.6 (CUDA 10.1)" && \
6574
cat /usr/local/share/jupyter/kernels/python3/kernel.json
6675

76+
RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension && \
77+
jupyter nbextension enable --py tensorflow_model_analysis
78+
6779
# Backend.AI specifics
6880
LABEL ai.backend.kernelspec="1" \
6981
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \

‎python-tensorflow/Dockerfile.2.2-py36-cuda10.1

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lablup/common-base:20.06-py36-cuda10.1
1+
FROM lablup/common-base:20.07-py36-cuda10.1
22

33
# Install TensorFlow, Keras, PyTorch and MXNet
44
ENV TENSORFLOW_VERSION=2.2.0
@@ -11,41 +11,50 @@ ENV PYTHONUNBUFFERED=1 \
1111
# Set default shell to /bin/bash
1212
SHELL ["/bin/bash", "-cu"]
1313

14-
RUN python3 -m pip install pip --no-cache-dir --upgrade \
15-
tensorflow-transform==0.21.2 \
16-
tensorflow_model_analysis==0.21.6 \
17-
ngraph-tensorflow-bridge==0.18.0 \
18-
adanet==0.8.0
14+
RUN python3 -m pip install --no-cache-dir --upgrade \
15+
gast==0.2.2 \
16+
'httplib2<0.18.0,>=0.8' \
17+
'coverage<5.0,>=4.5' \
18+
'mock<4.0,>=3.0' \
19+
tensorflow==${TENSORFLOW_VERSION} \
20+
tensorboard==2.2.2
1921

20-
RUN python3 -m pip install pip --no-cache-dir --upgrade \
21-
tensorflow-gpu==${TENSORFLOW_VERSION} \
22-
tensorboard==2.2.2 \
23-
tensorflow-metadata==0.21.1 \
22+
RUN python3 -m pip install --no-cache-dir --upgrade \
23+
-q git+https://github.com/google-research/tensorflow_constrained_optimization
24+
RUN python3 -m pip install --no-cache-dir --upgrade \
25+
-q git+https://github.com/tensorflow/fairness-indicators
26+
RUN python3 -m pip install --no-cache-dir \
27+
cachetools==3.1.0 \
28+
tensorflow-transform==0.22.0 \
29+
tensorflow_model_analysis==0.22.2 \
30+
ngraph-tensorflow-bridge==0.18.0 \
31+
tensorflow-metadata==0.22.2 \
2432
tensorflow-datasets==3.1.0 \
25-
tensorflow_probability==0.7.0 \
33+
tensorflow_probability \
2634
tensorflow-addons==0.10.0 \
2735
neural-structured-learning==1.1.0 \
28-
tensorflow-model-optimization==0.3.0 \
36+
tensorflow-model-optimization==0.3.0
37+
RUN python3 -m pip install --no-cache-dir \
38+
tfx==0.22.0 \
39+
tfx-bsl==0.22.0 \
40+
tf-agents==0.5.0
41+
RUN python3 -m pip install --no-cache-dir \
42+
tensorflow_constrained_optimization \
2943
tensorflow-hub==0.8.0 \
44+
tensorflow_text==2.2.1 \
3045
tensorflow-graphics-gpu==1.0.0 \
3146
tensorflow-gan==2.0.0 \
32-
tensorflow_text==2.2.1 \
33-
tensorflow-data-validation==0.21.5 \
34-
fairness-indicators==0.1.2 \
35-
tensorboard-plugin-fairness-indicators==0.0.5 \
36-
fairness==0.1.8 \
37-
tfx==0.21.4 \
38-
tfx-bsl==0.22.0 \
39-
tf-agents==0.5.0 \
40-
tensorflow-lattice-gpu==0.9.8 \
41-
tensorflow-lattice==2.0.4 \
47+
tensorflow-data-validation==0.22.0
48+
RUN python3 -m pip install --no-cache-dir \
49+
jupyter-tensorboard==0.2.0 \
50+
tensorflow-plot==0.3.2 \
51+
tensorflow-lattice==2.0.5 \
4252
tensorflow_ranking==0.3.1 \
4353
tensorflow-compression==1.3 \
44-
tensor2tensor==1.15.6 \
54+
tensor2tensor \
4555
mesh-tensorflow==0.1.13 \
46-
tensorflow-io==0.13.0 \
47-
jupyter-tensorboard==0.2.0 \
4856
tensorwatch==0.9.1 \
57+
tensorflow-io==0.13.0 \
4958
jupyterlab-nvdashboard==0.3.1
5059

5160
# Install Horovod, temporarily using CUDA stubs
@@ -64,6 +73,9 @@ RUN python3 -m pip install --no-cache-dir \
6473
Run python3 -m ipykernel install --display-name "TensorFlow 2.2 on Python 3.6 (CUDA 10.1)" && \
6574
cat /usr/local/share/jupyter/kernels/python3/kernel.json
6675

76+
RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension && \
77+
jupyter nbextension enable --py tensorflow_model_analysis
78+
6779
# Backend.AI specifics
6880
LABEL ai.backend.kernelspec="1" \
6981
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \

0 commit comments

Comments
 (0)