Updated config and dockerfiles (#2428)

pytorch · Jan 17, 2022 · 5b1ec28 · 5b1ec28
1 parent d8023cb
commit 5b1ec28
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/docker/docker.cfg b/docker/docker.cfg
@@ -1,4 +1,4 @@
 [DEFAULT]
 build_docker_image_pytorch_version = 1.10.0-cuda11.3-cudnn8
 build_docker_image_hvd_version = v0.23.0
-build_docker_image_msdp_version = v0.5.4
+build_docker_image_msdp_version = v0.5.9
diff --git a/docker/hvd/Dockerfile.hvd-apex b/docker/hvd/Dockerfile.hvd-apex
@@ -26,7 +26,7 @@ ARG HVD_VERSION
 # Build Horovod
 RUN apt-get update && apt-get install -y git && \
         git clone --recursive --depth 1 --branch ${HVD_VERSION} https://github.com/horovod/horovod.git /horovod && \
-        conda install -y cmake nccl=2.8 -c conda-forge && \
+        conda install -y cmake nccl=2.11 -c conda-forge && \
         cd /horovod && \
         HOROVOD_GPU_OPERATIONS=NCCL HOROVOD_NCCL_LINK=SHARED HOROVOD_WITHOUT_MPI=1 HOROVOD_WITH_PYTORCH=1 pip wheel --no-cache-dir . && \
         rm -rf /var/lib/apt/lists/*
@@ -74,7 +74,7 @@ RUN mkdir -p pytorch-ignite-examples && \
     rm -rf .git
 
 # Horovod
-RUN conda install -y nccl=2.8 -c conda-forge
+RUN conda install -y nccl=2.11 -c conda-forge
 
 ENV LD_LIBRARY_PATH=/opt/conda/lib:$LD_LIBRARY_PATH
 

diff --git a/docker/hvd/Dockerfile.hvd-apex-nlp b/docker/hvd/Dockerfile.hvd-apex-nlp
@@ -2,7 +2,6 @@
 FROM pytorchignite/hvd-apex:latest
 
 # Ignite NLP dependencies
-RUN pip install --upgrade --no-cache-dir torchtext \
-                                         transformers \
+RUN pip install --upgrade --no-cache-dir transformers \
                                          spacy \
                                          nltk
diff --git a/docker/hvd/Dockerfile.hvd-base b/docker/hvd/Dockerfile.hvd-base
@@ -10,7 +10,7 @@ ARG HVD_VERSION
 # Build Horovod
 RUN apt-get update && apt-get install -y git && \
         git clone --recursive --depth 1 --branch ${HVD_VERSION} https://github.com/horovod/horovod.git /horovod && \
-        conda install -y cmake nccl=2.8 -c conda-forge && \
+        conda install -y cmake nccl=2.11 -c conda-forge && \
         cd /horovod && \
         HOROVOD_GPU_OPERATIONS=NCCL HOROVOD_NCCL_LINK=SHARED HOROVOD_WITHOUT_MPI=1 HOROVOD_WITH_PYTORCH=1 pip wheel --no-cache-dir . && \
         rm -rf /var/lib/apt/lists/*
@@ -53,7 +53,7 @@ RUN mkdir -p pytorch-ignite-examples && \
     rm -rf .git
 
 # Horovod
-RUN conda install -y nccl=2.8 -c conda-forge
+RUN conda install -y nccl=2.11 -c conda-forge
 
 ENV LD_LIBRARY_PATH=/opt/conda/lib:$LD_LIBRARY_PATH
 

diff --git a/docker/hvd/Dockerfile.hvd-nlp b/docker/hvd/Dockerfile.hvd-nlp
@@ -2,7 +2,6 @@
 FROM pytorchignite/hvd-base:latest
 
 # Ignite NLP dependencies
-RUN pip install --upgrade --no-cache-dir torchtext \
-                                         transformers \
+RUN pip install --upgrade --no-cache-dir transformers \
                                          spacy \
                                          nltk
diff --git a/docker/main/Dockerfile.apex-nlp b/docker/main/Dockerfile.apex-nlp
@@ -2,7 +2,6 @@
 FROM pytorchignite/apex:latest
 
 # Ignite NLP dependencies
-RUN pip install --upgrade --no-cache-dir torchtext \
-                                         transformers \
+RUN pip install --upgrade --no-cache-dir transformers \
                                          spacy \
                                          nltk
diff --git a/docker/main/Dockerfile.nlp b/docker/main/Dockerfile.nlp
@@ -2,7 +2,6 @@
 FROM pytorchignite/base:latest
 
 # Ignite NLP dependencies
-RUN pip install --upgrade --no-cache-dir torchtext \
-                                         transformers \
+RUN pip install --upgrade --no-cache-dir transformers \
                                          spacy \
                                          nltk
diff --git a/docker/msdp/Dockerfile.msdp-apex-nlp b/docker/msdp/Dockerfile.msdp-apex-nlp
@@ -2,7 +2,6 @@
 FROM pytorchignite/msdp-apex:latest
 
 # Ignite NLP dependencies
-RUN pip install --upgrade --no-cache-dir torchtext \
-                                         transformers \
+RUN pip install --upgrade --no-cache-dir transformers \
                                          spacy \
                                          nltk
diff --git a/docker/test_image.py b/docker/test_image.py
@@ -108,5 +108,8 @@ def main():
     if "vision" in image_type:
         run_python_cmd("import cv2")
 
+    if "nlp" in image_type:
+        run_python_cmd("import torchtext, transformers")
+
     if "apex" in image_type:
         run_python_cmd("import apex")