From f7ca910dc5fb628e7fb2e152ba5df4cdecedee57 Mon Sep 17 00:00:00 2001 From: Alex O'Connell Date: Mon, 21 Apr 2025 16:54:38 -0400 Subject: [PATCH] Fix processor type remapping --- .github/workflows/create-release.yml | 6 +++--- custom_components/llama_conversation/utils.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 54505fb..cc5973d 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -28,7 +28,7 @@ jobs: # Base x86 - home_assistant_version: "2025.4.1" suffix: "-noavx" - arch: "amd64" + arch: "x86_64" extra_defines: "-DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF -DGGML_F16C=OFF" - home_assistant_version: "2025.4.1" arch: "i386" @@ -37,10 +37,10 @@ jobs: # AVX2 and AVX512 - home_assistant_version: "2025.4.1" - arch: "amd64" + arch: "x86_64" extra_defines: "-DGGML_AVX=ON -DGGML_AVX2=ON -DGGML_FMA=ON -DGGML_F16C=ON" - home_assistant_version: "2025.4.1" - arch: "amd64" + arch: "x86_64" suffix: "-avx512" extra_defines: "-DGGML_AVX512=ON -DGGML_FMA=ON -DGGML_F16C=ON" - home_assistant_version: "2025.4.1" diff --git a/custom_components/llama_conversation/utils.py b/custom_components/llama_conversation/utils.py index d3b4ccd..d7d3be9 100644 --- a/custom_components/llama_conversation/utils.py +++ b/custom_components/llama_conversation/utils.py @@ -169,13 +169,13 @@ def install_llama_cpp_python(config_dir: str): # remap other names for architectures to the names we use if platform_suffix == "arm64": platform_suffix = "aarch64" - if platform_suffix == "i386" or platform_suffix == "x86_64": - platform_suffix = "amd64" + if platform_suffix == "i386" or platform_suffix == "amd64": + platform_suffix = "x86_64" runtime_version = f"cp{sys.version_info.major}{sys.version_info.minor}" instruction_extensions_suffix = "" - if platform_suffix == "amd64": + if platform_suffix == "x86_64": instruction_extensions_suffix = "-noavx" try: