Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
fix pixel values padding (#10718)
Michael Yangef202789fad6
diff --git a/ml/backend/ggml/ggml.go b/ml/backend/ggml/ggml.goindex 1ba079838..2821ad119 100644--- a/ml/backend/ggml/ggml.go+++ b/ml/backend/ggml/ggml.go@@ -915,6 +915,8 @@ func (t *Tensor) RMSNorm(ctx ml.Context, w ml.Tensor, eps float32) ml.Tensor {func (t *Tensor) Pad(ctx ml.Context, shape ...int) ml.Tensor {if len(shape) != 4 {panic("expected 4 dimensions")+ } else if shape[3] != 0 {+ panic("cuda does not support 4d tensors")}return &Tensor{diff --git a/model/models/mllama/model.go b/model/models/mllama/model.goindex 93b443ef1..4d5bdd4a1 100644--- a/model/models/mllama/model.go+++ b/model/models/mllama/model.go@@ -3,6 +3,7 @@ package mllamaimport ("bytes""image"+ "slices""github.com/ollama/ollama/fs""github.com/ollama/ollama/kvcache"@@ -73,13 +74,17 @@ func (m *Model) EncodeMultimodal(ctx ml.Context, multimodalData []byte) (any, erreturn nil, err}- pixelValues, err := ctx.Input().FromFloatSlice(f32s, m.imageSize, m.imageSize, m.numChannels, ratio.numTiles())+ if ratio.numTiles() < m.maxNumTiles {+ // Pad tiles to maxNumTiles+ f32s = slices.Grow(f32s, m.imageSize*m.imageSize*m.numChannels*m.maxNumTiles)+ f32s = f32s[:m.imageSize*m.imageSize*m.numChannels*m.maxNumTiles]+ }++ pixelValues, err := ctx.Input().FromFloatSlice(f32s, m.imageSize, m.imageSize, m.numChannels, m.maxNumTiles)if err != nil {return nil, err}- pixelValues = pixelValues.Pad(ctx, 0, 0, 0, m.ImageProcessor.maxNumTiles-ratio.numTiles())-aspectRatio, err := ctx.Input().FromIntSlice([]int32{int32(ratio.rank)}, 1)if err != nil {return nil, err