From 240f54e50a6093e22355b1c436ba27ebb5719143 Mon Sep 17 00:00:00 2001
From: Yury <rip95_95@mail.ru>
Date: Thu, 25 Jul 2024 00:04:49 +0300
Subject: [PATCH 1/2] Revert "Update torch dependencies"

This reverts commit c372e653a3ef8203d92d630f99f7d69b3190b476.
---
 server/requirements-common.txt |  5 +++++
 server/requirements-cpu.txt    |  9 ++++++++-
 server/requirements-cuda.txt   | 15 +++++++++------
 server/requirements-dml.txt    |  5 +++++
 server/requirements-rocm.txt   |  9 ++++++---
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/server/requirements-common.txt b/server/requirements-common.txt
index f9b861687..7a68f0c70 100644
--- a/server/requirements-common.txt
+++ b/server/requirements-common.txt
@@ -1,3 +1,8 @@
+# # 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
index 346e99f4b..4d881f218 100644
--- a/server/requirements-cpu.txt
+++ b/server/requirements-cpu.txt
@@ -1,5 +1,12 @@
+# # 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
+# torch 2.4.0 has problems with Linux builds
+torch==2.3.1; sys_platform!='darwin'
+torch; sys_platform=='darwin'
 torchaudio
 faiss-cpu==1.8.0
 
diff --git a/server/requirements-cuda.txt b/server/requirements-cuda.txt
index 792e8cab3..bd95d39c2 100644
--- a/server/requirements-cuda.txt
+++ b/server/requirements-cuda.txt
@@ -1,9 +1,12 @@
-# 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
+# # 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
 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
index 27c1c2bd4..c7a6cf7ea 100644
--- a/server/requirements-dml.txt
+++ b/server/requirements-dml.txt
@@ -1,3 +1,8 @@
+# # 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
index 62e7f547d..91c21584e 100644
--- a/server/requirements-rocm.txt
+++ b/server/requirements-rocm.txt
@@ -1,7 +1,10 @@
+# # 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
-# 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.4.0 has problems with Linux builds
 torch==2.3.1
 torchaudio
 faiss-cpu==1.8.0

From d1dad93c09696884109fdf03fbdf4c73c3b01965 Mon Sep 17 00:00:00 2001
From: Yury <rip95_95@mail.ru>
Date: Thu, 25 Jul 2024 00:05:50 +0300
Subject: [PATCH 2/2] Remove torch fix version for CPU

---
 server/requirements-cpu.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/requirements-cpu.txt b/server/requirements-cpu.txt
index 4d881f218..52650824c 100644
--- a/server/requirements-cpu.txt
+++ b/server/requirements-cpu.txt
@@ -4,9 +4,7 @@
 # # 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