chore: Fixup requirements and build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d95414d710f56691a594fc9a3faee8431bc49579..f7b6601b33814580f584265db219eb043f1f16f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,7 +156,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/llama-config.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/llama)
 
 install(
-    FILES convert-hf-to-gguf.py
+    FILES convert_hf_to_gguf.py
     PERMISSIONS
         OWNER_READ
         OWNER_WRITE
@@ -165,6 +165,8 @@ install(
         GROUP_EXECUTE
         WORLD_READ
         WORLD_EXECUTE
+    RENAME
+        convert-hf-to-gguf.py
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 configure_file(cmake/llama.pc.in

diff --git a/examples/llava/requirements.txt b/examples/llava/requirements.txt
index 17cb4d5e5ee8e8a52a7fbe6514c6af30fafef5ce..21149d6fe1494bcfa563799d81f782ad637956fd 100644 (file)
--- a/examples/llava/requirements.txt
+++ b/examples/llava/requirements.txt
@@ -1,3 +1,3 @@
 -r ../../requirements/requirements-convert-legacy-llama.txt
 pillow~=10.2.0
-torch~=2.1.1
+torch~=2.2.1

diff --git a/pyproject.toml b/pyproject.toml
index 2c6e855e38510854072c859c87703da31fc08457..e94cd1ba6e0695cf44a83b9a0b986af8d7c2d159 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,4 +41,4 @@ llama-convert-llama-ggml-to-gguf = "convert_llama_ggml_to_gguf:main"
 llama-convert-lora-to-ggml = "convert_lora_to_ggml:main"
 llama-convert-persimmon-to-gguf = "convert_persimmon_to_gguf:main"
 llama-convert = "convert:main"
-llama-ggml_vk_generate_shaders = "ggml_vk_generate_shaders:main"
+llama-ggml-vk-generate-shaders = "ggml_vk_generate_shaders:main"

diff --git a/requirements.txt b/requirements.txt
index 1eca1a13f999e7ae2a0a0d619353a08922d77382..4f9bcc9ca239d65e55f82679fe1fbdcc14261537 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,5 @@
 -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_lora_to_ggml.txt
+-r ./requirements/requirements-convert_persimmon_to_gguf.txt

diff --git a/requirements/requirements-convert_lora_to_ggml.txt b/requirements/requirements-convert_lora_to_ggml.txt
index fe5d13dd8a1d4b6e85a03762a34f7dd66e16fb0d..4135cd6557168cd7a16549341361c7c37764afa0 100644 (file)
--- a/requirements/requirements-convert_lora_to_ggml.txt
+++ b/requirements/requirements-convert_lora_to_ggml.txt
@@ -1,3 +1,3 @@
--r ./requirements-convert.txt
-torch~=2.1.1
+-r ./requirements-convert-legacy-llama.txt
+torch~=2.2.1
 

diff --git a/requirements/requirements-convert_persimmon_to_gguf.txt b/requirements/requirements-convert_persimmon_to_gguf.txt
index fe5d13dd8a1d4b6e85a03762a34f7dd66e16fb0d..4135cd6557168cd7a16549341361c7c37764afa0 100644 (file)
--- a/requirements/requirements-convert_persimmon_to_gguf.txt
+++ b/requirements/requirements-convert_persimmon_to_gguf.txt
@@ -1,3 +1,3 @@
--r ./requirements-convert.txt
-torch~=2.1.1
+-r ./requirements-convert-legacy-llama.txt
+torch~=2.2.1