Merge pull request #149 from deiteris/fix-torch-version

Update torch dependencies
deiteris · Jul 24, 2024 · c34cde7 · c34cde7
2 parents 9505e45 + c372e65
commit c34cde7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 33 deletions.
diff --git a/server/requirements-common.txt b/server/requirements-common.txt
@@ -1,8 +1,3 @@
-# # apt-get update
-# # apt-get install -y emacs mlocate wget git curl gcc g++ make unzip
-# # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh
-# # bash Anaconda3-2022.10-Linux-x86_64.sh
-
 # At least 14.38 is required by onnxruntime
 msvc-runtime>=14.38; sys_platform=='win32'
 uvicorn

diff --git a/server/requirements-cpu.txt b/server/requirements-cpu.txt
@@ -1,12 +1,5 @@
-# # apt-get update
-# # apt-get install -y emacs mlocate wget git curl gcc g++ make unzip
-# # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh
-# # bash Anaconda3-2022.10-Linux-x86_64.sh
-
 --extra-index-url https://download.pytorch.org/whl/cpu
-# torch 2.4.0 has problems with Linux builds
-torch==2.3.1; sys_platform!='darwin'
-torch; sys_platform=='darwin'
+torch
 torchaudio
 faiss-cpu==1.8.0
 

diff --git a/server/requirements-cuda.txt b/server/requirements-cuda.txt
@@ -1,12 +1,9 @@
-# # apt-get update
-# # apt-get install -y emacs mlocate wget git curl gcc g++ make unzip
-# # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh
-# # bash Anaconda3-2022.10-Linux-x86_64.sh
-
-# PyPI onnxruntime-gpu is compiled with CUDA 11.x
---extra-index-url https://download.pytorch.org/whl/cu118
-# torch 2.4.0 has problems with Linux builds
-torch==2.3.1
+# onnxruntime doesn't come with prebuilt binaries, so we use the ones that come with PyTorch
+# Torch >=2.4.0 for CUDA 11.8 and 12.x is compiled with cuDNN 9.x
+# onnxruntime-gpu for CUDA 12.x is compiled with CUDA 12.x and cuDNN 9.x
+--extra-index-url https://download.pytorch.org/whl/cu121
+--extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+torch>=2.4.0
 torchaudio
 faiss-cpu==1.8.0; sys_platform!='linux'
 faiss-gpu; sys_platform=='linux'

diff --git a/server/requirements-dml.txt b/server/requirements-dml.txt
@@ -1,8 +1,3 @@
-# # apt-get update
-# # apt-get install -y emacs mlocate wget git curl gcc g++ make unzip
-# # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh
-# # bash Anaconda3-2022.10-Linux-x86_64.sh
-
 torch==2.3.1 # torch-directml-0.2.2.dev240614 supports up to to 2.3.1
 torchaudio
 torch-directml

diff --git a/server/requirements-rocm.txt b/server/requirements-rocm.txt
@@ -1,10 +1,7 @@
-# # apt-get update
-# # apt-get install -y emacs mlocate wget git curl gcc g++ make unzip
-# # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh
-# # bash Anaconda3-2022.10-Linux-x86_64.sh
-
 --extra-index-url https://download.pytorch.org/whl/rocm6.0
-# torch 2.4.0 has problems with Linux builds
+# onnxruntime doesn't come with prebuilt binaries, so we use the ones that come with PyTorch
+# torch >=2.4.0 is compiled with cuDNN 9.x
+# onnxruntime-rocm is compiled with cuDNN 8.x
 torch==2.3.1
 torchaudio
 faiss-cpu==1.8.0