chore: Revert location for python scripts

Author: ditsuke

bin/convert.py renamed to convert.py

@@ -22,7 +22,7 @@
     sys.path.insert(1, str(Path(__file__).parent / 'gguf-py'))
 import gguf
 
-from bin.convert import HfVocab
+from convert import HfVocab
 
 
 ###### MODEL DEFINITIONS ######

bin/convert_hf_to_gguf.py renamed to convert_hf_to_gguf.py

@@ -352,7 +352,7 @@ def add_tensors(self, gguf_writer):
 
 
 def handle_metadata(cfg, hp):
-    import bin.convert as convert
+    import convert as convert
     assert cfg.model_metadata_dir.is_dir(), 'Metadata dir is not a directory'
     hf_config_path   = cfg.model_metadata_dir / "config.json"
     orig_config_path = cfg.model_metadata_dir / "params.json"

bin/convert_llama_ggml_to_gguf.py renamed to convert_llama_ggml_to_gguf.py

@@ -7,7 +7,7 @@ readme = "README.md"
 homepage = "https://ggml.ai"
 repository = "https://github.com/ggerganov/llama.cpp"
 keywords = ["ggml", "gguf", "llama.cpp"]
-packages = [{ include = "bin"}]
+packages = [{ include = "__init__.py", from = "." }]
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -36,9 +36,9 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-llama-convert-hf-to-gguf = "bin.convert_hf_to_gguf:main"
-llama-convert-llama-ggml-to-gguf = "bin.convert_llama_ggml_to_gguf:main"
-llama-convert-lora-to-ggml = "bin.convert_lora_to_ggml:main"
-llama-convert-persimmon-to-gguf = "bin.convert_persimmon_to_gguf:main"
-llama-convert = "bin.convert:main"
-llama-ggml_vk_generate_shaders = "bin.ggml_vk_generate_shaders:main"
+llama-convert-hf-to-gguf = "convert_hf_to_gguf:main"
+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"