From 07786a61a2097306ee496f565f78796f1aa205e6 Mon Sep 17 00:00:00 2001 From: ditsuke Date: Tue, 2 Jul 2024 15:35:43 +0530 Subject: [PATCH] chore: Fixup requirements and build --- CMakeLists.txt | 4 +++- examples/llava/requirements.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 ++ requirements/requirements-convert_lora_to_ggml.txt | 4 ++-- requirements/requirements-convert_persimmon_to_gguf.txt | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d95414d71..f7b6601b3 100644 --- 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 17cb4d5e5..21149d6fe 100644 --- 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 2c6e855e3..e94cd1ba6 100644 --- 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 1eca1a13f..4f9bcc9ca 100644 --- 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 fe5d13dd8..4135cd655 100644 --- 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 fe5d13dd8..4135cd655 100644 --- 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