Skip to content

Commit ded08fa

Browse files
committed
Merge branch 'master' of github.com:lablup/backend.ai-kernels
2 parents e2db8f0 + 2049c46 commit ded08fa

File tree

4 files changed

+42
-159
lines changed

4 files changed

+42
-159
lines changed

vendor/ngc-tensorflow/Dockerfile.22.02-tf2-py3

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RUN mkdir -p /opt/oracle && \
8585
ldconfig
8686

8787
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 2 && \
88-
python3 -m pip install -U setuptools pip
88+
python3 -m pip install -U "pip < 22" setuptools wheel
8989

9090
# install NLP packages *mecab-ko & khai*
9191
WORKDIR /tmp
@@ -165,49 +165,6 @@ COPY ./requirements.22.02.txt /tmp/requirements.txt
165165
RUN python3 -m pip install --no-cache-dir -r requirements.txt && \
166166
rm -f /tmp/*.whl /tmp/requirements.txt
167167

168-
# install bashtop
169-
WORKDIR /tmp
170-
RUN git clone https://github.com/aristocratos/bashtop.git && \
171-
cd bashtop && \
172-
make install
173-
174-
# install git-lfs
175-
WORKDIR /tmp
176-
RUN curl -sLO https://github.com/git-lfs/git-lfs/releases/download/v3.1.2/git-lfs-linux-amd64-v3.1.2.tar.gz && \
177-
tar -zxf git-lfs-linux-amd64-v3.1.2.tar.gz && \
178-
bash install.sh && \
179-
rm -rf /tmp/*
180-
181-
RUN curl -fL https://github.com/cdr/code-server/releases/download/v4.2.0/code-server-4.2.0-linux-amd64.tar.gz | tar -C /usr/local/lib -xz && \
182-
mv /usr/local/lib/code-server-4.2.0-linux-amd64 /usr/local/lib/code-server-4.2.0 && \
183-
ln -s /usr/local/lib/code-server-4.2.0/bin/code-server /usr/local/bin/code-server
184-
185-
# Install Open MPI
186-
RUN mkdir /tmp/openmpi && \
187-
cd /tmp/openmpi && \
188-
wget https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.2.tar.gz && \
189-
tar zxf openmpi-4.1.2.tar.gz && \
190-
cd openmpi-4.1.2 && \
191-
./configure --enable-orterun-prefix-by-default && \
192-
make -j $(nproc) all && \
193-
make install && \
194-
ldconfig && \
195-
rm -rf /tmp/openmpi*
196-
# Create a wrapper for OpenMPI to allow running as root by default
197-
RUN mv /usr/local/bin/mpirun /usr/local/bin/mpirun.real && \
198-
echo '#!/bin/bash' > /usr/local/bin/mpirun && \
199-
echo 'mpirun.real --allow-run-as-root "$@"' >> /usr/local/bin/mpirun && \
200-
chmod a+x /usr/local/bin/mpirun
201-
202-
# Configure OpenMPI to run good defaults:
203-
RUN echo "btl_tcp_if_exclude = lo,docker0" >> /usr/local/etc/openmpi-mca-params.conf
204-
205-
RUN python3 -m pip install --no-cache-dir \
206-
mpi4py==3.1.3 \
207-
nni==2.6.1 \
208-
mlflow==1.24.0 \
209-
scikit-nni==0.2.1
210-
211168

212169
# Install Jupyterlab extensions
213170
RUN jupyter nbextensions_configurator enable && \
@@ -220,8 +177,7 @@ RUN jupyter nbextensions_configurator enable && \
220177
jupyter labextension install --no-build @jupyterlab/toc && \
221178
jupyter nbextension enable execute_time/ExecuteTime && \
222179
jupyter nbextension enable toc2/main && \
223-
jupyter labextension install @jupyterlab/toc && \
224-
jupyter lab build
180+
jupyter lab build
225181

226182
RUN apt autoclean && \
227183
sed -i 's/source \/usr\/local\/nvm\/nvm.sh//' /etc/bash.bashrc && \
@@ -231,7 +187,7 @@ RUN apt autoclean && \
231187
rm -rf /tmp/*
232188

233189
# Install ipython kernelspec
234-
RUN /usr/bin/python3 -m ipykernel install --display-name "Python 3.8 (NGC 22.02 / TensorFlow 2.6) on Backend.AI" && \
190+
RUN /usr/bin/python3 -m ipykernel install --display-name "Python 3.8 (NGC 22.02 / TensorFlow 2.7) on Backend.AI" && \
235191
cat /usr/local/share/jupyter/kernels/python3/kernel.json
236192

237193
# Backend.AI specifics

vendor/ngc-tensorflow/Dockerfile.22.03-tf2-py3

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
6868
nodejs \
6969
pdsh \
7070
protobuf-compiler \
71-
libsmpeg-dev \
72-
openjdk-8-jdk \
73-
python3-gdal \
71+
libsmpeg-dev \
72+
openjdk-8-jdk \
73+
python3-gdal \
7474
v4l-utils \
7575
x264
7676

@@ -165,47 +165,6 @@ COPY ./requirements.22.03.txt /tmp/requirements.txt
165165
RUN python3 -m pip install --no-cache-dir -r requirements.txt && \
166166
rm -f /tmp/*.whl /tmp/requirements.txt
167167

168-
# install bashtop
169-
WORKDIR /tmp
170-
RUN git clone https://github.com/aristocratos/bashtop.git && \
171-
cd bashtop && \
172-
make install
173-
174-
# install git-lfs
175-
WORKDIR /tmp
176-
RUN curl -sLO https://github.com/git-lfs/git-lfs/releases/download/v3.1.2/git-lfs-linux-amd64-v3.1.2.tar.gz && \
177-
tar -zxf git-lfs-linux-amd64-v3.1.2.tar.gz && \
178-
bash install.sh && \
179-
rm -rf /tmp/*
180-
181-
RUN curl -fL https://github.com/cdr/code-server/releases/download/v4.2.0/code-server-4.2.0-linux-amd64.tar.gz | tar -C /usr/local/lib -xz && \
182-
mv /usr/local/lib/code-server-4.2.0-linux-amd64 /usr/local/lib/code-server-4.2.0 && \
183-
ln -s /usr/local/lib/code-server-4.2.0/bin/code-server /usr/local/bin/code-server
184-
185-
# Install Open MPI
186-
RUN mkdir /tmp/openmpi && \
187-
cd /tmp/openmpi && \
188-
wget https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.2.tar.gz && \
189-
tar zxf openmpi-4.1.2.tar.gz && \
190-
cd openmpi-4.1.2 && \
191-
./configure --enable-orterun-prefix-by-default && \
192-
make -j $(nproc) all && \
193-
make install && \
194-
ldconfig && \
195-
rm -rf /tmp/openmpi* && \
196-
# Create a wrapper for OpenMPI to allow running as root by default
197-
mv /usr/local/bin/mpirun /usr/local/bin/mpirun.real && \
198-
echo '#!/bin/bash' > /usr/local/bin/mpirun && \
199-
echo 'mpirun.real --allow-run-as-root "$@"' >> /usr/local/bin/mpirun && \
200-
chmod a+x /usr/local/bin/mpirun && \
201-
# Configure OpenMPI to run good defaults:
202-
echo "btl_tcp_if_exclude = lo,docker0" >> /usr/local/etc/openmpi-mca-params.conf
203-
204-
RUN python3 -m pip install --no-cache-dir \
205-
mpi4py==3.1.3 \
206-
nni==2.6.1 \
207-
mlflow==1.24.0 \
208-
scikit-nni==0.2.1
209168

210169
# Install Jupyterlab extensions
211170
RUN jupyter nbextensions_configurator enable && \
@@ -218,8 +177,7 @@ RUN jupyter nbextensions_configurator enable && \
218177
jupyter labextension install --no-build @jupyterlab/toc && \
219178
jupyter nbextension enable execute_time/ExecuteTime && \
220179
jupyter nbextension enable toc2/main && \
221-
jupyter labextension install @jupyterlab/toc && \
222-
jupyter lab build
180+
jupyter lab build
223181

224182
RUN apt autoclean && \
225183
sed -i 's/source \/usr\/local\/nvm\/nvm.sh//' /etc/bash.bashrc && \
@@ -234,7 +192,7 @@ RUN /usr/bin/python3 -m ipykernel install --display-name "Python 3.8 (NGC 22.03
234192

235193
# Backend.AI specifics
236194
COPY ./service-defs /etc/backend.ai/service-defs
237-
COPY ./runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
195+
COPY runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
238196
LABEL ai.backend.kernelspec="1" \
239197
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
240198
ai.backend.features="batch query uid-match user-input" \

vendor/ngc-tensorflow/requirements.22.02.txt

Lines changed: 27 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ aiozmq==0.9.0
33
albumentations==1.1.0
44
alembic==1.7.5
55
ansi2html==1.6.0
6-
anyio==3.5.0
6+
anyio
77
#apache-airflow[celery,devel,postgres,redis,s3,ssh]==1.10.6
88
#apache-beam==2.34.0
99
appdirs==1.4.3
@@ -25,7 +25,7 @@ black==19.10b0
2525
bokeh==2.3.2
2626
boltons==20.2.1
2727
boto3==1.17.112
28-
boto==2.49.0
28+
boto
2929
botocore==1.20.112
3030
branca==0.4.0
3131
brotli==1.0.9
@@ -47,7 +47,7 @@ convertdate==2.3.2
4747
coverage==4.5.4
4848
crcmod==1.7
4949
cryptography==3.0
50-
cupy==9.5.0
50+
cupy==10.2.0
5151
cvxpy==1.1.15
5252
cycler==0.10.0
5353
cython==0.29.21
@@ -74,7 +74,7 @@ docutils==0.15.2
7474
dopamine_rl==3.0.1
7575
dtreeviz==0.8.1
7676
easyProcess==0.3
77-
easydict==1.9
77+
easydict
7878
ecdsa==0.14.1
7979
ecos==2.0.7.post1
8080
#elegy==0.8.1
@@ -97,8 +97,8 @@ flask-Compress==1.9.0
9797
flask==1.1.2
9898
folium==0.10.0
9999
funcy==1.13
100-
gast==0.5.3
101-
gDAL==3.4.2
100+
gast==0.4.0
101+
gDAL==3.0.4
102102
gensim==3.8.0
103103
geopandas==0.5.1
104104
gin_config==0.3.0
@@ -126,7 +126,7 @@ google-resumable-media==1.2.0
126126
google_api_core==1.23.0
127127
google_api_python_client==1.12.8
128128
google_auth_httplib2==0.0.3
129-
gluonnlp==0.10.0
129+
gluonnlp
130130
graphviz==0.14
131131
greenlet==1.0.0
132132
grpc-google-iam-v1==0.12.3
@@ -144,7 +144,7 @@ imbalanced-learn==0.5.0
144144
importlib-metadata~=2.0
145145
importlib_resources~=1.4
146146
ipyparallel==6.2.4
147-
ipywidgets==7.5.1
147+
ipywidgets==7.6.3
148148
iso8601==0.1.14
149149
isort==4.3.21
150150
itsdangerous==1.1.0
@@ -156,45 +156,28 @@ Jinja2==2.11.3
156156
json-tricks==3.14.0
157157
jsonpickle==1.5.2
158158
jsonschema==4.0.1
159-
jupyter-client==6.1.12
160-
jupyter-console==6.2.0
159+
jupyter-console==6.1.0
161160
jupyter-contrib-core==0.3.3
162161
jupyter-contrib-nbextensions==0.5.1
163-
jupyter-core==4.7.1
164162
jupyter-dash==0.4.0
165163
jupyter-highlight-selected-word==0.2.0
166164
jupyter-js-widgets-nbextension==0.0.2.dev0
167-
jupyter-kite==1.2.0
168165
jupyter-latex-envs==1.4.6
169-
jupyter-lsp==1.5.1
166+
jupyter-lsp==1.2.0
170167
jupyter-nbextensions-configurator==0.4.1
171-
jupyter-packaging==0.9.2
172-
jupyter-server-mathjax==0.2.2
173-
jupyter-server-proxy==1.6.0
174-
jupyter-server==1.15.6
175-
jupyter-telemetry==0.1.0
168+
jupyter-server-proxy==1.2.0
176169
jupyter==1.0.0
177170
jupyter_bokeh==2.0.4
178-
jupyterhub-jwtauthenticator==0.1
179-
jupyterhub-kubespawner==0.16.1
180-
jupyterhub==1.4.0
181-
jupyterhubutils==0.25.0
182-
jupyterlab-code-formatter==1.3.8
183-
jupyterlab-git==0.24.0
171+
jupyterlab-git
184172
jupyterlab-github==2.0.0
185-
jupyterlab-hdf==0.5.1
186-
jupyterlab-launcher==0.13.1
187173
jupyterlab-lsp==3.6.0
188-
jupyterlab-nvdashboard==0.5.0
189-
jupyterlab-pygments==0.1.2
190-
jupyterlab-server==2.10.0
191-
jupyterlab-translate==1.0.3
192-
jupyterlab==3.3.2
193-
#jupyterlabutils==0.10.0
174+
jupyterlab_hdf==0.3.0
175+
jupyterlabutils
194176
jupyterthemes==0.20.0
195-
jupytext==1.10.1
196-
keras==2.8.0
197-
keras-models==0.0.7
177+
jupytext==1.13.7
178+
keras==2.7.0
179+
Keras-Applications==1.0.8
180+
keras-models
198181
kiwisolver==1.1.0
199182
konlpy==0.5.2
200183
kss==3.3.1.1
@@ -210,6 +193,7 @@ lunardate==0.2.0
210193
lxml==4.5.0
211194
mako==1.0.7
212195
maproxy==0.0.12
196+
markupsafe==2.0.1
213197
matplotlib==3.4.3
214198
mccabe==0.6.1
215199
meshio==4.4.2
@@ -225,13 +209,14 @@ msgpack==0.6.1
225209
multidict==4.7.5
226210
multiprocess==0.70.9
227211
munch==2.5.0
228-
mxnet==1.9.0
212+
mxnet
229213
namedlist==1.7
230214
nbclassic==0.2.7
231-
nbdime==2.0.0
215+
nbdime==3.0.0
232216
netifaces==0.10.9
233217
networkx==2.4
234218
numba==0.49.0
219+
numexpr
235220
numexpr==2.7.0
236221
oauth2client==3.0.0
237222
oauthenticator==0.13.0
@@ -286,7 +271,7 @@ pynput==1.7.3
286271
#pynvml==11.0.0
287272
pyproj==2.5.0
288273
pyqt5==5.15.0
289-
pyshp==2.2.0
274+
pyshp
290275
pystan==3.3.0
291276
pytest-cov==2.10.0
292277
pytest~=6.0
@@ -300,7 +285,7 @@ python-slugify==4.0.1
300285
python-speech-features==0.6
301286
python-xlib==0.29
302287
pythonWebHDFS==0.2.3
303-
pythran==0.11.0
288+
pythran
304289
pyvista==0.24.3
305290
pyvo==1.0
306291
qgrid==1.3.1
@@ -352,13 +337,13 @@ threadpool==1.3.2
352337
threadpoolctl==2.1.0
353338
tomlkit==0.7.0
354339
toolz==0.10.0
355-
torch==1.11.0
340+
torch
356341
transformers==4.12.5
357342
tweepy==3.10.0
358343
typed-ast==1.4.3
359344
typing==3.7.4.3
360345
typing-extensions==3.7.4.3
361-
ujson==5.1.0
346+
ujson
362347
update-checker==0.16
363348
uritemplate==3.0.1
364349
urllib3==1.26.7
@@ -369,7 +354,7 @@ vtk==9.0.1
369354
websocket-client==0.59.0
370355
wheel==0.36.2
371356
widgetsnbextension==3.5.1
372-
xgboost==1.5.2
357+
xgboost
373358
yapf==0.29.0
374359
yarl==1.4.2
375360
zict==1.0.0

vendor/ngc-tensorflow/requirements.22.03.txt

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -156,39 +156,23 @@ Jinja2==2.11.3
156156
json-tricks==3.14.0
157157
jsonpickle==1.5.2
158158
jsonschema==4.0.1
159-
jupyter==1.0.0
160-
jupyter-bokeh==2.0.4
161-
jupyter-client==6.1.12
162-
jupyter-console==6.2.0
159+
jupyter-console==6.1.0
163160
jupyter-contrib-core==0.3.3
164161
jupyter-contrib-nbextensions==0.5.1
165-
jupyter-core==4.9.2
166162
jupyter-dash==0.4.0
167163
jupyter-highlight-selected-word==0.2.0
168164
jupyter-js-widgets-nbextension==0.0.2.dev0
169-
jupyter-kite==1.2.0
170165
jupyter-latex-envs==1.4.6
171166
jupyter-lsp==1.2.0
172167
jupyter-nbextensions-configurator==0.4.1
173-
jupyter-packaging==0.9.2
174-
jupyter-server==1.6.4
175-
jupyter-server-mathjax==0.2.2
176-
jupyter-server-proxy==1.6.0
177-
jupyter-telemetry==0.1.0
178-
jupyterhub==2.2.2
179-
jupyterhub-jwtauthenticator==0.1
180-
jupyterhub-kubespawner==0.16.1
181-
jupyterhubutils==0.25.0
182-
jupyterlab==3.3.2
183-
jupyterlab-code-formatter==1.4.10
184-
jupyterlab-git==0.30.1
168+
jupyter-server-proxy==1.2.0
169+
jupyter==1.0.0
170+
jupyter_bokeh==2.0.4
171+
jupyterlab-git
185172
jupyterlab-github==2.0.0
186-
jupyterlab-hdf==0.5.1
187-
jupyterlab-launcher==0.13.1
188173
jupyterlab-lsp==3.6.0
189-
jupyterlab-pygments==0.1.2
190-
jupyterlab-server==2.10.3
191-
jupyterlabutils==0.9.2
174+
jupyterlab_hdf==0.3.0
175+
jupyterlabutils
192176
jupyterthemes==0.20.0
193177
jupytext==1.13.7
194178
keras==2.8.0

0 commit comments

Comments
 (0)