ggerganov commited on
Commit
5e756db
·
1 Parent(s): 093eec4

ggml : fix llamafile sgemm wdata offsets (llama/6710)

Browse files
Files changed (1) hide show
  1. ggml.c +4 -7
ggml.c CHANGED
@@ -33,12 +33,8 @@
33
  #include <unistd.h>
34
  #endif
35
 
36
- #ifndef GGML_USE_LLAMAFILE
37
  #ifdef __ARM_FEATURE_MATMUL_INT8
38
- #define GGML_USE_LLAMAFILE 0
39
- #else
40
- #define GGML_USE_LLAMAFILE 1
41
- #endif
42
  #endif
43
 
44
  #if defined(_MSC_VER)
@@ -10941,8 +10937,9 @@ UseGgmlGemm1:;
10941
  if (!llamafile_sgemm(ne01, ne11, ne00/ggml_blck_size(src0->type),
10942
  (const char *)src0->data + i12/r2*nb02 + i13/r3*nb03,
10943
  nb01/ggml_type_size(src0->type),
10944
- (const char *)wdata + (nb12/ggml_type_size(src1->type)*ggml_type_size(vec_dot_type)*i12 +
10945
- nb13/ggml_type_size(src1->type)*ggml_type_size(vec_dot_type)*i13),
 
10946
  row_size/ggml_type_size(vec_dot_type),
10947
  (char *)dst->data + i12*nb2 + i13*nb3,
10948
  nb1/ggml_type_size(dst->type),
 
33
  #include <unistd.h>
34
  #endif
35
 
 
36
  #ifdef __ARM_FEATURE_MATMUL_INT8
37
+ #undef GGML_USE_LLAMAFILE
 
 
 
38
  #endif
39
 
40
  #if defined(_MSC_VER)
 
10937
  if (!llamafile_sgemm(ne01, ne11, ne00/ggml_blck_size(src0->type),
10938
  (const char *)src0->data + i12/r2*nb02 + i13/r3*nb03,
10939
  nb01/ggml_type_size(src0->type),
10940
+ (const char *)wdata + ggml_row_size(vec_dot_type,
10941
+ nb12/ggml_type_size(src1->type)*i12 +
10942
+ nb13/ggml_type_size(src1->type)*i13),
10943
  row_size/ggml_type_size(vec_dot_type),
10944
  (char *)dst->data + i12*nb2 + i13*nb3,
10945
  nb1/ggml_type_size(dst->type),