vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[rebase] Fix build error.

Browse source
This commit is contained in:
Qingtao Li 2024-11-05 18:40:31 +08:00
parent f84d25dd8f
commit 55a86969b8
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ggml/src/ggml-cpu.c
View file

@ -427,6 +427,26 @@ static const struct ggml_type_traits_cpu type_traits_cpu[GGML_TYPE_COUNT] = {
.vec_dot_type = GGML_TYPE_Q8_K, .vec_dot_type = GGML_TYPE_Q8_K,
.nrows = 1, .nrows = 1,
}, },
[GGML_TYPE_I1] = {
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
},
[GGML_TYPE_I2] = {
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
},
[GGML_TYPE_I3] = {
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
},
[GGML_TYPE_I4] = {
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
},
}; };
const struct ggml_type_traits_cpu * ggml_get_type_traits_cpu(enum ggml_type type) { const struct ggml_type_traits_cpu * ggml_get_type_traits_cpu(enum ggml_type type) {

16
ggml/src/ggml.c
View file

@ -8,6 +8,10 @@
#include "ggml.h" #include "ggml.h"
#include "ggml-aarch64.h" #include "ggml-aarch64.h"
#if defined(GGML_USE_TMAC)
#include "ggml-tmac.h"
#endif
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h> // using malloc.h with MSC/MINGW #include <malloc.h> // using malloc.h with MSC/MINGW
#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) #elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
@ -546,36 +550,24 @@ static const struct ggml_type_traits type_traits[GGML_TYPE_COUNT] = {
.blck_size = 8, .blck_size = 8,
.type_size = sizeof(int8_t), .type_size = sizeof(int8_t),
.is_quantized = false, .is_quantized = false,
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
}, },
[GGML_TYPE_I2] = { [GGML_TYPE_I2] = {
.type_name = "i2", .type_name = "i2",
.blck_size = 4, .blck_size = 4,
.type_size = sizeof(int8_t), .type_size = sizeof(int8_t),
.is_quantized = false, .is_quantized = false,
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
}, },
[GGML_TYPE_I3] = { [GGML_TYPE_I3] = {
.type_name = "i3", .type_name = "i3",
.blck_size = 2, .blck_size = 2,
.type_size = sizeof(int8_t), .type_size = sizeof(int8_t),
.is_quantized = false, .is_quantized = false,
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
}, },
[GGML_TYPE_I4] = { [GGML_TYPE_I4] = {
.type_name = "i4", .type_name = "i4",
.blck_size = 2, .blck_size = 2,
.type_size = sizeof(int8_t), .type_size = sizeof(int8_t),
.is_quantized = false, .is_quantized = false,
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32,
.vec_dot_type = GGML_TYPE_F32,
.nrows = 1,
}, },
[GGML_TYPE_I8] = { [GGML_TYPE_I8] = {
.type_name = "i8", .type_name = "i8",