diff --git a/llm/llama.go b/llm/llama.go index dead6b70..73846de0 100644 --- a/llm/llama.go +++ b/llm/llama.go @@ -136,7 +136,7 @@ type llamaHyperparameters struct { FileType } -func newLlama(model string, opts api.Options) (*llama, error) { +func newLlama(model string, adapters []string, opts api.Options) (*llama, error) { if _, err := os.Stat(model); err != nil { return nil, err } @@ -161,6 +161,12 @@ func newLlama(model string, opts api.Options) (*llama, error) { params.embedding = C.bool(llm.EmbeddingOnly) params.rope_freq_base = C.float(llm.RopeFrequencyBase) params.rope_freq_scale = C.float(llm.RopeFrequencyScale) + + if len(adapters) > 0 && llm.UseMMap { + log.Printf("must disable mmap to use lora adapters") + params.use_mmap = C.bool(false) + } + llm.params = ¶ms cModel := C.CString(model) @@ -176,6 +182,15 @@ func newLlama(model string, opts api.Options) (*llama, error) { return nil, errors.New("failed to create context") } + for _, adapter := range adapters { + cAdapter := C.CString(adapter) + defer C.free(unsafe.Pointer(cAdapter)) + + if retval := C.llama_model_apply_lora_from_file(llm.model, cAdapter, nil, C.int(llm.NumThread)); retval != 0 { + return nil, fmt.Errorf("failed to load adapter %s", adapter) + } + } + // warm up the model bos := []C.llama_token{C.llama_token_bos()} C.llama_eval(llm.ctx, unsafe.SliceData(bos), C.int(len(bos)), 0, C.int(opts.NumThread)) diff --git a/llm/llm.go b/llm/llm.go index e56ea24f..3621c8b2 100644 --- a/llm/llm.go +++ b/llm/llm.go @@ -19,7 +19,7 @@ type LLM interface { Close() } -func New(model string, opts api.Options) (LLM, error) { +func New(model string, adapters []string, opts api.Options) (LLM, error) { if _, err := os.Stat(model); err != nil { return nil, err } @@ -66,7 +66,7 @@ func New(model string, opts api.Options) (LLM, error) { switch ggml.ModelFamily { case ModelFamilyLlama: - return newLlama(model, opts) + return newLlama(model, adapters, opts) default: return nil, fmt.Errorf("unknown ggml type: %s", ggml.ModelFamily) } diff --git a/parser/parser.go b/parser/parser.go index 06ccf786..ded8cf60 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -40,7 +40,7 @@ func Parse(reader io.Reader) ([]Command, error) { command.Args = string(fields[1]) // copy command for validation modelCommand = command - case "LICENSE", "TEMPLATE", "SYSTEM", "PROMPT", "EMBED": + case "LICENSE", "TEMPLATE", "SYSTEM", "PROMPT", "EMBED", "ADAPTER": command.Name = string(bytes.ToLower(fields[0])) command.Args = string(fields[1]) case "PARAMETER": diff --git a/server/images.go b/server/images.go index f179b233..fb749254 100644 --- a/server/images.go +++ b/server/images.go @@ -31,13 +31,14 @@ type RegistryOptions struct { } type Model struct { - Name string `json:"name"` - ModelPath string - Template string - System string - Digest string - Options map[string]interface{} - Embeddings []vector.Embedding + Name string `json:"name"` + ModelPath string + AdapterPaths []string + Template string + System string + Digest string + Options map[string]interface{} + Embeddings []vector.Embedding } func (m *Model) Prompt(request api.GenerateRequest, embedding string) (string, error) { @@ -178,6 +179,8 @@ func GetModel(name string) (*Model, error) { if err = json.NewDecoder(file).Decode(&model.Embeddings); err != nil { return nil, err } + case "application/vnd.ollama.image.adapter": + model.AdapterPaths = append(model.AdapterPaths, filename) case "application/vnd.ollama.image.template": bts, err := os.ReadFile(filename) if err != nil { @@ -330,6 +333,40 @@ func CreateModel(ctx context.Context, name string, path string, fn func(resp api return err } embed.files = append(embed.files, embedFilePath) + case "adapter": + fn(api.ProgressResponse{Status: fmt.Sprintf("creating model %s layer", c.Name)}) + + fp := c.Args + if strings.HasPrefix(fp, "~/") { + parts := strings.Split(fp, "/") + home, err := os.UserHomeDir() + if err != nil { + return fmt.Errorf("failed to open file: %v", err) + } + + fp = filepath.Join(home, filepath.Join(parts[1:]...)) + } + + // If filePath is not an absolute path, make it relative to the modelfile path + if !filepath.IsAbs(fp) { + fp = filepath.Join(filepath.Dir(path), fp) + } + + // create a model from this specified file + fn(api.ProgressResponse{Status: "creating model layer"}) + + file, err := os.Open(fp) + if err != nil { + return fmt.Errorf("failed to open file: %v", err) + } + defer file.Close() + + l, err := CreateLayer(file) + if err != nil { + return fmt.Errorf("failed to create layer: %v", err) + } + l.MediaType = "application/vnd.ollama.image.adapter" + layers = append(layers, l) case "license": fn(api.ProgressResponse{Status: fmt.Sprintf("creating model %s layer", c.Name)}) mediaType := fmt.Sprintf("application/vnd.ollama.image.%s", c.Name) @@ -452,7 +489,7 @@ func embeddingLayers(e EmbeddingParams) ([]*LayerReader, error) { } e.opts.EmbeddingOnly = true - llmModel, err := llm.New(e.model, e.opts) + llmModel, err := llm.New(e.model, []string{}, e.opts) if err != nil { return nil, fmt.Errorf("load model to generate embeddings: %v", err) } diff --git a/server/routes.go b/server/routes.go index 0f058a26..1890f825 100644 --- a/server/routes.go +++ b/server/routes.go @@ -63,7 +63,7 @@ func load(model *Model, reqOpts map[string]interface{}, sessionDuration time.Dur loaded.Embeddings = model.Embeddings } - llmModel, err := llm.New(model.ModelPath, opts) + llmModel, err := llm.New(model.ModelPath, model.AdapterPaths, opts) if err != nil { return err }