downgrade & pin torch version, fix setup #507

- torch 2.0.1 wouldn't detect my locally installed cuda libs (various .so's "missing from system path") - now cublas + cuda seem to be installed as deps? - this might be a quirk of my setup (Arch Linux). fwiw, i could then uninstall my local cuda package... - i poked this until it worked. idk if it makes sense.
okfde · May 24, 2024 · fbb17a4 · fbb17a4
1 parent b265155
commit fbb17a4
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 11 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -59,8 +59,6 @@ alabaster==0.7.13
     # via sphinx
 amqp==5.1.1
     # via kombu
-appnope==0.1.3
-    # via ipython
 asgiref==3.7.1
     # via
     #   channels
@@ -134,6 +132,8 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
+cmake==3.29.3
+    # via triton
 coreapi==2.3.3
     # via -r requirements.in
 coreschema==0.0.4
@@ -448,6 +448,7 @@ fido2==1.1.1
 filelock==3.12.0
     # via
     #   torch
+    #   triton
     #   virtualenv
 flake8==6.0.0
     # via
@@ -539,6 +540,8 @@ jwcrypto==1.4.2
     # via django-oauth-toolkit
 kombu==5.2.4
     # via celery
+lit==18.1.6
+    # via triton
 lxml==4.9.2
     # via
     #   -r requirements.in
@@ -586,6 +589,31 @@ numpy==1.24.3
     #   pandas
     #   torchvision
     #   webp
+nvidia-cublas-cu11==11.10.3.66
+    # via
+    #   nvidia-cudnn-cu11
+    #   nvidia-cusolver-cu11
+    #   torch
+nvidia-cuda-cupti-cu11==11.7.101
+    # via torch
+nvidia-cuda-nvrtc-cu11==11.7.99
+    # via torch
+nvidia-cuda-runtime-cu11==11.7.99
+    # via torch
+nvidia-cudnn-cu11==8.5.0.96
+    # via torch
+nvidia-cufft-cu11==10.9.0.58
+    # via torch
+nvidia-curand-cu11==10.2.10.91
+    # via torch
+nvidia-cusolver-cu11==11.4.0.1
+    # via torch
+nvidia-cusparse-cu11==11.7.4.91
+    # via torch
+nvidia-nccl-cu11==2.14.3
+    # via torch
+nvidia-nvtx-cu11==11.7.91
+    # via torch
 oauthlib==3.2.2
     # via django-oauth-toolkit
 openpyxl==3.1.2
@@ -846,16 +874,19 @@ tomli==2.0.1
     #   black
     #   ipdb
     #   pytest
-torch==2.0.1
+torch==2.0.0
     # via
     #   -r requirements.in
     #   torchvision
-torchvision==0.15.2
+    #   triton
+torchvision==0.15.1
     # via -r requirements.in
 traitlets==5.9.0
     # via
     #   ipython
     #   matplotlib-inline
+triton==2.0.0
+    # via torch
 typing-extensions==4.6.1
     # via
     #   asgiref
@@ -912,6 +943,14 @@ webp==0.1.6
     # via -r requirements.in
 websockets==11.0.3
     # via -r requirements.in
+wheel==0.43.0
+    # via
+    #   nvidia-cublas-cu11
+    #   nvidia-cuda-cupti-cu11
+    #   nvidia-cuda-runtime-cu11
+    #   nvidia-curand-cu11
+    #   nvidia-cusparse-cu11
+    #   nvidia-nvtx-cu11
 wrapt==1.15.0
     # via deprecated
 xlrd==2.0.1

diff --git a/requirements-production.txt b/requirements-production.txt
@@ -131,6 +131,8 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
+cmake==3.29.3
+    # via triton
 coreapi==2.3.3
     # via -r requirements.in
 coreschema==0.0.4
@@ -417,7 +419,9 @@ feedgen==0.9.0
 fido2==1.1.1
     # via django-mfa3
 filelock==3.12.0
-    # via torch
+    # via
+    #   torch
+    #   triton
 fonttools[woff]==4.39.4
     # via weasyprint
 freetype-py==2.3.0
@@ -502,6 +506,8 @@ jwcrypto==1.4.2
     # via django-oauth-toolkit
 kombu==5.2.4
     # via celery
+lit==18.1.6
+    # via triton
 lxml==4.9.2
     # via
     #   -r requirements.in
@@ -539,6 +545,31 @@ numpy==1.24.3
     #   pandas
     #   torchvision
     #   webp
+nvidia-cublas-cu11==11.10.3.66
+    # via
+    #   nvidia-cudnn-cu11
+    #   nvidia-cusolver-cu11
+    #   torch
+nvidia-cuda-cupti-cu11==11.7.101
+    # via torch
+nvidia-cuda-nvrtc-cu11==11.7.99
+    # via torch
+nvidia-cuda-runtime-cu11==11.7.99
+    # via torch
+nvidia-cudnn-cu11==8.5.0.96
+    # via torch
+nvidia-cufft-cu11==10.9.0.58
+    # via torch
+nvidia-curand-cu11==10.2.10.91
+    # via torch
+nvidia-cusolver-cu11==11.4.0.1
+    # via torch
+nvidia-cusparse-cu11==11.7.4.91
+    # via torch
+nvidia-nccl-cu11==2.14.3
+    # via torch
+nvidia-nvtx-cu11==11.7.91
+    # via torch
 oauthlib==3.2.2
     # via django-oauth-toolkit
 openpyxl==3.1.2
@@ -732,12 +763,15 @@ tinycss2==1.2.1
     #   cssselect2
     #   svglib
     #   weasyprint
-torch==2.0.1
+torch==2.0.0
     # via
     #   -r requirements.in
     #   torchvision
-torchvision==0.15.2
+    #   triton
+torchvision==0.15.1
     # via -r requirements.in
+triton==2.0.0
+    # via torch
 typing-extensions==4.6.1
     # via
     #   asgiref
@@ -794,6 +828,14 @@ webp==0.1.6
     # via -r requirements.in
 websockets==11.0.3
     # via -r requirements.in
+wheel==0.43.0
+    # via
+    #   nvidia-cublas-cu11
+    #   nvidia-cuda-cupti-cu11
+    #   nvidia-cuda-runtime-cu11
+    #   nvidia-curand-cu11
+    #   nvidia-cusparse-cu11
+    #   nvidia-nvtx-cu11
 wrapt==1.15.0
     # via deprecated
 xlrd==2.0.1

diff --git a/requirements.in b/requirements.in
@@ -68,7 +68,7 @@ reportlab
 requests
 sentry-sdk
 stripe
-torch
+torch==2.0.0
 torchvision
 unidecode
 Wand

diff --git a/requirements.txt b/requirements.txt
@@ -121,6 +121,8 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
+cmake==3.29.3
+    # via triton
 coreapi==2.3.3
     # via -r requirements.in
 coreschema==0.0.4
@@ -407,7 +409,9 @@ feedgen==0.9.0
 fido2==1.1.1
     # via django-mfa3
 filelock==3.12.0
-    # via torch
+    # via
+    #   torch
+    #   triton
 fonttools[woff]==4.39.4
     # via weasyprint
 freetype-py==2.3.0
@@ -469,6 +473,8 @@ jwcrypto==1.4.2
     # via django-oauth-toolkit
 kombu==5.2.4
     # via celery
+lit==18.1.6
+    # via triton
 lxml==4.9.2
     # via
     #   -r requirements.in
@@ -504,6 +510,31 @@ numpy==1.24.3
     #   pandas
     #   torchvision
     #   webp
+nvidia-cublas-cu11==11.10.3.66
+    # via
+    #   nvidia-cudnn-cu11
+    #   nvidia-cusolver-cu11
+    #   torch
+nvidia-cuda-cupti-cu11==11.7.101
+    # via torch
+nvidia-cuda-nvrtc-cu11==11.7.99
+    # via torch
+nvidia-cuda-runtime-cu11==11.7.99
+    # via torch
+nvidia-cudnn-cu11==8.5.0.96
+    # via torch
+nvidia-cufft-cu11==10.9.0.58
+    # via torch
+nvidia-curand-cu11==10.2.10.91
+    # via torch
+nvidia-cusolver-cu11==11.4.0.1
+    # via torch
+nvidia-cusparse-cu11==11.7.4.91
+    # via torch
+nvidia-nccl-cu11==2.14.3
+    # via torch
+nvidia-nvtx-cu11==11.7.91
+    # via torch
 oauthlib==3.2.2
     # via django-oauth-toolkit
 openpyxl==3.1.2
@@ -673,12 +704,15 @@ tinycss2==1.2.1
     #   cssselect2
     #   svglib
     #   weasyprint
-torch==2.0.1
+torch==2.0.0
     # via
     #   -r requirements.in
     #   torchvision
-torchvision==0.15.2
+    #   triton
+torchvision==0.15.1
     # via -r requirements.in
+triton==2.0.0
+    # via torch
 typing-extensions==4.6.1
     # via
     #   asgiref
@@ -731,6 +765,14 @@ webp==0.1.6
     # via -r requirements.in
 websockets==11.0.3
     # via -r requirements.in
+wheel==0.43.0
+    # via
+    #   nvidia-cublas-cu11
+    #   nvidia-cuda-cupti-cu11
+    #   nvidia-cuda-runtime-cu11
+    #   nvidia-curand-cu11
+    #   nvidia-cusparse-cu11
+    #   nvidia-nvtx-cu11
 wrapt==1.15.0
     # via deprecated
 xlrd==2.0.1