llama.cpp b9553 yüklə

common : relax sampler name matching (#23744)
- common : relax sampler name matching
Currently, in some cases, the alternative names for samplers (like
top-k and min-p instead of the canonical top_k and min_p) are
not always recognized by the common_sampler_types_from_names function
in common/sampling.cpp.
This PR changes the signature of this function to remove the bool allow_alt_names flag, and removes all occurences of the flag from call
sites. Therefore, the function will now always match all known names.
I also changed the logic of the function to unconditionally check the
provided sampler names against both the canonical and alternative names,
and to be case-insensitive.
This fixes an issue I was seeing wherein samplers specified in the
llama-server UI were not recognized as valid when the alternative
names were used.
- add more alt names
- cont. fix
- cast to unsigned char for correctness
- common : unify sampler name mapping
- annotate canonical vs. alt sampler name mappings per @CISC
- Update common/sampling.cpp
Co-authored-by: Sigbjørn Skjæret sigbjorn.skjaeret@scala.com
- common : auto-generate sampler name aliases per @ngxson
- use merged map for matching
- use .merge instead of iterating
- nit: simplify comment
- nit: use insert everywhere, not index assignment
Co-authored-by: Sigbjørn Skjæret sigbjorn.skjaeret@scala.com
macOS/iOS:
- macOS Apple Silicon (arm64)
- macOS Apple Silicon (arm64, KleidiAI enabled) DISABLED
- macOS Intel (x64)
- iOS XCFramework
Linux:
- Ubuntu x64 (CPU)
- Ubuntu arm64 (CPU)
- Ubuntu s390x (CPU)
- Ubuntu x64 (Vulkan)
- Ubuntu arm64 (Vulkan)
- Ubuntu x64 (ROCm 7.2)
- Ubuntu x64 (OpenVINO)
- Ubuntu x64 (SYCL FP32) DISABLED
Android:
- Android arm64 (CPU)
Windows:
- Windows x64 (CPU)
- Windows arm64 (CPU)
- Windows x64 (CUDA 12) - CUDA 12.4 DLLs
- Windows x64 (CUDA 13) - CUDA 13.3 DLLs
- Windows x64 (Vulkan)
- Windows x64 (SYCL) DISABLED
- Windows x64 (HIP)
openEuler:
- DISABLED
- openEuler x86 (310p)
- openEuler x86 (910b, ACL Graph)
- openEuler aarch64 (310p)
- openEuler aarch64 (910b, ACL Graph)
UI:
- UI