33ee7168ba
release / setup-environment (push) Has been cancelled
release / windows-depends (amd64, , https://sdk.lunarg.com/sdk/download/1.4.321.1/windows/vulkansdk-windows-X64-1.4.321.1.exe, windows, Vulkan, vulkan) (push) Has been cancelled
release / windows-depends (amd64, -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-parallel-jobs=4 -Wno-ignored-attributes -Wno-deprecated-pragma" -DCMAKE_CXX_FLAGS="-parallel-jobs=4 -Wno-ignored-attributes -Wno-deprecated-pragma", https:/… (push) Has been cancelled
release / windows-depends (amd64, ["cudart" "nvcc" "cublas" "cublas_dev" "crt" "nvvm" "nvptxcompiler"], 13.0, , https://developer.download.nvidia.com/compute/cuda/13.0.0/local_installers/cuda_13.0.0_windows.exe, windows, CUDA 13) (push) Has been cancelled
release / windows-depends (amd64, ["cudart" "nvcc" "cublas" "cublas_dev"], 12.8, , https://developer.download.nvidia.com/compute/cuda/12.8.0/local_installers/cuda_12.8.0_571.96_windows.exe, windows, CUDA 12) (push) Has been cancelled
release / windows-depends (amd64, windows, CPU) (push) Has been cancelled
release / darwin-build (push) Has been cancelled
release / windows-build (amd64, x86_64, windows) (push) Has been cancelled
release / windows-build (arm64, aarch64, windows) (push) Has been cancelled
release / windows-app (push) Has been cancelled
release / linux-build (amd64, linux, archive) (push) Has been cancelled
release / linux-build (amd64, linux, rocm) (push) Has been cancelled
release / linux-build (arm64, linux, archive) (push) Has been cancelled
release / docker-build-push (amd64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
, linux) (push) Has been cancelled
release / docker-build-push (amd64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
FLAVOR=rocm
, linux, -rocm) (push) Has been cancelled
release / docker-build-push (arm64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
, linux) (push) Has been cancelled
release / docker-merge-push () (push) Has been cancelled
release / docker-merge-push (-rocm) (push) Has been cancelled
release / release (push) Has been cancelled
* WIP - MLX backend with gemma3 * MLX: add cmake and go tag build toggles To build the new MLX backend code: cmake --preset MLX cmake --build --preset MLX --parallel cmake --install build --component MLX go build -tags mlx . Note: the main.go entrypoint for the MLX engine will change in a follow up commit. * add experimental image generation runtime * add experimental image generation runtime * MLX: wire up cuda build for linux * MLX: get dependencies correct and dedup This is still too large for a unified github artifact, but is now "correct" for the mlx_cuda_v13 directory. * fix relative link bug in dedup * Add darwin build and readme * add go build tag for mlx dependent code and wire up build_darwin.sh * lint cleanup * macos: build mlx for x86 This will be CPU only. * cuda build instructions and fix drift from mlx bump * stale comment * Delete agent helper doc * Clean up readme.md * Revise README for tokenizer clarity and details Updated README to clarify tokenizer functionality and removed correctness section. --------- Co-authored-by: jmorganca <jmorganca@gmail.com>
171 lines
3.8 KiB
Go
171 lines
3.8 KiB
Go
package convert
|
|
|
|
import (
|
|
"cmp"
|
|
"strings"
|
|
|
|
"github.com/pdevine/tensor"
|
|
"github.com/pdevine/tensor/native"
|
|
|
|
"github.com/ollama/ollama/fs"
|
|
"github.com/ollama/ollama/fs/ggml"
|
|
)
|
|
|
|
type llamaAdapter struct {
|
|
AdapterParameters
|
|
NumAttentionHeads uint32 `json:"num_attention_heads"`
|
|
NumKeyValueHeads uint32 `json:"num_key_value_heads"`
|
|
}
|
|
|
|
var _ AdapterConverter = (*llamaAdapter)(nil)
|
|
|
|
func (p *llamaAdapter) KV(baseKV fs.Config) KV {
|
|
kv := p.AdapterParameters.KV()
|
|
kv["general.architecture"] = "llama"
|
|
kv["llama.attention.head_count"] = baseKV.Value("llama.attention.head_count")
|
|
kv["llama.attention.head_count_kv"] = baseKV.Value("llama.attention.head_count_kv")
|
|
|
|
p.NumAttentionHeads = baseKV.Value("llama.attention.head_count").(uint32)
|
|
|
|
return kv
|
|
}
|
|
|
|
func (p *llamaAdapter) Tensors(ts []Tensor) []*ggml.Tensor {
|
|
var out []*ggml.Tensor
|
|
for _, t := range ts {
|
|
shape := t.Shape()
|
|
if (strings.HasSuffix(t.Name(), "weight.lora_a") && shape[0] > shape[1]) ||
|
|
(strings.HasSuffix(t.Name(), "weight.lora_b") && shape[0] < shape[1]) {
|
|
shape[0], shape[1] = shape[1], shape[0]
|
|
t.SetRepacker(p.repackAndTranspose)
|
|
} else {
|
|
t.SetRepacker(p.repack)
|
|
}
|
|
|
|
out = append(out, &ggml.Tensor{
|
|
Name: t.Name(),
|
|
Kind: t.Kind(),
|
|
Shape: shape,
|
|
WriterTo: t,
|
|
})
|
|
}
|
|
|
|
return out
|
|
}
|
|
|
|
func (p *llamaAdapter) Replacements() []string {
|
|
return []string{
|
|
"base_model.model.", "",
|
|
"model.layers", "blk",
|
|
"self_attn.q_proj", "attn_q",
|
|
"self_attn.k_proj", "attn_k",
|
|
"self_attn.v_proj", "attn_v",
|
|
"self_attn.o_proj", "attn_output",
|
|
"mlp.gate_proj", "ffn_gate",
|
|
"mlp.down_proj", "ffn_down",
|
|
"mlp.up_proj", "ffn_up",
|
|
"lora_A.weight", "weight.lora_a",
|
|
"lora_B.weight", "weight.lora_b",
|
|
"lora_a", "weight.lora_a",
|
|
"lora_b", "weight.lora_b",
|
|
}
|
|
}
|
|
|
|
func (p *llamaAdapter) repack(name string, data []float32, shape []uint64) ([]float32, error) {
|
|
dims := []int{int(shape[1]), int(shape[0])}
|
|
|
|
var heads uint32
|
|
if strings.HasSuffix(name, "attn_q.weight.lora_a") {
|
|
heads = p.NumAttentionHeads
|
|
} else if strings.HasSuffix(name, "attn_k.weight.lora_a") {
|
|
heads = cmp.Or(p.NumKeyValueHeads, p.NumAttentionHeads)
|
|
} else {
|
|
return data, nil
|
|
}
|
|
|
|
n := tensor.New(tensor.WithShape(dims...), tensor.WithBacking(data))
|
|
|
|
if err := n.Reshape(append([]int{int(heads), 2, dims[0] / int(heads) / 2}, dims[1:]...)...); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.T(0, 2, 1, 3); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Reshape(dims...); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Transpose(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ts, err := native.SelectF32(n, 1)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var f32s []float32
|
|
for _, t := range ts {
|
|
f32s = append(f32s, t...)
|
|
}
|
|
|
|
return f32s, nil
|
|
}
|
|
|
|
func (p *llamaAdapter) repackAndTranspose(name string, data []float32, shape []uint64) ([]float32, error) {
|
|
dims := []int{int(shape[1]), int(shape[0])}
|
|
|
|
n := tensor.New(tensor.WithShape(dims...), tensor.WithBacking(data))
|
|
|
|
var heads uint32
|
|
if strings.HasSuffix(name, "attn_q.weight.lora_a") {
|
|
heads = p.NumAttentionHeads
|
|
} else if strings.HasSuffix(name, "attn_k.weight.lora_a") {
|
|
heads = cmp.Or(p.NumKeyValueHeads, p.NumAttentionHeads)
|
|
}
|
|
|
|
if heads > 0 {
|
|
if err := n.Reshape(append([]int{int(heads), 2, dims[0] / int(heads) / 2}, dims[1:]...)...); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.T(0, 2, 1, 3); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Reshape(dims...); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Transpose(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
if err := n.T(1, 0); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Reshape(dims...); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := n.Transpose(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ts, err := native.SelectF32(n, 1)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var f32s []float32
|
|
for _, t := range ts {
|
|
f32s = append(f32s, t...)
|
|
}
|
|
|
|
return f32s, nil
|
|
}
|