From df78af3a9a8c5238fcdca1f1b8a62068e9732b25 Mon Sep 17 00:00:00 2001 From: jirka Date: Wed, 19 May 2021 09:48:55 +0200 Subject: [PATCH 1/2] docker use $(nproc) --- dockers/base-conda/Dockerfile | 4 ++-- dockers/base-cuda/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dockers/base-conda/Dockerfile b/dockers/base-conda/Dockerfile index 6ac4b2c0e6bee..c596f5c6a8c5b 100644 --- a/dockers/base-conda/Dockerfile +++ b/dockers/base-conda/Dockerfile @@ -68,8 +68,8 @@ ENV \ HOROVOD_WITHOUT_MXNET=1 \ HOROVOD_WITH_GLOO=1 \ HOROVOD_WITHOUT_MPI=1 \ - # MAKEFLAGS="-j$(nproc)" \ - MAKEFLAGS="-j1" \ + MAKEFLAGS="-j$(nproc)" \ + # MAKEFLAGS="-j1" \ TORCH_CUDA_ARCH_LIST="3.7;5.0;6.0;7.0;7.5" \ CONDA_ENV=lightning diff --git a/dockers/base-cuda/Dockerfile b/dockers/base-cuda/Dockerfile index cf602be72352b..57dc73e287891 100644 --- a/dockers/base-cuda/Dockerfile +++ b/dockers/base-cuda/Dockerfile @@ -68,14 +68,14 @@ RUN apt-get update -qq && \ rm -rf /var/lib/apt/lists/* ENV \ - HOROVOD_GPU_OPERATIONS=NCCL \ +export HOROVOD_GPU_OPERATIONS=NCCL \ HOROVOD_WITH_PYTORCH=1 \ HOROVOD_WITHOUT_TENSORFLOW=1 \ HOROVOD_WITHOUT_MXNET=1 \ HOROVOD_WITH_GLOO=1 \ HOROVOD_WITHOUT_MPI=1 \ - # MAKEFLAGS="-j$(nproc)" \ - MAKEFLAGS="-j1" \ + MAKEFLAGS="-j$(nproc)" \ + # MAKEFLAGS="-j1" \ TORCH_CUDA_ARCH_LIST="3.7;5.0;6.0;7.0;7.5" COPY ./requirements.txt requirements.txt From b6bc0b6fb91cd258a17c89dba3ce4d8af62ba0a1 Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Wed, 19 May 2021 10:42:09 +0200 Subject: [PATCH 2/2] Update typo Co-authored-by: Roger Shieh --- dockers/base-cuda/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/base-cuda/Dockerfile b/dockers/base-cuda/Dockerfile index 57dc73e287891..e16971bdc2a1a 100644 --- a/dockers/base-cuda/Dockerfile +++ b/dockers/base-cuda/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update -qq && \ rm -rf /var/lib/apt/lists/* ENV \ -export HOROVOD_GPU_OPERATIONS=NCCL \ + HOROVOD_GPU_OPERATIONS=NCCL \ HOROVOD_WITH_PYTORCH=1 \ HOROVOD_WITHOUT_TENSORFLOW=1 \ HOROVOD_WITHOUT_MXNET=1 \