From 4a6e36edc586779918535e12b4fbe0583044ee6f Mon Sep 17 00:00:00 2001 From: leejet Date: Sun, 28 Jul 2024 18:30:35 +0800 Subject: [PATCH] sync: update ggml --- ggml | 2 +- ggml_extend.hpp | 6 +++--- model.cpp | 6 +++--- model.h | 4 ++-- stable-diffusion.h | 11 +++++++---- util.cpp | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ggml b/ggml index 34a63747..89fd7704 160000 --- a/ggml +++ b/ggml @@ -1 +1 @@ -Subproject commit 34a63747c4f0edf952267c3d0c1c1ef3dd9fe827 +Subproject commit 89fd77041d5eb2087eb340711468a02cc479634d diff --git a/ggml_extend.hpp b/ggml_extend.hpp index 1c82d10e..14ad37c0 100644 --- a/ggml_extend.hpp +++ b/ggml_extend.hpp @@ -20,9 +20,9 @@ #include #include -#include "ggml/ggml-alloc.h" -#include "ggml/ggml-backend.h" -#include "ggml/ggml.h" +#include "ggml-alloc.h" +#include "ggml-backend.h" +#include "ggml.h" #ifdef SD_USE_CUBLAS #include "ggml-cuda.h" diff --git a/model.cpp b/model.cpp index ac500dc3..7ab2287b 100644 --- a/model.cpp +++ b/model.cpp @@ -11,9 +11,9 @@ #include "util.h" #include "vocab.hpp" -#include "ggml/ggml-alloc.h" -#include "ggml/ggml-backend.h" -#include "ggml/ggml.h" +#include "ggml-alloc.h" +#include "ggml-backend.h" +#include "ggml.h" #include "stable-diffusion.h" diff --git a/model.h b/model.h index 571766e2..5bfce308 100644 --- a/model.h +++ b/model.h @@ -10,8 +10,8 @@ #include #include -#include "ggml/ggml-backend.h" -#include "ggml/ggml.h" +#include "ggml-backend.h" +#include "ggml.h" #include "json.hpp" #include "zip.h" diff --git a/stable-diffusion.h b/stable-diffusion.h index 052e648c..f78748fa 100644 --- a/stable-diffusion.h +++ b/stable-diffusion.h @@ -55,10 +55,10 @@ enum schedule_t { // same as enum ggml_type enum sd_type_t { - SD_TYPE_F32 = 0, - SD_TYPE_F16 = 1, - SD_TYPE_Q4_0 = 2, - SD_TYPE_Q4_1 = 3, + SD_TYPE_F32 = 0, + SD_TYPE_F16 = 1, + SD_TYPE_Q4_0 = 2, + 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, @@ -86,6 +86,9 @@ enum sd_type_t { 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_COUNT, }; diff --git a/util.cpp b/util.cpp index 98af6ae7..5de5ce26 100644 --- a/util.cpp +++ b/util.cpp @@ -22,7 +22,7 @@ #include #endif -#include "ggml/ggml.h" +#include "ggml.h" #include "stable-diffusion.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION