From afec8249be102b010b8dcc35e2a194cba6c42372 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Mar 2022 13:03:20 +0000 Subject: [PATCH 1/6] Update torch requirement from <1.11.0,>=1.6.0 to >=1.6.0,<1.12.0 Updates the requirements on [torch](https://github.com/pytorch/pytorch) to permit the latest version. - [Release notes](https://github.com/pytorch/pytorch/releases) - [Changelog](https://github.com/pytorch/pytorch/blob/master/RELEASE.md) - [Commits](https://github.com/pytorch/pytorch/compare/v1.6.0...v1.11.0) --- updated-dependencies: - dependency-name: torch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8cdf4adef52..ebc41c58f01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ################################ ###### Core dependencies ####### ################################ -torch>=1.6.0,<1.11.0 +torch>=1.6.0,<1.12.0 torchvision>=0.8.1,<0.12.0 cached-path>=1.0.2,<1.2.0 fairscale==0.4.6 From 65180c2d3a7b75b61b121288414b7dc132c45fab Mon Sep 17 00:00:00 2001 From: Akshita Bhagia Date: Fri, 11 Mar 2022 16:23:58 -0800 Subject: [PATCH 2/6] combine torch-related package upgrades --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ebc41c58f01..c7e6499f541 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ ###### Core dependencies ####### ################################ torch>=1.6.0,<1.12.0 -torchvision>=0.8.1,<0.12.0 +torchvision>=0.8.1,<0.13.0 cached-path>=1.0.2,<1.2.0 fairscale==0.4.6 jsonnet>=0.10.0 ; sys.platform != 'win32' From 27caba51446d196a22edd15846dc7df629f88c9c Mon Sep 17 00:00:00 2001 From: Akshita Bhagia Date: Fri, 11 Mar 2022 16:24:16 -0800 Subject: [PATCH 3/6] update ci torch version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64f26efa2f0..689e9014e58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ on: env: # NOTE: Need to update `TORCH_VERSION`, and `TORCH_*_INSTALL` for new torch releases. - TORCH_VERSION: 1.10.0 + TORCH_VERSION: 1.11.0 TORCH_CPU_INSTALL: conda install pytorch torchvision torchaudio cpuonly -c pytorch TORCH_GPU_INSTALL: conda install pytorch torchvision torchaudio cudatoolkit=11.3 -c pytorch # Change this to invalidate existing cache. From 4324b1d489bf29c572c6cf92e6d43c9c0ad988b0 Mon Sep 17 00:00:00 2001 From: Akshita Bhagia Date: Fri, 11 Mar 2022 16:29:14 -0800 Subject: [PATCH 4/6] update dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9015c251978..4c12d858f09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # It's built from a wheel installation of allennlp using the base images from # https://github.com/allenai/docker-images/pkgs/container/pytorch -ARG TORCH=1.10.0-cuda11.3 +ARG TORCH=1.11.0-cuda11.3 FROM ghcr.io/allenai/pytorch:${TORCH} RUN apt-get update && apt-get install -y \ From 531b6d2574fbb49bb1b74894234596587c1f315a Mon Sep 17 00:00:00 2001 From: Akshita Bhagia Date: Fri, 11 Mar 2022 16:35:57 -0800 Subject: [PATCH 5/6] invalidate cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 689e9014e58..0bd3624474d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ env: TORCH_CPU_INSTALL: conda install pytorch torchvision torchaudio cpuonly -c pytorch TORCH_GPU_INSTALL: conda install pytorch torchvision torchaudio cudatoolkit=11.3 -c pytorch # Change this to invalidate existing cache. - CACHE_PREFIX: v10 + CACHE_PREFIX: v11 # Disable tokenizers parallelism because this doesn't help, and can cause issues in distributed tests. TOKENIZERS_PARALLELISM: 'false' # Disable multithreading with OMP because this can lead to dead-locks in distributed tests. From d68be214ca2d86f83231158555bc4355805a75d9 Mon Sep 17 00:00:00 2001 From: Akshita Bhagia Date: Fri, 11 Mar 2022 16:39:07 -0800 Subject: [PATCH 6/6] update Makefile and Dockerfile.test --- Dockerfile.test | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index d5a5661170d..ca3f34fa247 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,6 +1,6 @@ # Used to build an image for running tests. -ARG TORCH=1.10.0-cuda11.3 +ARG TORCH=1.11.0-cuda11.3 FROM ghcr.io/allenai/pytorch:${TORCH} RUN apt-get update && apt-get install -y \ diff --git a/Makefile b/Makefile index d59d4a20862..5ada5014814 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ MD_DOCS_TGT = site/ MD_DOCS_EXTRAS = $(addprefix $(MD_DOCS_ROOT),README.md CHANGELOG.md CONTRIBUTING.md) TORCH_INSTALL = pip install torch torchvision -DOCKER_TORCH_VERSION = 1.10.0-cuda11.3 -DOCKER_TEST_TORCH_VERSION = 1.10.0-cuda11.3 +DOCKER_TORCH_VERSION = 1.11.0-cuda11.3 +DOCKER_TEST_TORCH_VERSION = 1.11.0-cuda11.3 DOCKER_TAG = latest DOCKER_IMAGE_NAME = allennlp/allennlp:$(DOCKER_TAG)