瀏覽代碼

replace x/exp/slices with slices

Michael Yang 11 月之前
父節點
當前提交
04f3c12bb7
共有 6 個文件被更改,包括 7 次插入8 次删除
  1. 1 1
      cmd/cmd.go
  2. 1 1
      cmd/interactive.go
  3. 1 1
      llm/payload.go
  4. 1 2
      server/images.go
  5. 1 1
      server/routes.go
  6. 2 2
      server/sched.go

+ 1 - 1
cmd/cmd.go

@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"path/filepath"
 	"regexp"
 	"regexp"
 	"runtime"
 	"runtime"
+	"slices"
 	"strings"
 	"strings"
 	"syscall"
 	"syscall"
 	"time"
 	"time"
@@ -29,7 +30,6 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/exp/slices"
 	"golang.org/x/term"
 	"golang.org/x/term"
 
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/api"

+ 1 - 1
cmd/interactive.go

@@ -8,11 +8,11 @@ import (
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
 	"regexp"
 	"regexp"
+	"slices"
 	"sort"
 	"sort"
 	"strings"
 	"strings"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
 
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/envconfig"

+ 1 - 1
llm/payload.go

@@ -10,9 +10,9 @@ import (
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
 	"runtime"
 	"runtime"
+	"slices"
 	"strings"
 	"strings"
 
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/errgroup"
 
 
 	"github.com/ollama/ollama/gpu"
 	"github.com/ollama/ollama/gpu"

+ 1 - 2
server/images.go

@@ -18,11 +18,10 @@ import (
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
 	"runtime"
 	"runtime"
+	"slices"
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/auth"
 	"github.com/ollama/ollama/auth"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/format"

+ 1 - 1
server/routes.go

@@ -16,6 +16,7 @@ import (
 	"os"
 	"os"
 	"os/signal"
 	"os/signal"
 	"path/filepath"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 	"syscall"
 	"syscall"
@@ -23,7 +24,6 @@ import (
 
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
-	"golang.org/x/exp/slices"
 
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/envconfig"

+ 2 - 2
server/sched.go

@@ -7,17 +7,17 @@ import (
 	"log/slog"
 	"log/slog"
 	"reflect"
 	"reflect"
 	"runtime"
 	"runtime"
+	"slices"
 	"sort"
 	"sort"
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/api"
+	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/gpu"
 	"github.com/ollama/ollama/gpu"
 	"github.com/ollama/ollama/llm"
 	"github.com/ollama/ollama/llm"
-	"github.com/ollama/ollama/envconfig"
-	"golang.org/x/exp/slices"
 )
 )
 
 
 type LlmRequest struct {
 type LlmRequest struct {