From dd6d6db7c8be8dce4907d43994be9f936cce341b Mon Sep 17 00:00:00 2001
From: Finn Kumkar <kumkar@stadtwerk.org>
Date: Thu, 13 Jun 2024 15:58:26 +0200
Subject: [PATCH] Simplify the python dependency installation

---
 CHANGELOG.md              |  6 ++++++
 rebuild_llama.cpp.ps1     | 17 +++++++++--------
 requirements_override.txt | 11 +++++++----
 vendor/llama.cpp          |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d61d1f9..d5a416b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.20.0] - 2024-06-13
+
+### Changed
+- [Build] Simplify the python dependency installation
+- [Build] Downgrade the "torch" package to 2.1.2+cu121
+
 ## [1.19.0] - 2024-06-13
 
 ### Added
diff --git a/rebuild_llama.cpp.ps1 b/rebuild_llama.cpp.ps1
index 89f6a99..e169db3 100644
--- a/rebuild_llama.cpp.ps1
+++ b/rebuild_llama.cpp.ps1
@@ -189,17 +189,18 @@ cmake `
 
 Copy-Item -Path "../../OpenBLAS/bin/libopenblas.dll" -Destination "./bin/Release/libopenblas.dll"
 
-Set-Location -Path "../"
+Set-Location -Path "../../../"
 
-conda activate llama.cpp
-
-# We are installing the latest available version of the dependencies.
-pip install --upgrade --upgrade-strategy "eager" -r ./requirements.txt
+Write-Host "[Python] Installing dependencies..." -ForegroundColor "Yellow"
 
-Set-Location -Path "../../"
+conda activate llama.cpp
 
-# We are enforcing specific versions on some packages.
-pip install -r ./requirements_override.txt
+# We are installing the latest available version of all llama.cpp
+# project dependencies and also overriding some package versions.
+pip install `
+    --upgrade `
+    --upgrade-strategy "eager" `
+    --requirement ./requirements_override.txt
 
 conda list
 
diff --git a/requirements_override.txt b/requirements_override.txt
index 895369b..8cc6b7f 100644
--- a/requirements_override.txt
+++ b/requirements_override.txt
@@ -1,4 +1,7 @@
-# We are using a specific version of the "torch"
-# package which supports a specific CUDA version.
---extra-index-url https://download.pytorch.org/whl/nightly/cu121
-torch==2.4.0.dev20240516+cu121
+# We are importing the llama.cpp project dependencies.
+--requirement ./vendor/llama.cpp/requirements.txt
+
+# We are overriding the "torch" package version with a
+# specific compatible version that also supports CUDA.
+--extra-index-url https://download.pytorch.org/whl/cu121
+torch==2.1.2+cu121
diff --git a/vendor/llama.cpp b/vendor/llama.cpp
index f578b86..172c825 160000
--- a/vendor/llama.cpp
+++ b/vendor/llama.cpp
@@ -1 +1 @@
-Subproject commit f578b86b2123d0f92afbaa98a031df4d4464e582
+Subproject commit 172c8256840ffd882ab9992ecedbb587d9b21f15