loader, quantize: align GGUF on llama.cpp, conv kernels widened to F16 at load

GGUF norm matches llama.cpp policy: F32 master stays F32, BF16
variant keeps source BF16, K-quants fall back to F16 when kernel
rows do not align. No conv override in pick_type.

Conv kernels widen to F16 at load through gf_load_conv (12 sites).
qwen_load_ctw_f32 accepts BF16 source.

TODO upstream GGML: ggml_conv_1d and ggml_conv_1d_dw force F16 on
their im2col output, while conv_2d picks the kernel dtype. This
crashes F32 and BF16 kernels on CPU (im2col only handles F16) and
BF16 on Vulkan (mul_mat refuses BF16 on the operand the kernel
ends up on). Aligning conv_1d on conv_2d removes the workaround.
This commit is contained in:
Pascal
2026-05-11 12:42:54 +02:00
parent 59fda26827
commit 530eed6ac5
8 changed files with 113 additions and 69 deletions
+5 -4
View File
@@ -106,8 +106,9 @@ static bool is_embed(const char * name) {
// false here keep their source dtype (F32) regardless of the requested
// type. Conv weights pass through the main loop and fall back to F16 when
// the row width does not divide the variant block size (kernel K=7,3,1,...).
// gf_load_conv_f16 then memcpys F16 source straight to the F16 backend
// tensor (ARM im2col strict requirement, see src/gguf-weights.h).
// gf_load_conv then loads every conv kernel as F16 on the backend
// regardless of the source GGUF dtype, see the TODO upstream block above
// the function definition in src/gguf-weights.h.
//
// Sensitive tensors that MUST stay in full precision :
// tok_enc.vq_*.{i}.codebook RVQ codebook tables, encoder side
@@ -374,8 +375,8 @@ int main(int argc, char ** argv) {
// Conv kernels (K=7,3,1,...) cannot fit a block-quant row : fall back
// to F16. F16 has no block size, 10-bit mantissa beats BF16 (7) and
// Q* effective on these weights, and gf_load_conv_f16 memcpys F16
// source straight to the F16 backend tensor at load time.
// Q* effective on these weights, and gf_load_conv on the C++ side
// loads every conv kernel as F16 regardless of source dtype.
if (can_convert && !aligned) {
target = GGML_TYPE_F16;
aligned = true;