From 04f3c12bb716ca763da61cb25884c8859ff81240 Mon Sep 17 00:00:00 2001
From: Michael Yang <mxyng@pm.me>
Date: Tue, 21 May 2024 21:30:52 -0700
Subject: [PATCH] replace x/exp/slices with slices

---
 cmd/cmd.go         | 2 +-
 cmd/interactive.go | 2 +-
 llm/payload.go     | 2 +-
 server/images.go   | 3 +--
 server/routes.go   | 2 +-
 server/sched.go    | 4 ++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index b285f83c..5a451889 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"slices"
 	"strings"
 	"syscall"
 	"time"
@@ -29,7 +30,6 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/exp/slices"
 	"golang.org/x/term"
 
 	"github.com/ollama/ollama/api"
diff --git a/cmd/interactive.go b/cmd/interactive.go
index c055df0e..80a91547 100644
--- a/cmd/interactive.go
+++ b/cmd/interactive.go
@@ -8,11 +8,11 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/envconfig"
diff --git a/llm/payload.go b/llm/payload.go
index abe3d263..a025ee34 100644
--- a/llm/payload.go
+++ b/llm/payload.go
@@ -10,9 +10,9 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/ollama/ollama/gpu"
diff --git a/server/images.go b/server/images.go
index 9254671c..61740126 100644
--- a/server/images.go
+++ b/server/images.go
@@ -18,11 +18,10 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/auth"
 	"github.com/ollama/ollama/format"
diff --git a/server/routes.go b/server/routes.go
index 7a6dfd1f..7fcd2f2f 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -16,6 +16,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"syscall"
@@ -23,7 +24,6 @@ import (
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
-	"golang.org/x/exp/slices"
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/envconfig"
diff --git a/server/sched.go b/server/sched.go
index 8c72177f..46fe2f60 100644
--- a/server/sched.go
+++ b/server/sched.go
@@ -7,17 +7,17 @@ import (
 	"log/slog"
 	"reflect"
 	"runtime"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/ollama/ollama/api"
+	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/gpu"
 	"github.com/ollama/ollama/llm"
-	"github.com/ollama/ollama/envconfig"
-	"golang.org/x/exp/slices"
 )
 
 type LlmRequest struct {