From aa5d5337a983ab0cbfcc49acb20d6a7baf3936f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20du=20Hamel?= Date: Thu, 13 Feb 2025 18:47:41 +0100 Subject: [PATCH 1/2] sync:update ggml fix missing header --- ggml | 2 +- model.cpp | 1 + stable-diffusion.h | 65 ++++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/ggml b/ggml index 6fcbd60bc..9a4acb374 160000 --- a/ggml +++ b/ggml @@ -1 +1 @@ -Subproject commit 6fcbd60bc72ac3f7ad43f78c87e535f2e6206f58 +Subproject commit 9a4acb374565f4146b8d6eb1cffdcd7d437d1ba2 diff --git a/model.cpp b/model.cpp index dcbaae5bc..af762566d 100644 --- a/model.cpp +++ b/model.cpp @@ -15,6 +15,7 @@ #include "ggml-backend.h" #include "ggml-cpu.h" #include "ggml.h" +#include "gguf.h" #include "stable-diffusion.h" diff --git a/stable-diffusion.h b/stable-diffusion.h index 5a758df66..f5a60cbd4 100644 --- a/stable-diffusion.h +++ b/stable-diffusion.h @@ -65,37 +65,40 @@ enum sd_type_t { SD_TYPE_Q4_1 = 3, // SD_TYPE_Q4_2 = 4, support has been removed // SD_TYPE_Q4_3 = 5, support has been removed - SD_TYPE_Q5_0 = 6, - SD_TYPE_Q5_1 = 7, - SD_TYPE_Q8_0 = 8, - SD_TYPE_Q8_1 = 9, - SD_TYPE_Q2_K = 10, - SD_TYPE_Q3_K = 11, - SD_TYPE_Q4_K = 12, - SD_TYPE_Q5_K = 13, - SD_TYPE_Q6_K = 14, - SD_TYPE_Q8_K = 15, - SD_TYPE_IQ2_XXS = 16, - SD_TYPE_IQ2_XS = 17, - SD_TYPE_IQ3_XXS = 18, - SD_TYPE_IQ1_S = 19, - SD_TYPE_IQ4_NL = 20, - SD_TYPE_IQ3_S = 21, - SD_TYPE_IQ2_S = 22, - SD_TYPE_IQ4_XS = 23, - SD_TYPE_I8 = 24, - SD_TYPE_I16 = 25, - SD_TYPE_I32 = 26, - SD_TYPE_I64 = 27, - SD_TYPE_F64 = 28, - SD_TYPE_IQ1_M = 29, - SD_TYPE_BF16 = 30, - SD_TYPE_Q4_0_4_4 = 31, - SD_TYPE_Q4_0_4_8 = 32, - SD_TYPE_Q4_0_8_8 = 33, - SD_TYPE_TQ1_0 = 34, - SD_TYPE_TQ2_0 = 35, - SD_TYPE_COUNT, + SD_TYPE_Q5_0 = 6, + SD_TYPE_Q5_1 = 7, + SD_TYPE_Q8_0 = 8, + SD_TYPE_Q8_1 = 9, + SD_TYPE_Q2_K = 10, + SD_TYPE_Q3_K = 11, + SD_TYPE_Q4_K = 12, + SD_TYPE_Q5_K = 13, + SD_TYPE_Q6_K = 14, + SD_TYPE_Q8_K = 15, + SD_TYPE_IQ2_XXS = 16, + SD_TYPE_IQ2_XS = 17, + SD_TYPE_IQ3_XXS = 18, + SD_TYPE_IQ1_S = 19, + SD_TYPE_IQ4_NL = 20, + SD_TYPE_IQ3_S = 21, + SD_TYPE_IQ2_S = 22, + SD_TYPE_IQ4_XS = 23, + SD_TYPE_I8 = 24, + SD_TYPE_I16 = 25, + SD_TYPE_I32 = 26, + SD_TYPE_I64 = 27, + SD_TYPE_F64 = 28, + SD_TYPE_IQ1_M = 29, + SD_TYPE_BF16 = 30, + // SD_TYPE_Q4_0_4_4 = 31, support has been removed from gguf files + // SD_TYPE_Q4_0_4_8 = 32, + // SD_TYPE_Q4_0_8_8 = 33, + SD_TYPE_TQ1_0 = 34, + SD_TYPE_TQ2_0 = 35, + // SD_TYPE_IQ4_NL_4_4 = 36, + // SD_TYPE_IQ4_NL_4_8 = 37, + // SD_TYPE_IQ4_NL_8_8 = 38, + SD_TYPE_COUNT = 39, }; SD_API const char* sd_type_name(enum sd_type_t type); From 1ce0a1e07936ada3484a5bb271d537db863d6b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20du=20Hamel?= Date: Tue, 25 Feb 2025 16:22:03 +0100 Subject: [PATCH 2/2] update ggml to 738a3aea --- ggml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml b/ggml index 9a4acb374..738a3aea5 160000 --- a/ggml +++ b/ggml @@ -1 +1 @@ -Subproject commit 9a4acb374565f4146b8d6eb1cffdcd7d437d1ba2 +Subproject commit 738a3aea59f1c0c7751d65307d1228c1dbbf6a84