Skip to content

Commit 4bca1de

Browse files
hephaexhephaex
committed
fixed conflict
2 parents 709c27b + 428b8f2 commit 4bca1de

8 files changed

+187
-36
lines changed

‎vendor/ngc-pytorch/Dockerfile.22.03-py3

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,29 @@ ENV DEBIAN_FRONTEND=noninteractive \
66
PIP_IGNORE_INSTALLED=0 \
77
PYTHONUNBUFFERED=1 \
88
LD_LIBRARY_PATH="/usr/local/cuda/compat/lib:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib:/usr/local/cuda/lib64:/usr/local/nvidia/lib64:/usr/local/cuda-11.6/include:/usr/include/x86_64-linux-gnu:$LD_LIBRARY_PATH" \
9+
<<<<<<< HEAD
910
PATH="/usr/local/nvm/versions/node/v16.6.1/bin:/opt/conda/bin:/usr/local/mpi/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/cuda-11.6/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/ucx/bin:/opt/tensorrt/bin:/usr/local/src/lightgbm/LightGBM:/usr/local/bin/mecab:$PATH" \
1011
mecab_dicdir=/usr/local/lib/mecab/dic/mecab-ko-dic \
1112
CPLUS_INCLUDE_PATH=/usr/include/gdal \
1213
C_INCLUDE_PATH=/usr/include/gdal \
1314
CPATH=/usr/local/cuda-11.6/targets/x86_64-linux/include:$CPATH \
15+
=======
16+
PATH="/usr/local/nvm/versions/node/v16.6.1/bin:/opt/conda/lib/python3.8/site-packages/torch_tensorrt/bin:/opt/conda/bin:/usr/local/mpi/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/ucx/bin:/opt/tensorrt/bin:/usr/local/src/lightgbm/LightGBM:/usr/local/bin/mecab" \
17+
mecab_dicdir=/usr/local/lib/mecab/dic/mecab-ko-dic \
18+
CPLUS_INCLUDE_PATH=/usr/include/gdal \
19+
C_INCLUDE_PATH=/usr/include/gdal \
20+
# CPATH=/usr/local/cuda-10.1/targets/x86_64-linux/include:$CPATH \
21+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
1422
LANG=C.UTF-8
1523

1624
RUN apt-get update && \
1725
apt-get install -y --no-install-recommends \
1826
automake \
27+
<<<<<<< HEAD
28+
=======
29+
bzip2 \
30+
cabextract \
31+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
1932
ffmpeg \
2033
fonts-nanum \
2134
fonts-nanum-coding \
@@ -35,8 +48,15 @@ RUN apt-get update && \
3548
libgstreamer-plugins-base1.0-dev \
3649
libgstreamer1.0-dev \
3750
libgtk-3-dev \
51+
<<<<<<< HEAD
3852
libhdf5-dev \
3953
libmp3lame-dev \
54+
=======
55+
libhdf5-dev \
56+
libjemalloc-dev \
57+
libmp3lame-dev \
58+
libncurses-dev \
59+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
4060
libopenblas-dev \
4161
libopencore-amrnb-dev \
4262
libopencore-amrwb-dev \
@@ -51,7 +71,13 @@ RUN apt-get update && \
5171
libtbb-dev \
5272
mercurial \
5373
ncurses-term \
74+
<<<<<<< HEAD
5475
openjdk-8-jdk \
76+
=======
77+
openjdk-8-jdk \
78+
pbzip2 \
79+
pv \
80+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
5581
pdsh \
5682
protobuf-compiler \
5783
v4l-utils \
@@ -112,7 +138,11 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
112138
apt-get install -y nodejs
113139

114140
WORKDIR /tmp
141+
<<<<<<< HEAD
115142
RUN git clone -q --branch=v0.3.20 git://github.com/xianyi/OpenBLAS.git && \
143+
=======
144+
RUN git clone -q --branch=v0.3.20 https://github.com/xianyi/OpenBLAS.git && \
145+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
116146
cd OpenBLAS && \
117147
make DYNAMIC_ARCH=1 NO_AFFINITY=1 NUM_THREADS=48 FC=gfortran && \
118148
make install && \
@@ -121,7 +151,11 @@ RUN git clone -q --branch=v0.3.20 git://github.com/xianyi/OpenBLAS.git && \
121151
cd /tmp/scs-python && \
122152
python setup.py install --scs --gpu
123153

154+
<<<<<<< HEAD
124155
RUN /opt/conda/bin/conda install -c conda-forge opencv ffmpeg spacy
156+
=======
157+
RUN /opt/conda/bin/conda install -cᅧ conda-forge opencv ffmpeg spacy
158+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
125159

126160
WORKDIR /tmp
127161
COPY ./requirements.22.03.txt /tmp/requirements.txt
@@ -166,11 +200,20 @@ RUN mkdir /tmp/openmpi && \
166200
echo "btl_tcp_if_exclude = lo,docker0" >> /usr/local/etc/openmpi-mca-params.conf
167201

168202
# Install Horovod, temporarily using CUDA stubs
203+
<<<<<<< HEAD
169204
RUN cp /usr/local/cuda-11.6/bin/nvcc /bin/nvcc && \
170205
# ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
171206
HOROVOD_CUDA_HOME=$CONDA_PREFIX HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_GPU_BROADCAST=NCCL HOROVOD_NCCL_LINK=SHARED \
172207
HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 \
173208
pip install --no-cache-dir horovod==0.24.1 && \
209+
=======
210+
RUN ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
211+
# cp /usr/local/cuda-11.6/bin/nvcc /bin/nvcc && \
212+
# ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
213+
HOROVOD_CUDA_HOME=$CONDA_PREFIX HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_GPU_BROADCAST=NCCL HOROVOD_NCCL_LINK=SHARED \
214+
HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 \
215+
pip install --no-cache-dir horovod==0.24.2 && \
216+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
174217
ldconfig
175218

176219
RUN python3 -m pip install --no-cache-dir \
@@ -179,6 +222,10 @@ RUN python3 -m pip install --no-cache-dir \
179222
mlflow==1.21.0 \
180223
scikit-nni==0.2.1
181224

225+
<<<<<<< HEAD
226+
=======
227+
RUN rm /usr/local/bin/node
228+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
182229
RUN jupyter nbextensions_configurator enable && \
183230
jupyter contrib nbextension install && \
184231
jupyter nbextension enable --py --sys-prefix widgetsnbextension && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ RUN mv /usr/local/bin/mpirun /usr/local/bin/mpirun.real && \
202202
# Configure OpenMPI to run good defaults:
203203
RUN echo "btl_tcp_if_exclude = lo,docker0" >> /usr/local/etc/openmpi-mca-params.conf
204204

205-
RUN rm /usr/local/bin/node
206-
RUN jupyter nbextensions_configurator enable && \
205+
RUN pip install jupyter_nbextensions_configurator && \
206+
jupyter nbextensions_configurator enable && \
207207
jupyter contrib nbextension install && \
208208
jupyter nbextension enable --py --sys-prefix widgetsnbextension && \
209209
jupyter serverextension enable --py jupyterlab --sys-prefix && \
210-
jupyter serverextension enable --py jupyter_lsp && \
210+
# jupyter serverextension enable --py jupyter_lsp && \
211211
jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager && \
212212
jupyter labextension install --no-build @jupyterlab/toc && \
213213
jupyter labextension install --no-build @krassowski/[email protected] && \

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,48 @@ 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.0.2/code-server-4.0.2-linux-amd64.tar.gz | tar -C /usr/local/lib -xz && \
182+
mv /usr/local/lib/code-server-4.0.2-linux-amd64 /usr/local/lib/code-server-3.12.0 && \
183+
ln -s /usr/local/lib/code-server-4.0.2/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.1.tar.gz && \
189+
tar zxf openmpi-4.1.1.tar.gz && \
190+
cd openmpi-4.1.1 && \
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
168210

169211
# Install Jupyterlab extensions
170212
RUN jupyter nbextensions_configurator enable && \
@@ -177,7 +219,8 @@ RUN jupyter nbextensions_configurator enable && \
177219
jupyter labextension install --no-build @jupyterlab/toc && \
178220
jupyter nbextension enable execute_time/ExecuteTime && \
179221
jupyter nbextension enable toc2/main && \
180-
jupyter lab build
222+
jupyter labextension install @jupyterlab/toc && \
223+
jupyter lab build
181224

182225
RUN apt autoclean && \
183226
sed -i 's/source \/usr\/local\/nvm\/nvm.sh//' /etc/bash.bashrc && \
@@ -192,7 +235,7 @@ RUN /usr/bin/python3 -m ipykernel install --display-name "Python 3.8 (NGC 22.02
192235

193236
# Backend.AI specifics
194237
COPY ./service-defs /etc/backend.ai/service-defs
195-
COPY runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
238+
COPY ./runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
196239
LABEL ai.backend.kernelspec="1" \
197240
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
198241
ai.backend.features="batch query uid-match user-input" \

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,48 @@ 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.0.2/code-server-4.0.2-linux-amd64.tar.gz | tar -C /usr/local/lib -xz && \
182+
mv /usr/local/lib/code-server-4.0.2-linux-amd64 /usr/local/lib/code-server-3.12.0 && \
183+
ln -s /usr/local/lib/code-server-4.0.2/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.1.tar.gz && \
189+
tar zxf openmpi-4.1.1.tar.gz && \
190+
cd openmpi-4.1.1 && \
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
168210

169211
# Install Jupyterlab extensions
170212
RUN jupyter nbextensions_configurator enable && \
@@ -177,7 +219,8 @@ RUN jupyter nbextensions_configurator enable && \
177219
jupyter labextension install --no-build @jupyterlab/toc && \
178220
jupyter nbextension enable execute_time/ExecuteTime && \
179221
jupyter nbextension enable toc2/main && \
180-
jupyter lab build
222+
jupyter labextension install @jupyterlab/toc && \
223+
jupyter lab build
181224

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

193236
# Backend.AI specifics
194237
COPY ./service-defs /etc/backend.ai/service-defs
195-
COPY runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
238+
COPY ./runner-scripts/bootstrap.sh runner-scripts/setup_multinode.py /opt/container/
196239
LABEL ai.backend.kernelspec="1" \
197240
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
198241
ai.backend.features="batch query uid-match user-input" \

‎vendor/ngc-tensorflow/diff-19.11-tf2-py3-tensorboard.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎vendor/ngc-tensorflow/requirements.22.02.txt

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,22 +156,35 @@ Jinja2==2.11.3
156156
json-tricks==3.14.0
157157
jsonpickle==1.5.2
158158
jsonschema==4.0.1
159-
jupyter-console==6.1.0
159+
#jupyterlab-nvdashboard==0.5.0
160+
jupyter-client==6.1.12
161+
jupyter-console==6.2.0
160162
jupyter-contrib-core==0.3.3
161163
jupyter-contrib-nbextensions==0.5.1
162164
jupyter-dash==0.4.0
163165
jupyter-highlight-selected-word==0.2.0
164166
jupyter-js-widgets-nbextension==0.0.2.dev0
167+
jupyter-kite==1.2.0
165168
jupyter-latex-envs==1.4.6
166169
jupyter-lsp==1.2.0
167170
jupyter-nbextensions-configurator==0.4.1
168-
jupyter-server-proxy==1.2.0
171+
jupyter-packaging==0.9.2
172+
jupyter-server-mathjax
173+
jupyter-server-proxy==1.6.0
174+
jupyter-server
175+
jupyter-telemetry==0.1.0
169176
jupyter==1.0.0
170177
jupyter_bokeh==2.0.4
171-
jupyterlab-git
172-
jupyterlab-github==2.0.0
178+
jupyterhub==2.2.2
179+
jupyterhub-jwtauthenticator==0.1
180+
jupyterhub-kubespawner==0.16.1
181+
jupyterhubutils==0.25.0
182+
jupyterlab-code-formatter==1.4.10
183+
#jupyterlab-git
184+
#jupyterlab-github==2.0.0
185+
jupyterlab-hdf==0.5.1
186+
jupyterlab-launcher==0.13.1
173187
jupyterlab-lsp==3.6.0
174-
jupyterlab_hdf==0.3.0
175188
jupyterlabutils
176189
jupyterthemes==0.20.0
177190
jupytext==1.13.7
@@ -211,7 +224,7 @@ multiprocess==0.70.9
211224
munch==2.5.0
212225
mxnet
213226
namedlist==1.7
214-
nbclassic==0.2.7
227+
nbclassic>=0.2.87
215228
nbdime==3.0.0
216229
netifaces==0.10.9
217230
networkx==2.4

‎vendor/ngc-tensorflow/requirements.22.03.txt

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,26 +156,39 @@ Jinja2==2.11.3
156156
json-tricks==3.14.0
157157
jsonpickle==1.5.2
158158
jsonschema==4.0.1
159-
jupyter-console==6.1.0
159+
#jupyterlab-nvdashboard==0.5.0
160+
jupyter-client==6.1.12
161+
jupyter-console==6.2.0
160162
jupyter-contrib-core==0.3.3
161163
jupyter-contrib-nbextensions==0.5.1
162164
jupyter-dash==0.4.0
163165
jupyter-highlight-selected-word==0.2.0
164166
jupyter-js-widgets-nbextension==0.0.2.dev0
167+
jupyter-kite==1.2.0
165168
jupyter-latex-envs==1.4.6
166169
jupyter-lsp==1.2.0
167170
jupyter-nbextensions-configurator==0.4.1
168-
jupyter-server-proxy==1.2.0
171+
jupyter-packaging==0.9.2
172+
jupyter-server-mathjax
173+
jupyter-server-proxy==1.6.0
174+
jupyter-server
175+
jupyter-telemetry==0.1.0
169176
jupyter==1.0.0
170177
jupyter_bokeh==2.0.4
171-
jupyterlab-git
172-
jupyterlab-github==2.0.0
178+
jupyterhub==2.2.2
179+
jupyterhub-jwtauthenticator==0.1
180+
jupyterhub-kubespawner==0.16.1
181+
jupyterhubutils==0.25.0
182+
jupyterlab-code-formatter==1.4.10
183+
#jupyterlab-git
184+
#jupyterlab-github==2.0.0
185+
jupyterlab-hdf==0.5.1
186+
jupyterlab-launcher==0.13.1
173187
jupyterlab-lsp==3.6.0
174-
jupyterlab_hdf==0.3.0
175188
jupyterlabutils
176189
jupyterthemes==0.20.0
177190
jupytext==1.13.7
178-
keras==2.8.0
191+
keras==2.7.0
179192
Keras-Applications==1.0.8
180193
keras-models
181194
kiwisolver==1.1.0
@@ -211,7 +224,7 @@ multiprocess==0.70.9
211224
munch==2.5.0
212225
mxnet
213226
namedlist==1.7
214-
nbclassic==0.2.7
227+
nbclassic>=0.2.87
215228
nbdime==3.0.0
216229
netifaces==0.10.9
217230
networkx==2.4

0 commit comments

Comments
 (0)