Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	examples/imatrix/imatrix.cpp
#	examples/infill/infill.cpp
#	examples/perplexity/perplexity.cpp
This commit is contained in:
Concedo 2024-09-20 18:03:45 +08:00
commit 55a249d222
4 changed files with 41 additions and 7 deletions

View file

@ -2,6 +2,7 @@
#include "log.h"
#include "sampling.h"
#include "build-info.h"
#include <algorithm>
#include <climits>