Skip to content

Commit 0a958f6

Browse files
hephaexhephaex
committed
fixed conflict
2 parents 632a069 + 6a6593e commit 0a958f6

File tree

4 files changed

+435
-3
lines changed

4 files changed

+435
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ RUN git clone -q --branch=v0.3.20 https://github.com/xianyi/OpenBLAS.git && \
127127
cd /tmp/scs-python && \
128128
python setup.py install --scs --gpu
129129

130-
RUN /opt/conda/bin/conda install -c conda-forge opencv ffmpeg spacy \
131-
jupyter_client=7.1.0 jupyter_server=1.13.1 \
132-
traitlets>=5.0 --force-reinstall
130+
RUN /opt/conda/bin/conda install -c conda-forge opencv ffmpeg spacy
133131

134132

135133
WORKDIR /tmp

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +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
10+
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" \
11+
mecab_dicdir=/usr/local/lib/mecab/dic/mecab-ko-dic \
12+
CPLUS_INCLUDE_PATH=/usr/include/gdal \
13+
C_INCLUDE_PATH=/usr/include/gdal \
14+
CPATH=/usr/local/cuda-11.6/targets/x86_64-linux/include:$CPATH \
15+
=======
916
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" \
1017
mecab_dicdir=/usr/local/lib/mecab/dic/mecab-ko-dic \
1118
CPLUS_INCLUDE_PATH=/usr/include/gdal \
1219
C_INCLUDE_PATH=/usr/include/gdal \
1320
# 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+
=======
1929
bzip2 \
2030
cabextract \
31+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
2132
ffmpeg \
2233
fonts-nanum \
2334
fonts-nanum-coding \
@@ -37,10 +48,15 @@ RUN apt-get update && \
3748
libgstreamer-plugins-base1.0-dev \
3849
libgstreamer1.0-dev \
3950
libgtk-3-dev \
51+
<<<<<<< HEAD
52+
libhdf5-dev \
53+
libmp3lame-dev \
54+
=======
4055
libhdf5-dev \
4156
libjemalloc-dev \
4257
libmp3lame-dev \
4358
libncurses-dev \
59+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
4460
libopenblas-dev \
4561
libopencore-amrnb-dev \
4662
libopencore-amrwb-dev \
@@ -55,9 +71,13 @@ RUN apt-get update && \
5571
libtbb-dev \
5672
mercurial \
5773
ncurses-term \
74+
<<<<<<< HEAD
75+
openjdk-8-jdk \
76+
=======
5877
openjdk-8-jdk \
5978
pbzip2 \
6079
pv \
80+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
6181
pdsh \
6282
protobuf-compiler \
6383
v4l-utils \
@@ -118,7 +138,11 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
118138
apt-get install -y nodejs
119139

120140
WORKDIR /tmp
141+
<<<<<<< HEAD
142+
RUN git clone -q --branch=v0.3.20 git://github.com/xianyi/OpenBLAS.git && \
143+
=======
121144
RUN git clone -q --branch=v0.3.20 https://github.com/xianyi/OpenBLAS.git && \
145+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
122146
cd OpenBLAS && \
123147
make DYNAMIC_ARCH=1 NO_AFFINITY=1 NUM_THREADS=48 FC=gfortran && \
124148
make install && \
@@ -127,7 +151,15 @@ RUN git clone -q --branch=v0.3.20 https://github.com/xianyi/OpenBLAS.git && \
127151
cd /tmp/scs-python && \
128152
python setup.py install --scs --gpu
129153

154+
<<<<<<< HEAD
130155
RUN /opt/conda/bin/conda install opencv ffmpeg spacy
156+
=======
157+
<<<<<<< HEAD
158+
RUN /opt/conda/bin/conda install -c conda-forge opencv ffmpeg spacy
159+
=======
160+
RUN /opt/conda/bin/conda install -cᅧ conda-forge opencv ffmpeg spacy
161+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
162+
>>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
131163

132164
WORKDIR /tmp
133165
COPY ./requirements.22.03.txt /tmp/requirements.txt
@@ -172,12 +204,20 @@ RUN mkdir /tmp/openmpi && \
172204
echo "btl_tcp_if_exclude = lo,docker0" >> /usr/local/etc/openmpi-mca-params.conf
173205

174206
# Install Horovod, temporarily using CUDA stubs
207+
<<<<<<< HEAD
208+
RUN cp /usr/local/cuda-11.6/bin/nvcc /bin/nvcc && \
209+
# ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
210+
HOROVOD_CUDA_HOME=$CONDA_PREFIX HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_GPU_BROADCAST=NCCL HOROVOD_NCCL_LINK=SHARED \
211+
HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 \
212+
pip install --no-cache-dir horovod==0.24.1 && \
213+
=======
175214
RUN ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
176215
# cp /usr/local/cuda-11.6/bin/nvcc /bin/nvcc && \
177216
# ldconfig /usr/local/cuda/targets/x86_64-linux/lib/stubs && \
178217
HOROVOD_CUDA_HOME=$CONDA_PREFIX HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_GPU_BROADCAST=NCCL HOROVOD_NCCL_LINK=SHARED \
179218
HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 \
180219
pip install --no-cache-dir horovod==0.24.2 && \
220+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
181221
ldconfig
182222

183223
RUN python3 -m pip install --no-cache-dir \
@@ -186,7 +226,10 @@ RUN python3 -m pip install --no-cache-dir \
186226
mlflow==1.21.0 \
187227
scikit-nni==0.2.1
188228

229+
<<<<<<< HEAD
230+
=======
189231
RUN rm /usr/local/bin/node
232+
>>>>>>> 428b8f2fe85b44c569e7749658a1f56e4b7778b3
190233
RUN jupyter nbextensions_configurator enable && \
191234
jupyter contrib nbextension install && \
192235
jupyter nbextension enable --py --sys-prefix widgetsnbextension && \

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

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
#certifi==2021.10.8
2+
#entrypoints==0.4
3+
#importlib_resources==5.7.1
4+
#jsonschema==4.4.0
5+
#oauthlib==3.2.0
6+
#pysocks==1.7.1
7+
#soundfile==0.10.3.post1
8+
#werkzeug==2.0.3
9+
adanet==0.9.0
10+
aiohttp==3.8.0
11+
aiozmq==0.9.0
12+
albumentations==1.1.0
13+
alembic==1.7.6
14+
anyio==3.4.0
15+
argo_workflows==3.6.0
16+
asgiref==3.4.1
17+
astor==0.8.1
18+
astroid==2.11.2
19+
async-timeout==4.0.0
20+
atlas==0.27.0
21+
atomicwrites==1.3.0
22+
autopep8==1.5
23+
avro-python3==1.9.1
24+
bayesian-optimization==1.1.0
25+
benepar==0.2.0
26+
black==21.11b1
27+
bokeh==2.3.2
28+
boto3==1.9.209
29+
boto==2.49.0
30+
botocore==1.12.253
31+
branca==0.4.0
32+
catboost==0.22
33+
category-encoders==2.0.0
34+
certipy==0.1.2
35+
chardet==3.0.4
36+
click-plugins==1.1.1
37+
cligj==0.5.0
38+
cmake==3.18.4.post1
39+
cmdstanpy==0.9.5
40+
colour==0.1.5
41+
conda-build==3.21.8
42+
contextlib2==0.5.5
43+
convertdate==2.3.2
44+
cupy==10.2.0
45+
cvxpy==1.1.15
46+
deap==1.3.1
47+
deepmerge==0.1.0
48+
descartes==1.1.0
49+
dill==0.3.1.1
50+
docopt==0.6.0
51+
dopamine_rl==3.0.1
52+
dtreeviz==0.8.1
53+
easydict==1.9
54+
easyprocess==0.3
55+
ecos==2.0.7.post1
56+
elegy==0.1.5
57+
enum34==1.1.8
58+
ephem==3.7.6.0
59+
factor-analyzer
60+
fastavro==0.21.4
61+
fasteners==0.15
62+
featuretools==0.9.1
63+
fiona==1.8.6
64+
fire==0.3.1
65+
flake8==3.8.4
66+
folium==0.10.0
67+
funcy==1.13
68+
gast==0.5.0
69+
gensim==3.8.0
70+
geopandas==0.5.1
71+
gin_config==0.3.0
72+
gitdb==4.0.5
73+
gitpython==3.1.26
74+
google-api-core[grpc]==1.23.0
75+
google-images-download==2.8.0
76+
google-pasta==0.1.8
77+
google_api_core==1.23.0
78+
google_api_python_client==1.12.8
79+
google_auth_httplib2==0.0.3
80+
googleapis-common-protos==1.51.0
81+
graphviz==0.14
82+
gym==0.17.3
83+
h5py==2.10.0
84+
hdf5storage==0.1.15
85+
holidays>=0.11.3.1
86+
hyperopt==0.1.2
87+
imageio==2.8.0
88+
imbalanced-learn==0.5.0
89+
ipyparallel==6.2.4
90+
ipywidgets==7.5.1
91+
isort==4.3.21
92+
jmespath==0.9.4
93+
jpype1==0.7.2
94+
json-tricks==3.14.0
95+
jupyter-console==6.1.0
96+
jupyter-contrib-core==0.3.3
97+
jupyter-contrib-nbextensions==0.5.1
98+
jupyter-dash==0.4.0
99+
jupyter-highlight-selected-word==0.2.0
100+
jupyter-js-widgets-nbextension==0.0.2.dev0
101+
jupyter-latex-envs==1.4.6
102+
jupyter-lsp==1.2.0
103+
jupyter-nbextensions-configurator==0.4.1
104+
jupyter-server-proxy==1.2.0
105+
jupyter==1.0.0
106+
jupyter_bokeh==2.0.4
107+
jupyter_client==6.1.11
108+
jupyter_server_mathjax==0.2.4
109+
jupyterhub==2.2.1
110+
jupyterhub_kubespawner==0.15.0
111+
#jupyterlab-git==0.36.0
112+
#jupyterlab-github==2.0.0
113+
jupyterlab-lsp==3.6.0
114+
#jupyterlab==3.3.0
115+
jupyterlab_hdf==0.3.0
116+
jupyterlabutils
117+
jupyterthemes==0.20.0
118+
konlpy==0.5.2
119+
kss==1.3.1
120+
kubernetes==22.6.0
121+
lazy-object-proxy==1.4.3
122+
lesscpy==0.14.0
123+
lightgbm==2.3.1
124+
lime==0.1.1.37
125+
lunarcalendar>=0.0.9
126+
lunardate==0.2.0
127+
lxml==4.5.0
128+
mako==1.0.7
129+
markupsafe==2.1.1
130+
marshmallow==3.14.1
131+
matplotlib_inline==0.1.3
132+
mecab-python===0.996-ko-0.9.2
133+
meshio==4.4.5
134+
mlxtend==0.17.2
135+
mmdnn==0.3.1
136+
mne==0.20.5
137+
mock==3.0.5
138+
monotonic==1.4
139+
more-itertools==7.2.0
140+
msgpack-python==0.5.6
141+
multidict==4.7.5
142+
multiprocess==0.70.9
143+
munch==2.5.0
144+
namedlist==1.7
145+
nbclassic==0.3.6
146+
nbdime==3.1.0
147+
nose==1.3.3
148+
numexpr==2.7.0
149+
numpy==1.22.3
150+
oauth2client==3.0.0
151+
oauthenticator==0.12.1
152+
opencv-python==4.5.5
153+
opencv_python_headless==4.5.5.62
154+
opt-einsum==3.2.0
155+
osqp==0.5.0
156+
pexpect==4.8.0
157+
pandas==1.4.2
158+
pandasgui==0.2.7
159+
pandocfilters==1.4.3
160+
patsy==0.5.0
161+
partd==1.2.0
162+
path==16.2.0
163+
pbr==5.5.0
164+
plaidml==0.7.0
165+
platformdirs==2.5.1
166+
plotly==4.5.3
167+
ply==3.11
168+
Pillow==9.1.0
169+
portpicker==1.3.1
170+
progressbar==2.5
171+
prometheus_client==0.14.1
172+
promise==2.3
173+
protobuf==3.20.0
174+
prompt_toolkit==3.0.29
175+
psutil==5.9.0
176+
ptyprocess==0.6.0
177+
pulp==2.5.1
178+
py-cpuinfo==5.0.0
179+
pyaml==19.12.0
180+
pyasn1-modules==0.2.8
181+
pycairo==1.20.1
182+
pydocstyle==6.1.1
183+
pydotplus==2.0.2
184+
pygal==2.4.0
185+
pygame==2.0.1
186+
pyglet==1.5.0
187+
pygments==2.11.2
188+
pyldavis==2.1.2
189+
pylint==2.13.5
190+
pyls-black==0.4.4
191+
pymeeus==0.5.10
192+
pymongo==3.10.1
193+
pyparsing==3.0.8
194+
pyproj==2.5.0
195+
pyqt5-sip==12.8.1
196+
pyqt5==5.15.0
197+
pyrsistent==0.16.1
198+
pyshp==2.2.0
199+
PySocks==1.7.1
200+
pystan==3.3.0
201+
python-jsonrpc-server==0.4.0
202+
python-language-server[all]==0.36.2
203+
python-lsp-server==1.4.1
204+
python-speech-features==0.6
205+
pythonwebhdfs==0.2.3
206+
pythran==0.11.0
207+
pyvirtualdisplay==1.3.2
208+
pyvista==0.24.3
209+
pyvo==1.0
210+
pywavelets==1.1.1
211+
qgrid==1.3.1
212+
qtconsole==4.7.1
213+
qtpy==1.9.0
214+
retrying==1.3.3
215+
rope==0.16.0
216+
ruamel.yaml.clib==0.2.0
217+
s3transfer==0.2.1
218+
sacrebleu==1.3.6
219+
sacred==0.8.1
220+
schema==0.7.1
221+
scikit-image>=0.17.2
222+
scikit-optimize==0.9.0
223+
scikit-plot==0.3.7
224+
scikit-surprise==1.1.1
225+
scooby==0.5.5
226+
scs==3.2.0
227+
seaborn==0.10.0
228+
selenium==3.141.0
229+
sentence_transformers==2.1.0
230+
setuptools-git==1.2
231+
shapely==1.7.0
232+
simpervisor==0.3
233+
simpleaudio==1.0.4
234+
simplejson==3.17.0
235+
smart-open==5.2.1
236+
soynlp==0.0.493
237+
statsmodels==0.11.1
238+
stopit==1.1.2
239+
termcolor==1.1.0
240+
test-generator==0.1.1
241+
transformers==4.11.3
242+
tweepy==3.8.0
243+
typing==3.7.4.1
244+
ujson==5.2.0
245+
update-checker==0.16
246+
vecstack==0.4.0
247+
versioneer==0.18
248+
visdom>=0.1.8.9
249+
vtk==9.0.1
250+
wcwidth==0.1.8
251+
widgetsnbextension==3.5.1
252+
yapf==0.29.0
253+
yarl==1.4.2

0 commit comments

Comments
 (0)