jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

benchmark

Browse Source
This commit is contained in:
Josh Yan 2024-07-02 14:53:54 -07:00
parent a993a3a85c
commit 461c964941
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/cmd.go
View File

@ -287,7 +287,18 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er
// Resolve server to IP // Resolve server to IP
// Check if server is local // Check if server is local
if client.IsLocal() { if client.IsLocal() {
err := createBlobLocal(cmd.Context(), client, path, digest) config, err := client.ServerConfig(cmd.Context())
if err != nil {
return "", err
}
modelDir := config.ModelDir
// Get blob destination
digest = strings.ReplaceAll(digest, ":", "-")
dest := filepath.Join(modelDir, "blobs", digest)
err = createBlobLocal(path, dest)
if err == nil { if err == nil {
return digest, nil return digest, nil
} }
@ -299,32 +310,17 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er
return digest, nil return digest, nil
} }
func createBlobLocal(ctx context.Context, client *api.Client, path string, digest string) error { func createBlobLocal(path string, dest string) error {
// This function should be called if the server is local // This function should be called if the server is local
// It should find the model directory, copy the blob over, and return the digest // It should find the model directory, copy the blob over, and return the digest
// Get the model directory
config, err := client.ServerConfig(ctx)
if err != nil {
return err
}
modelDir := config.ModelDir
// Get blob destination
digest = strings.ReplaceAll(digest, ":", "-")
dest := filepath.Join(modelDir, "blobs", digest)
dirPath := filepath.Dir(dest) dirPath := filepath.Dir(dest)
if digest == "" {
dirPath = dest
}
if err := os.MkdirAll(dirPath, 0o755); err != nil { if err := os.MkdirAll(dirPath, 0o755); err != nil {
return err return err
} }
// Check blob exists // Check blob exists
_, err = os.Stat(dest) _, err := os.Stat(dest)
switch { switch {
case errors.Is(err, os.ErrNotExist): case errors.Is(err, os.ErrNotExist):
// noop // noop
@ -348,7 +344,7 @@ func createBlobLocal(ctx context.Context, client *api.Client, path string, diges
} }
defer destFile.Close() defer destFile.Close()
_, err = io.Copy(destFile, sourceFile) _, err = io.CopyBuffer(destFile, sourceFile, make([]byte, 4*1024*1024))
if err != nil { if err != nil {
return fmt.Errorf("error copying file: %v", err) return fmt.Errorf("error copying file: %v", err)
} }

13
cmd/cmd_test.go Normal file
View File

@ -0,0 +1,13 @@
package cmd
import (
"testing"
)
func BenchmarkCreateLocalBlob(b *testing.B) {
for i := 0; i < b.N; i++ {
dest := b.TempDir() + "/hi"
createBlobLocal("/Users/joshyan/.ollama/models/blobs/sha256-edd739ebd0b09f4e9345e8dc76d06ec37d08a080246560e57f7f1443fa3e57af", dest)
}
}