Merge branch 'upstream' into concedo_experimental

# Conflicts: # src/CMakeLists.txt # tests/test-backend-ops.cpp
2026-09-09 06:19:14 +02:00 · 2026-02-06 14:43:02 +08:00
parent 3d99b87506 e696cfc016
commit 423a4bd3c0
14 changed files with 360 additions and 128 deletions
@@ -2,7 +2,7 @@

 #include "llama-impl.h"
 #include "llama-vocab.h"
-#include "llama-sampling.h"
+#include "llama-sampler.h"

 #include <cmath>
 #include <algorithm>