From a4c8e9d21c48ac59352e179b0aa2919f49495be7 Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 24 May 2022 10:45:30 +0200 Subject: [PATCH 1/5] update docker --- dockers/nvidia/Dockerfile | 13 ++++++------- dockers/release/Dockerfile | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dockers/nvidia/Dockerfile b/dockers/nvidia/Dockerfile index 792835c574ada..1869c4a14101d 100644 --- a/dockers/nvidia/Dockerfile +++ b/dockers/nvidia/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PYTORCH_VERSION=21.11 +ARG PYTORCH_VERSION=22.04 # https://docs.nvidia.com/deeplearning/frameworks/pytorch-release-notes FROM nvcr.io/nvidia/pytorch:${PYTORCH_VERSION}-py3 @@ -37,20 +37,19 @@ RUN \ cd .. ; \ fi && \ # save the examples - mv pytorch-lightning/_notebooks notebooks && \ + mv pytorch-lightning/_notebooks/.notebooks/ notebooks && \ mv pytorch-lightning/pl_examples . && \ # Installations \ pip install -q fire && \ - python ./pytorch-lightning/.actions/assistant.py requirements_prune_pkgs horovod --req_files ./pytorch-lightning/requirements/extra.txt && \ pip install "Pillow>=8.2, !=8.3.0" "cryptography>=3.4" "py>=1.10" --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install -r ./pytorch-lightning/requirements/extra.txt --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install -r ./pytorch-lightning/requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install ./pytorch-lightning --no-cache-dir && \ + pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ + pip install -r ./requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ rm -rf pytorch-lightning && \ - pip install jupyterlab[all] -U && \ pip list +RUN pip install jupyterlab[all] -U + RUN pip install lightning-grid -U && \ pip install "py>=1.10" "protobuf>=3.15.6" --upgrade-strategy only-if-needed diff --git a/dockers/release/Dockerfile b/dockers/release/Dockerfile index f4083f2dd42fc..9dba30934f668 100644 --- a/dockers/release/Dockerfile +++ b/dockers/release/Dockerfile @@ -36,7 +36,7 @@ RUN \ mv pytorch-lightning-*/ pytorch-lightning ; \ rm *.zip ; \ fi && \ - pip install ./pytorch-lightning["extra"] --no-cache-dir && \ + pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ rm -rf pytorch-lightning RUN python --version && \ From 9e9602ce973bd1323dd7ef201caf0f7f43b0fd4b Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 24 May 2022 11:56:51 +0200 Subject: [PATCH 2/5] ... --- dockers/nvidia/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dockers/nvidia/Dockerfile b/dockers/nvidia/Dockerfile index 1869c4a14101d..446ba2ad8438f 100644 --- a/dockers/nvidia/Dockerfile +++ b/dockers/nvidia/Dockerfile @@ -32,7 +32,7 @@ RUN \ rm -rf pytorch-lightning ; \ git clone https://github.com/PyTorchLightning/pytorch-lightning.git ; \ cd pytorch-lightning ; \ - git checkout ${LIGHTNING_VERSION} ; \ + git checkout tags/${LIGHTNING_VERSION} ; \ git submodule update --init --recursive ; \ cd .. ; \ fi && \ @@ -44,7 +44,8 @@ RUN \ pip install -q fire && \ pip install "Pillow>=8.2, !=8.3.0" "cryptography>=3.4" "py>=1.10" --no-cache-dir --upgrade-strategy only-if-needed && \ pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install -r ./requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ + pip install -r ./pytorch-lightning/requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ + pip uninstall -y codcov && \ rm -rf pytorch-lightning && \ pip list From 75011eb37c37d1540e469b49e43df169a68fa953 Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 24 May 2022 13:04:19 +0200 Subject: [PATCH 3/5] . --- dockers/nvidia/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockers/nvidia/Dockerfile b/dockers/nvidia/Dockerfile index 446ba2ad8438f..550a1326c1d51 100644 --- a/dockers/nvidia/Dockerfile +++ b/dockers/nvidia/Dockerfile @@ -45,7 +45,6 @@ RUN \ pip install "Pillow>=8.2, !=8.3.0" "cryptography>=3.4" "py>=1.10" --no-cache-dir --upgrade-strategy only-if-needed && \ pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ pip install -r ./pytorch-lightning/requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ - pip uninstall -y codcov && \ rm -rf pytorch-lightning && \ pip list From 42c676c0cad2376ccaa1cf3477d3de1e46ee164e Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Tue, 24 May 2022 13:49:45 +0200 Subject: [PATCH 4/5] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Akihiro Nitta Co-authored-by: Carlos Mocholí --- dockers/nvidia/Dockerfile | 2 +- dockers/release/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/nvidia/Dockerfile b/dockers/nvidia/Dockerfile index 550a1326c1d51..043e02c00f655 100644 --- a/dockers/nvidia/Dockerfile +++ b/dockers/nvidia/Dockerfile @@ -32,7 +32,7 @@ RUN \ rm -rf pytorch-lightning ; \ git clone https://github.com/PyTorchLightning/pytorch-lightning.git ; \ cd pytorch-lightning ; \ - git checkout tags/${LIGHTNING_VERSION} ; \ + git checkout ${LIGHTNING_VERSION} ; \ git submodule update --init --recursive ; \ cd .. ; \ fi && \ diff --git a/dockers/release/Dockerfile b/dockers/release/Dockerfile index 9dba30934f668..a0ba3a4a41c37 100644 --- a/dockers/release/Dockerfile +++ b/dockers/release/Dockerfile @@ -36,7 +36,7 @@ RUN \ mv pytorch-lightning-*/ pytorch-lightning ; \ rm *.zip ; \ fi && \ - pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ + pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir && \ rm -rf pytorch-lightning RUN python --version && \ From 32163b1a56ba76b4425b69a016a75c576ad86b37 Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 24 May 2022 13:51:12 +0200 Subject: [PATCH 5/5] strategy --- dockers/nvidia/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/nvidia/Dockerfile b/dockers/nvidia/Dockerfile index 043e02c00f655..6848f6cf34eae 100644 --- a/dockers/nvidia/Dockerfile +++ b/dockers/nvidia/Dockerfile @@ -42,9 +42,9 @@ RUN \ # Installations \ pip install -q fire && \ - pip install "Pillow>=8.2, !=8.3.0" "cryptography>=3.4" "py>=1.10" --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir --upgrade-strategy only-if-needed && \ - pip install -r ./pytorch-lightning/requirements/examples.txt --no-cache-dir --upgrade-strategy only-if-needed && \ + pip install "Pillow>=8.2, !=8.3.0" "cryptography>=3.4" "py>=1.10" --no-cache-dir && \ + pip install ./pytorch-lightning["extra","loggers","strategies"] --no-cache-dir && \ + pip install -r ./pytorch-lightning/requirements/examples.txt --no-cache-dir && \ rm -rf pytorch-lightning && \ pip list