Merge branch 'ggerganov:master' into master

This commit is contained in:
Randall Fitzgerald 2023-05-27 19:57:37 -04:00 committed by GitHub
commit fdce8951ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

2
ggml.c
View file

@ -186,10 +186,12 @@ typedef double ggml_float;
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#include <intrin.h> #include <intrin.h>
#else #else
#if !defined(__riscv)
#include <immintrin.h> #include <immintrin.h>
#endif #endif
#endif #endif
#endif #endif
#endif
#ifdef __F16C__ #ifdef __F16C__