From 31bf209013851d08b8e11d5beba4afc799fb409f Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Thu, 1 Apr 2021 20:14:21 +0100 Subject: [PATCH 1/6] update to use pytorch2103 Signed-off-by: Wenqi Li --- .github/workflows/cron.yml | 4 ++-- .github/workflows/pythonapp.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 761b1f7ebc..3562672232 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -60,7 +60,7 @@ jobs: cron-pt-image: if: github.repository == 'Project-MONAI/MONAI' container: - image: nvcr.io/nvidia/pytorch:21.02-py3 # testing with the latest pytorch base image + image: nvcr.io/nvidia/pytorch:21.03-py3 # testing with the latest pytorch base image options: "--gpus all" runs-on: [self-hosted, linux, x64, common] steps: @@ -133,7 +133,7 @@ jobs: if: github.repository == 'Project-MONAI/MONAI' needs: cron-gpu # so that monai itself is verified first container: - image: nvcr.io/nvidia/pytorch:21.02-py3 # testing with the latest pytorch base image + image: nvcr.io/nvidia/pytorch:21.03-py3 # testing with the latest pytorch base image options: "--gpus all --ipc=host" runs-on: [self-hosted, linux, x64, common] steps: diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e5803028a0..738d657211 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -186,7 +186,7 @@ jobs: - environment: PT18+CUDA112 # we explicitly set pytorch to -h to avoid pip install error pytorch: "-h" - base: "nvcr.io/nvidia/pytorch:21.02-py3" + base: "nvcr.io/nvidia/pytorch:21.03-py3" container: image: ${{ matrix.base }} options: --gpus all From c54c48ef8c8de9168cee8216fd9686958968e723 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Thu, 1 Apr 2021 20:15:36 +0100 Subject: [PATCH 2/6] temp tests Signed-off-by: Wenqi Li --- .github/workflows/cron.yml | 5 +++-- .github/workflows/pythonapp.yml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 3562672232..40496cbd5e 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -1,8 +1,9 @@ name: crons on: - schedule: - - cron: "0 2 * * *" # at 02:00 UTC + push: + branches: + - test-pt-2103 jobs: cron-gpu: diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 738d657211..afa4de1eaf 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - test-pt-2103 pull_request: jobs: From 7bba39e9bd2773930fa93d416b4911c6126a3b7a Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Thu, 1 Apr 2021 19:36:36 +0100 Subject: [PATCH 3/6] version of flake8-bugbear Signed-off-by: Wenqi Li --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dfa1eb1853..29bbcba8ae 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ scikit-image>=0.14.2 tqdm>=4.47.0 lmdb flake8>=3.8.1 -flake8-bugbear +flake8-bugbear==21.3.2 flake8-comprehensions flake8-executable flake8-pyi From 1e4fae5992ff116d8b6b32ee6d8841682a69b005 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Fri, 2 Apr 2021 09:03:09 +0100 Subject: [PATCH 4/6] Revert "version of flake8-bugbear" This reverts commit 7bba39e9bd2773930fa93d416b4911c6126a3b7a. Signed-off-by: Wenqi Li --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 29bbcba8ae..dfa1eb1853 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ scikit-image>=0.14.2 tqdm>=4.47.0 lmdb flake8>=3.8.1 -flake8-bugbear==21.3.2 +flake8-bugbear flake8-comprehensions flake8-executable flake8-pyi From 2f5c54cd8f986c0511de7f310a24749d5b61e6e4 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Fri, 2 Apr 2021 09:03:33 +0100 Subject: [PATCH 5/6] Revert "temp tests" This reverts commit c54c48ef8c8de9168cee8216fd9686958968e723. Signed-off-by: Wenqi Li --- .github/workflows/cron.yml | 5 ++--- .github/workflows/pythonapp.yml | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 40496cbd5e..3562672232 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -1,9 +1,8 @@ name: crons on: - push: - branches: - - test-pt-2103 + schedule: + - cron: "0 2 * * *" # at 02:00 UTC jobs: cron-gpu: diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index afa4de1eaf..738d657211 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -5,7 +5,6 @@ on: push: branches: - master - - test-pt-2103 pull_request: jobs: From b0fbe8a3982a00cb9aa9026954f3c8b27120e2de Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Fri, 2 Apr 2021 09:04:27 +0100 Subject: [PATCH 6/6] update default base image Signed-off-by: Wenqi Li --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 57ea567869..54d1f02275 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # To build with a different base image # please run `docker build` using the `--build-arg PYTORCH_IMAGE=...` flag. -ARG PYTORCH_IMAGE=nvcr.io/nvidia/pytorch:21.02-py3 +ARG PYTORCH_IMAGE=nvcr.io/nvidia/pytorch:21.03-py3 FROM ${PYTORCH_IMAGE} LABEL maintainer="monai.contact@gmail.com"