From 821922916f95cc3853fc7f58ea2f1e15a0ffa669 Mon Sep 17 00:00:00 2001
From: ditsuke <ditsuke@protonmail.com>
Date: Sun, 10 Mar 2024 23:21:46 +0530
Subject: [PATCH] fix: Update script paths in CI scripts

---
 ci/run.sh                                                   | 2 +-
 requirements.txt                                            | 6 +++---
 ...-gguf-update.txt => requirements-convert_hf_to_gguf.txt} | 0
 ...-gguf.txt => requirements-convert_hf_to_gguf_update.txt} | 0
 ...gguf.txt => requirements-convert_llama_ggml_to_gguf.txt} | 0
 requirements/requirements-convert_lora_to_ggml.txt          | 3 +++
 requirements/requirements-convert_persimmon_to_gguf.txt     | 3 +++
 scripts/check-requirements.sh                               | 4 ++--
 8 files changed, 12 insertions(+), 6 deletions(-)
 rename requirements/{requirements-convert-hf-to-gguf-update.txt => requirements-convert_hf_to_gguf.txt} (100%)
 rename requirements/{requirements-convert-hf-to-gguf.txt => requirements-convert_hf_to_gguf_update.txt} (100%)
 rename requirements/{requirements-convert-llama-ggml-to-gguf.txt => requirements-convert_llama_ggml_to_gguf.txt} (100%)
 create mode 100644 requirements/requirements-convert_lora_to_ggml.txt
 create mode 100644 requirements/requirements-convert_persimmon_to_gguf.txt

diff --git a/ci/run.sh b/ci/run.sh
index e0cedb24f..067ac405b 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -688,7 +688,7 @@ function gg_run_embd_bge_small {
     (time cmake -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log
     (time make -j                                            ) 2>&1 | tee -a $OUT/${ci}-make.log
 
-    python3 ../convert-hf-to-gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf
+    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf
 
     model_f16="${path_models}/ggml-model-f16.gguf"
     model_q8_0="${path_models}/ggml-model-q8_0.gguf"
diff --git a/requirements.txt b/requirements.txt
index e5cfbf10b..1eca1a13f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,6 @@
 
 -r ./requirements/requirements-convert-legacy-llama.txt
 
--r ./requirements/requirements-convert-hf-to-gguf.txt
--r ./requirements/requirements-convert-hf-to-gguf-update.txt
--r ./requirements/requirements-convert-llama-ggml-to-gguf.txt
+-r ./requirements/requirements-convert_hf_to_gguf.txt
+-r ./requirements/requirements-convert_hf_to_gguf_update.txt
+-r ./requirements/requirements-convert_llama_ggml_to_gguf.txt
diff --git a/requirements/requirements-convert-hf-to-gguf-update.txt b/requirements/requirements-convert_hf_to_gguf.txt
similarity index 100%
rename from requirements/requirements-convert-hf-to-gguf-update.txt
rename to requirements/requirements-convert_hf_to_gguf.txt
diff --git a/requirements/requirements-convert-hf-to-gguf.txt b/requirements/requirements-convert_hf_to_gguf_update.txt
similarity index 100%
rename from requirements/requirements-convert-hf-to-gguf.txt
rename to requirements/requirements-convert_hf_to_gguf_update.txt
diff --git a/requirements/requirements-convert-llama-ggml-to-gguf.txt b/requirements/requirements-convert_llama_ggml_to_gguf.txt
similarity index 100%
rename from requirements/requirements-convert-llama-ggml-to-gguf.txt
rename to requirements/requirements-convert_llama_ggml_to_gguf.txt
diff --git a/requirements/requirements-convert_lora_to_ggml.txt b/requirements/requirements-convert_lora_to_ggml.txt
new file mode 100644
index 000000000..fe5d13dd8
--- /dev/null
+++ b/requirements/requirements-convert_lora_to_ggml.txt
@@ -0,0 +1,3 @@
+-r ./requirements-convert.txt
+torch~=2.1.1
+
diff --git a/requirements/requirements-convert_persimmon_to_gguf.txt b/requirements/requirements-convert_persimmon_to_gguf.txt
new file mode 100644
index 000000000..fe5d13dd8
--- /dev/null
+++ b/requirements/requirements-convert_persimmon_to_gguf.txt
@@ -0,0 +1,3 @@
+-r ./requirements-convert.txt
+torch~=2.1.1
+
diff --git a/scripts/check-requirements.sh b/scripts/check-requirements.sh
index 0c6afdd59..69a08c841 100755
--- a/scripts/check-requirements.sh
+++ b/scripts/check-requirements.sh
@@ -167,11 +167,11 @@ if (( do_cleanup )); then
 fi
 
 check_convert_script examples/convert-legacy-llama.py
-for py in convert-*.py; do
+for py in convert_*.py; do
     # skip convert-hf-to-gguf-update.py
     # TODO: the check is failing for some reason:
     #       https://github.com/ggerganov/llama.cpp/actions/runs/8875330981/job/24364557177?pr=6920
-    [[ $py == convert-hf-to-gguf-update.py ]] && continue
+    [[ $py == convert_hf_to_gguf_update.py ]] && continue
 
     check_convert_script "$py"
 done