fix: Update script paths in CI scripts

diff --git a/ci/run.sh b/ci/run.sh
index e0cedb24f5a58c7bf5bac849312bfe7eff9c88ca..067ac405b412a48243562f194fff346466b5abbc 100755 (executable)
--- 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 e5cfbf10b3da5668d4952bf90732d590a874f084..1eca1a13f999e7ae2a0a0d619353a08922d77382 100644 (file)
--- 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-update.txt
deleted file mode 100644 (file)
index a7112f3..0000000
--- a/requirements/requirements-convert-hf-to-gguf-update.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r ./requirements-convert-legacy-llama.txt
-torch~=2.2.1

diff --git a/requirements/requirements-convert-hf-to-gguf.txt b/requirements/requirements-convert-hf-to-gguf.txt
deleted file mode 100644 (file)
index a7112f3..0000000
--- a/requirements/requirements-convert-hf-to-gguf.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r ./requirements-convert-legacy-llama.txt
-torch~=2.2.1

diff --git a/requirements/requirements-convert-llama-ggml-to-gguf.txt b/requirements/requirements-convert-llama-ggml-to-gguf.txt
deleted file mode 100644 (file)
index e80c290..0000000
--- a/requirements/requirements-convert-llama-ggml-to-gguf.txt
+++ /dev/null
@@ -1 +0,0 @@
--r ./requirements-convert-legacy-llama.txt

diff --git a/requirements/requirements-convert_hf_to_gguf.txt b/requirements/requirements-convert_hf_to_gguf.txt
new file mode 100644 (file)
index 0000000..a7112f3
--- /dev/null
+++ b/requirements/requirements-convert_hf_to_gguf.txt
@@ -0,0 +1,2 @@
+-r ./requirements-convert-legacy-llama.txt
+torch~=2.2.1

diff --git a/requirements/requirements-convert_hf_to_gguf_update.txt b/requirements/requirements-convert_hf_to_gguf_update.txt
new file mode 100644 (file)
index 0000000..a7112f3
--- /dev/null
+++ b/requirements/requirements-convert_hf_to_gguf_update.txt
@@ -0,0 +1,2 @@
+-r ./requirements-convert-legacy-llama.txt
+torch~=2.2.1

diff --git a/requirements/requirements-convert_llama_ggml_to_gguf.txt b/requirements/requirements-convert_llama_ggml_to_gguf.txt
new file mode 100644 (file)
index 0000000..e80c290
--- /dev/null
+++ b/requirements/requirements-convert_llama_ggml_to_gguf.txt
@@ -0,0 +1 @@
+-r ./requirements-convert-legacy-llama.txt

diff --git a/requirements/requirements-convert_lora_to_ggml.txt b/requirements/requirements-convert_lora_to_ggml.txt
new file mode 100644 (file)
index 0000000..fe5d13d
--- /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 (file)
index 0000000..fe5d13d
--- /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 0c6afdd591aaa6a628e5682d69d60e8f42642fd0..69a08c84107682716077476b4dba1299b1e51a9f 100755 (executable)
--- 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