fix: Update script paths in CI scripts

ggerganov · Jul 2, 2024 · 441c48e · 441c48e
1 parent c879328
commit 441c48e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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/...equirements-convert-hf-to-gguf-update.txt → ...ments/requirements-convert_hf_to_gguf.txt b/...equirements-convert-hf-to-gguf-update.txt → ...ments/requirements-convert_hf_to_gguf.txt
diff --git a/...ments/requirements-convert-hf-to-gguf.txt → ...equirements-convert_hf_to_gguf_update.txt b/...ments/requirements-convert-hf-to-gguf.txt → ...equirements-convert_hf_to_gguf_update.txt
diff --git a/...quirements-convert-llama-ggml-to-gguf.txt → ...quirements-convert_llama_ggml_to_gguf.txt b/...quirements-convert-llama-ggml-to-gguf.txt → ...quirements-convert_llama_ggml_to_gguf.txt
diff --git a/requirements/requirements-convert_lora_to_ggml.txt 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
@@ -0,0 +1,3 @@
+-r ./requirements-convert.txt
+torch~=2.1.1
+
diff --git 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