Merge branch 'master' into concedo_experimental

# Conflicts:
#	.devops/full.Dockerfile
#	.devops/main.Dockerfile
#	Makefile
This commit is contained in:
Concedo
2023-05-29 16:47:32 +08:00
8 changed files with 87 additions and 48 deletions
+2
View File
@@ -186,10 +186,12 @@ typedef double ggml_float;
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <intrin.h>
#else
#if !defined(__riscv)
#include <immintrin.h>
#endif
#endif
#endif
#endif
#ifdef __F16C__