From 547997b26e42c349566d598af4a93d286dca4b1c Mon Sep 17 00:00:00 2001 From: Charles Frye Date: Fri, 24 Nov 2023 20:59:25 +0000 Subject: [PATCH] updates pytorch version --- environment.yml | 3 +-- requirements/dev.txt | 56 +++++++++++++++++------------------------- requirements/prod.in | 4 +-- requirements/prod.txt | 57 ++++++++++++++++++------------------------- 4 files changed, 50 insertions(+), 70 deletions(-) diff --git a/environment.yml b/environment.yml index b4d9f2b..1c13993 100644 --- a/environment.yml +++ b/environment.yml @@ -2,10 +2,9 @@ name: fsdl-text-recognizer-2022 channels: - pytorch - nvidia - - conda-forge - defaults dependencies: - python=3.10 # versioned to match Google Colab # version also pinned in Dockerfile - - pytorch=2.0.* # versioned to match Google Colab + - pytorch=2.1.1 # versioned to match Google Colab - pytorch-cuda=11.8 # versioned to match Google Colab - pip=23.1.2 # versioned to match Google Colab # version also pinned in Dockerfile diff --git a/requirements/dev.txt b/requirements/dev.txt index 18ace9b..ef5113c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -71,10 +71,6 @@ click==8.1.7 # -c requirements/prod.txt # nltk # wandb -cmake==3.27.2 - # via - # -c requirements/prod.txt - # triton comm==0.1.4 # via # ipykernel @@ -136,6 +132,7 @@ fsspec[http]==2023.6.0 # via # -c requirements/prod.txt # pytorch-lightning + # torch gitdb==4.0.10 # via gitpython gitpython==3.1.32 @@ -233,10 +230,6 @@ kiwisolver==1.4.5 # via # -c requirements/prod.txt # matplotlib -lit==16.0.6 - # via - # -c requirements/prod.txt - # triton lxml==4.9.3 # via nbconvert markdown==3.4.4 @@ -315,49 +308,55 @@ numpy==1.25.2 # seaborn # tensorboard # torchmetrics -nvidia-cublas-cu11==11.10.3.66 +nvidia-cublas-cu12==12.1.3.1 # via # -c requirements/prod.txt - # nvidia-cudnn-cu11 - # nvidia-cusolver-cu11 + # nvidia-cudnn-cu12 + # nvidia-cusolver-cu12 # torch -nvidia-cuda-cupti-cu11==11.7.101 +nvidia-cuda-cupti-cu12==12.1.105 # via # -c requirements/prod.txt # torch -nvidia-cuda-nvrtc-cu11==11.7.99 +nvidia-cuda-nvrtc-cu12==12.1.105 # via # -c requirements/prod.txt # torch -nvidia-cuda-runtime-cu11==11.7.99 +nvidia-cuda-runtime-cu12==12.1.105 # via # -c requirements/prod.txt # torch -nvidia-cudnn-cu11==8.5.0.96 +nvidia-cudnn-cu12==8.9.2.26 # via # -c requirements/prod.txt # torch -nvidia-cufft-cu11==10.9.0.58 +nvidia-cufft-cu12==11.0.2.54 # via # -c requirements/prod.txt # torch -nvidia-curand-cu11==10.2.10.91 +nvidia-curand-cu12==10.3.2.106 # via # -c requirements/prod.txt # torch -nvidia-cusolver-cu11==11.4.0.1 +nvidia-cusolver-cu12==11.4.5.107 # via # -c requirements/prod.txt # torch -nvidia-cusparse-cu11==11.7.4.91 +nvidia-cusparse-cu12==12.1.0.106 # via # -c requirements/prod.txt + # nvidia-cusolver-cu12 # torch -nvidia-nccl-cu11==2.14.3 +nvidia-nccl-cu12==2.18.1 # via # -c requirements/prod.txt # torch -nvidia-nvtx-cu11==11.7.91 +nvidia-nvjitlink-cu12==12.3.101 + # via + # -c requirements/prod.txt + # nvidia-cusolver-cu12 + # nvidia-cusparse-cu12 +nvidia-nvtx-cu12==12.1.105 # via # -c requirements/prod.txt # torch @@ -574,12 +573,11 @@ tomli==2.0.1 # via # coverage # pytest -torch==2.0.1 +torch==2.1.1 # via # -c requirements/prod.txt # pytorch-lightning # torchmetrics - # triton torchmetrics==0.7.3 # via # -r requirements/dev.in @@ -614,7 +612,7 @@ traitlets==5.9.0 # nbconvert # nbformat # notebook -triton==2.0.0 +triton==2.1.0 # via # -c requirements/prod.txt # torch @@ -652,15 +650,7 @@ websocket-client==1.6.2 werkzeug==2.3.7 # via tensorboard wheel==0.41.2 - # via - # -c requirements/prod.txt - # nvidia-cublas-cu11 - # nvidia-cuda-cupti-cu11 - # nvidia-cuda-runtime-cu11 - # nvidia-curand-cu11 - # nvidia-cusparse-cu11 - # nvidia-nvtx-cu11 - # tensorboard + # via tensorboard widgetsnbextension==4.0.8 # via ipywidgets yarl==1.9.2 diff --git a/requirements/prod.in b/requirements/prod.in index f527a54..840da58 100644 --- a/requirements/prod.in +++ b/requirements/prod.in @@ -11,5 +11,5 @@ gradio==3.40.1 # versioned to match Google Colab up to minor Jinja2>=3.1,<3.2 pillow>=9.4,<9.5 -torch>=2.0,<2.1 -torchvision>=0.15,<0.16 +torch>=2.1,<2.2 +torchvision>=0.16,<0.17 diff --git a/requirements/prod.txt b/requirements/prod.txt index 987b392..c4c210c 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -53,8 +53,6 @@ click==8.1.7 # uvicorn click-spinner==0.1.10 # via gantry -cmake==3.27.2 - # via triton colorama==0.4.6 # via # gantry @@ -87,6 +85,7 @@ fsspec==2023.6.0 # via # gradio-client # huggingface-hub + # torch gantry==0.4.9 # via -r requirements/prod.in gradio==3.40.1 @@ -141,8 +140,6 @@ kiwisolver==1.4.5 # via matplotlib linkify-it-py==2.0.2 # via markdown-it-py -lit==16.0.6 - # via triton log-symbols==0.0.14 # via halo markdown-it-py[linkify]==2.2.0 @@ -186,30 +183,36 @@ numpy==1.25.2 # matplotlib # pandas # torchvision -nvidia-cublas-cu11==11.10.3.66 +nvidia-cublas-cu12==12.1.3.1 # via - # nvidia-cudnn-cu11 - # nvidia-cusolver-cu11 + # nvidia-cudnn-cu12 + # nvidia-cusolver-cu12 # torch -nvidia-cuda-cupti-cu11==11.7.101 - # via torch -nvidia-cuda-nvrtc-cu11==11.7.99 +nvidia-cuda-cupti-cu12==12.1.105 # via torch -nvidia-cuda-runtime-cu11==11.7.99 +nvidia-cuda-nvrtc-cu12==12.1.105 # via torch -nvidia-cudnn-cu11==8.5.0.96 +nvidia-cuda-runtime-cu12==12.1.105 # via torch -nvidia-cufft-cu11==10.9.0.58 +nvidia-cudnn-cu12==8.9.2.26 # via torch -nvidia-curand-cu11==10.2.10.91 +nvidia-cufft-cu12==11.0.2.54 # via torch -nvidia-cusolver-cu11==11.4.0.1 +nvidia-curand-cu12==10.3.2.106 # via torch -nvidia-cusparse-cu11==11.7.4.91 +nvidia-cusolver-cu12==11.4.5.107 # via torch -nvidia-nccl-cu11==2.14.3 +nvidia-cusparse-cu12==12.1.0.106 + # via + # nvidia-cusolver-cu12 + # torch +nvidia-nccl-cu12==2.18.1 # via torch -nvidia-nvtx-cu11==11.7.91 +nvidia-nvjitlink-cu12==12.3.101 + # via + # nvidia-cusolver-cu12 + # nvidia-cusparse-cu12 +nvidia-nvtx-cu12==12.1.105 # via torch orjson==3.9.5 # via gradio @@ -308,19 +311,18 @@ termcolor==2.3.0 # via halo toolz==0.12.0 # via altair -torch==2.0.1 +torch==2.1.1 # via # -r requirements/prod.in # torchvision - # triton -torchvision==0.15.2 +torchvision==0.16.1 # via -r requirements/prod.in tqdm==4.66.1 # via # -r requirements/prod.in # gantry # huggingface-hub -triton==2.0.0 +triton==2.1.0 # via torch typeguard==2.13.3 # via gantry @@ -352,18 +354,7 @@ websockets==11.0.3 # via # gradio # gradio-client -wheel==0.41.2 - # via - # nvidia-cublas-cu11 - # nvidia-cuda-cupti-cu11 - # nvidia-cuda-runtime-cu11 - # nvidia-curand-cu11 - # nvidia-cusparse-cu11 - # nvidia-nvtx-cu11 yarl==1.9.2 # via aiohttp zipp==3.16.2 # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools