From 426cd4c387b092ab6fce5acb66c1b6076cc1dfa0 Mon Sep 17 00:00:00 2001 From: Joshua Kim Date: Wed, 2 Aug 2023 13:21:09 +0800 Subject: [PATCH 1/3] draft upgrade to torch 1.13.1 --- Dockerfile | 2 +- requirements.txt | 4 ++-- scripts/install_torch_amd.sh | 2 +- src/marqo/version.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 921d73d31..0bd7b4e2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG CUDA_VERSION=11.4.3 +ARG CUDA_VERSION=11.7 FROM nvidia/cuda:${CUDA_VERSION}-cudnn8-runtime-ubuntu20.04 as cuda_image FROM ubuntu:20.04 VOLUME /var/lib/docker diff --git a/requirements.txt b/requirements.txt index cdcb069a6..c822a6aa8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,8 +12,8 @@ more_itertools boto3==1.25.4 botocore==1.28.4 nltk==3.7 -torch==1.12.1 -torchvision==0.13.1 +torch==1.13.1 +torchvision==0.14.1 Pillow==9.3.0 numpy==1.23.4 validators==0.20.0 diff --git a/scripts/install_torch_amd.sh b/scripts/install_torch_amd.sh index 33f9ec316..6ef38b57c 100644 --- a/scripts/install_torch_amd.sh +++ b/scripts/install_torch_amd.sh @@ -7,5 +7,5 @@ if ! [[ "$TARGETPLATFORM" ]]; then fi if [[ "$TARGETPLATFORM" != "linux/arm64" ]]; then - pip3 install --no-cache-dir torch==1.12.1+cu113 torchvision==0.13.1+cu113 torchaudio==0.12.1 --extra-index-url https://download.pytorch.org/whl/cu113 --upgrade + pip3 install --no-cache-dir torch==1.13.0+cu117 torchvision==0.14.0+cu117 torchaudio==0.13.0 --extra-index-url https://download.pytorch.org/whl/cu117 --upgrade fi \ No newline at end of file diff --git a/src/marqo/version.py b/src/marqo/version.py index 850d8532b..b531bcda2 100644 --- a/src/marqo/version.py +++ b/src/marqo/version.py @@ -1,4 +1,4 @@ -__version__ = "1.1.0" +__version__ = "1.1.0-torch1-13-1" def get_version() -> str: From c231b8e8c644dc6f06fb87d7b9a582d7e6ca061b Mon Sep 17 00:00:00 2001 From: Joshua Kim Date: Wed, 2 Aug 2023 15:25:51 +0800 Subject: [PATCH 2/3] change cuda version to 11.7.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0bd7b4e2d..0008cc9d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG CUDA_VERSION=11.7 +ARG CUDA_VERSION=11.7.1 FROM nvidia/cuda:${CUDA_VERSION}-cudnn8-runtime-ubuntu20.04 as cuda_image FROM ubuntu:20.04 VOLUME /var/lib/docker From 970ec29e1c55b68ae6648d0422ca65f91e5d329f Mon Sep 17 00:00:00 2001 From: Joshua Kim Date: Wed, 2 Aug 2023 16:23:02 +0800 Subject: [PATCH 3/3] change marqo version to pep 440 compliant --- src/marqo/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/marqo/version.py b/src/marqo/version.py index b531bcda2..88e69c66d 100644 --- a/src/marqo/version.py +++ b/src/marqo/version.py @@ -1,4 +1,4 @@ -__version__ = "1.1.0-torch1-13-1" +__version__ = "1.1.0+torch1.13.1" def get_version() -> str: