Skip to content

Commit ff29e1c

Browse files
hephaexhephaex
committed
Merge branch '20.12' of https://github.com/lablup/backend.ai-kernels into 20.12
2 parents 2ea97e2 + ba94cf1 commit ff29e1c

File tree

3 files changed

+80
-34
lines changed

3 files changed

+80
-34
lines changed

‎commons/Dockerfile.base.19.08-py37-cuda10

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
# base python 3.7
88
FROM lablup/common-base:python3.7 as python-binary
99

10-
FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04
10+
FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
1111
MAINTAINER Mario Cho "[email protected]"
1212

13-
ENV CUDA_VERSION 10.1.168
13+
ENV CUDA_VERSION 10.0.130
1414
ENV CUDA_PKG_VERSION 10-1=$CUDA_VERSION-1
15-
ENV CUDNN_VERSION 7.6.2.24
16-
ENV NCCL_VERSION 2.4.7
15+
ENV CUDNN_VERSION 7.6.4.38
16+
ENV NCCL_VERSION 2.4.8
1717

1818
RUN apt-get update -y && \
1919
apt-mark unhold libnccl2 && \
@@ -39,7 +39,7 @@ ENV PYTHONUNBUFFERED=1 \
3939
LANG=C.UTF-8
4040

4141
# Install CUDA-10.1 + cuDNN 7.6.0
42-
RUN ln -s /usr/local/cuda-10.1 /usr/local/cuda && \
42+
RUN ln -s /usr/local/cuda-10.0 /usr/local/cuda && \
4343
ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so.7.6.0 /usr/local/cuda/lib64/libcudnn.so && \
4444
ldconfig
4545

‎vendor/ngc-tensorflow/Dockerfile.20.12-tf1-py3

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ FROM nvcr.io/nvidia/tensorflow:20.12-tf1-py3
22
# NVIDIA DIGITS runs on Python 3.6
33

44
RUN apt-get update && \
5-
apt-get install -y libsm6 libxext6 libxrender-dev mercurial
6-
5+
apt-get install -y libsm6 libxext6 libxrender-dev mercurial libgdal-dev python3-gdal \
6+
libsdl-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev \
7+
libsmpeg-dev libportmidi-dev libavformat-dev libswscale-dev
8+
9+
ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
10+
ENV C_INCLUDE_PATH=/usr/include/gdal
711
ENV DEBIAN_FRONTEND=noninteractive \
812
MPLBACKEND=Svg \
913
PYTHONUNBUFFERED=1 \
@@ -123,16 +127,27 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
123127
apt-get install -y nodejs
124128

125129
WORKDIR /tmp
126-
RUN git clone -q --branch=master git://github.com/xianyi/OpenBLAS.git && \
130+
RUN git clone -q --branch=v0.3.13 git://github.com/xianyi/OpenBLAS.git && \
127131
cd OpenBLAS && \
128132
make DYNAMIC_ARCH=1 NO_AFFINITY=1 NUM_THREADS=48 FC=gfortran && \
129133
make install
130134
RUN git clone --recursive https://github.com/bodono/scs-python.git && \
131135
cd /tmp/scs-python && \
132136
python setup.py install --scs --gpu
137+
RUN mkdir -p /opt/oracle && \
138+
cd /opt/oracle && \
139+
apt-get clean && \
140+
rm -rf /var/lib/apt/lists/* && \
141+
apt-get update -y && \
142+
apt-get install -y --no-install-recommends libaio1 default-libmysqlclient-dev && \
143+
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip && \
144+
unzip instantclient-basiclite-linuxx64.zip && \
145+
rm -f instantclient-basiclite-linuxx64.zip && \
146+
cd /opt/oracle/instantclient* && \
147+
rm -f *jdbc* *occi* *mysql* *README *jar uidrvci genezi adrci && \
148+
echo /opt/oracle/instantclient* > /etc/ld.so.conf.d/oracle-instantclient.conf && \
149+
ldconfig
133150

134-
COPY ./numpy-1.19.4-cp36-cp36m-manylinux2010_x86_64.whl /tmp
135-
COPY ./pandas-1.0.4+4.g29edbab4a-cp36-cp36m-linux_x86_64.whl /tmp
136151
RUN python3 -m pip install --no-cache-dir \
137152
Cython==0.29.21 \
138153
tornado==6.0.4 \
@@ -141,6 +156,12 @@ RUN python3 -m pip install --no-cache-dir \
141156
jupyter==1.0.0 \
142157
python-language-server[all] \
143158
matplotlib==3.3.3
159+
ENV NUMPY_VERSION 1.19.4
160+
RUN git clone --branch=v${NUMPY_VERSION} --depth=1 https://github.com/numpy/numpy.git numpy && \
161+
cd numpy && \
162+
git checkout -b v${NUMPY_VERSION} && \
163+
cp site.cfg.example site.cfg && \
164+
python3 setup.py bdist_wheel -d /tmp
144165
ENV SCIPY_VERSION 1.5.4
145166
# Install scipy
146167
RUN cd /tmp && \
@@ -149,16 +170,14 @@ RUN cd /tmp && \
149170
git checkout -b v${SCIPY_VERSION} && \
150171
cp site.cfg.example site.cfg && \
151172
python3 -m pip install -U --no-cache-dir \
152-
/tmp/numpy-1.19.4-cp36-cp36m-manylinux2010_x86_64.whl \
153-
/tmp/pandas-1.0.4+4.g29edbab4a-cp36-cp36m-linux_x86_64.whl \
173+
/tmp/numpy-1.19.4-cp38-cp38-linux_x86_64.whl \
174+
pandas==1.2.0 \
154175
&& \
155176
python3 setup.py install
156177

157178
WORKDIR /tmp
158179
COPY ./requirements.txt /tmp
159180
RUN python3 -m pip install --no-cache-dir -r requirements.txt && \
160-
python3 -m pip install --no-cache-dir tensorflow_model_analysis && \
161-
python3 -m pip install --no-cache-dir -I sklearn && \
162181
rm -f /tmp/*.whl /tmp/requirements.txt
163182

164183
# install git-lfs

‎vendor/ngc-tensorflow/requirements.txt

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
absl-py==0.8.0
1+
absl-py==0.9.0
22
aiohttp==3.6.2
33
aiozmq==0.9.0
4-
adanet==0.8.0
4+
adanet==0.5.0
5+
apache-beam==2.24.0
6+
apache-beam[gcp]==2.24.0
57
appdirs==1.4.3
68
astor==0.8.1
7-
astroid==2.3.3
9+
astroid==2.3.0
810
async-timeout==3.0.1
911
atlas==0.27.0
1012
atomicwrites==1.3.0
@@ -23,8 +25,8 @@ boto==2.49.0
2325
boto3==1.9.209
2426
botocore==1.12.209
2527
branca==0.4.0
26-
cachetools==4.0.0
27-
catboost==0.22
28+
cachetools==3.1.1
29+
#catboost==0.19.1
2830
category-encoders==2.0.0
2931
certifi==2019.11.28
3032
cffi==1.14.0
@@ -43,20 +45,26 @@ cvxpy==1.0.24
4345
cycler==0.10.0
4446
Cython==0.29.13
4547
dask==2.9.0
46-
dataclasses==0.7
48+
#dataclasses==0.8
4749
deap==1.3.1
4850
decorator==4.4.2
51+
deepmerge==0.1.0
4952
defusedxml==0.6.0
5053
descartes==1.1.0
5154
dill==0.3.1.1
5255
distributed==2.11.0
56+
docopt==0.6.0
57+
dopamine_rl==3.0.1
5358
docutils==0.15.2
5459
dtreeviz==0.8.1
5560
EasyProcess==0.3
5661
ecos==2.0.7.post1
5762
elegy==0.1.5
5863
entrypoints==0.3
5964
ephem==3.7.6.0
65+
enum34==1.1.8
66+
fasteners==0.15
67+
fastavro==0.21.4
6068
fastrlock==0.4
6169
fbprophet==0.5
6270
featuretools==0.9.1
@@ -69,8 +77,19 @@ gast==0.2.2
6977
gensim==3.8.0
7078
geopandas==0.5.1
7179
geoplotlib==0.3.2
72-
google-auth==1.18.0
80+
gin_config==0.3.0
81+
google_api_core==1.23.0
82+
google-api-core[grpc]==1.23.0
83+
google_api_python_client==1.12.8
84+
google-auth==1.21.1
85+
google_auth_httplib2==0.0.3
7386
google-auth-oauthlib==0.4.1
87+
google_cloud_bigquery==1.8.2
88+
google_cloud_bigtable==0.32.1
89+
google-cloud-core==0.29.0
90+
google_cloud_datastore==1.15.3
91+
google_cloud_pubsub==1.0.1
92+
google_cloud_spanner==1.19.1
7493
google-images-download==2.8.0
7594
google-pasta==0.1.8
7695
graphviz==0.14
@@ -85,6 +104,7 @@ idna==2.9
85104
imageio==2.8.0
86105
imbalanced-learn==0.5.0
87106
importlib-metadata==1.5.0
107+
importlib_resources==4.1.1
88108
ipykernel==5.1.4
89109
ipyparallel==6.2.4
90110
ipython==7.13.0
@@ -115,11 +135,11 @@ jupyterlab==2.1.4
115135
jupyterlabutils==0.9.0
116136
jupyterlab-git==0.20.0
117137
jupyterlab-github==2.0.0
118-
jupyterlab-zip==1.0.1
138+
#jupyterlab-zip==1.0.1
119139
jupyterlab-server==1.1.5
120140
jupyterlab_hdf==0.3.0
121141
jupyterthemes==0.20.0
122-
Keras==2.3.1
142+
Keras==2.2.4
123143
Keras-Applications==1.0.8
124144
Keras-Preprocessing==1.1.0
125145
kss==1.3.1
@@ -142,7 +162,7 @@ mlxtend==0.17.2
142162
mmdnn==0.3.1
143163
mne==0.20.5
144164
more-itertools==7.2.0
145-
mock==3.0.5
165+
mock==2.0.0
146166
msgpack==0.6.1
147167
msgpack-python==0.5.6
148168
multidict==4.7.5
@@ -152,16 +172,16 @@ namedlist==1.7
152172
nbconvert==5.6.1
153173
nbformat==5.0.4
154174
networkx==2.4
155-
ngraph-core==0.26.0
156-
ngraph-onnx==0.24.0
157-
ngraph-tensorflow-bridge==0.18.0
175+
#ngraph-core==0.26.0
176+
#ngraph-onnx==0.24.0
177+
#ngraph-tensorflow-bridge==0.18.0
158178
nltk==3.2.5
159179
numba==0.48.0
160180
numexpr==2.7.0
161181
oauthlib==3.1.0
162182
oauth2client==3.0.0
163183
onnx==1.6.0
164-
onnx-plaidml==0.6.3
184+
#onnx-plaidml==0.6.3
165185
opt-einsum==3.2.0
166186
osqp==0.5.0
167187
packaging==20.3
@@ -179,16 +199,17 @@ pluggy==0.12.0
179199
ply==3.11
180200
portpicker==1.3.1
181201
progressbar==2.5
202+
promise==2.3
182203
prometheus-client==0.7.1
183-
prompt-toolkit==3.0.3
204+
prompt-toolkit==2.0.10
184205
protobuf==3.12.2
185206
psutil==5.7.0
186207
ptyprocess==0.6.0
187208
py==1.8.0
188209
pyaml==19.12.0
189210
pyasn1==0.4.8
190211
pyasn1-modules==0.2.8
191-
pyarrow==0.15.1
212+
pyarrow==0.17.0
192213
pycocotools==2.0.0
193214
pycodestyle==2.5.0
194215
pycparser==2.19
@@ -197,7 +218,7 @@ pydot==1.4.1
197218
pydotplus==2.0.2
198219
pyflakes==2.1.1
199220
pygal==2.4.0
200-
pygame==1.9.6
221+
pygame==1.9.5
201222
pyglet==1.5.0
202223
Pygments==2.5.2
203224
pyLDAvis==2.1.2
@@ -226,7 +247,7 @@ pyzmq==19.0.0
226247
qtconsole==4.7.1
227248
QtPy==1.9.0
228249
regex==2020.2.20
229-
requests==2.23.0
250+
requests==2.24.0
230251
requests-oauthlib==1.3.0
231252
resampy==0.2.1
232253
retrying==1.3.3
@@ -246,13 +267,13 @@ scikit-surprise==1.1.0
246267
seaborn==0.10.0
247268
selenium==3.141.0
248269
Send2Trash==1.5.0
249-
sentencepiece==0.1.82
270+
#sentencepiece==0.1.82
250271
setuptools-git==1.2
251272
Shapely==1.7.0
252273
simpervisor==0.3
253274
simpleaudio==1.0.4
254275
simplejson==3.17.0
255-
six==1.14.0
276+
six==1.13.0
256277
smart-open==1.9.0
257278
snowballstemmer==2.0.0
258279
sortedcontainers==2.1.0
@@ -263,8 +284,14 @@ tabulate==0.8.7
263284
tblib==1.6.0
264285
termcolor==1.1.0
265286
terminado==0.8.3
287+
tensorflow_datasets==4.1.0
288+
tensorflow_metadata==0.24.0
289+
tensorflow_model_analysis==0.24.0
290+
tensorflow_hub==0.10.0
291+
tensorflow_text==2.3.0
266292
test-generator==0.1.1
267293
testpath==0.4.4
294+
tfx-bsl==0.24.1
268295
tf2onnx==1.5.5
269296
toml==0.10.0
270297
toolz==0.10.0

0 commit comments

Comments
 (0)