Skip to content

GitLab

Unverified Commit 1b272d5b authored by Patrick Devine's avatar Patrick Devine Committed by GitHub
Browse files

change `github.com/jmorganca/ollama` to `github.com/ollama/ollama` (#3347)

parent 29715dbc
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
.golangci.yaml
View file @ 1b272d5b
...@@ -24,4 +24,4 @@ linters-settings: ...@@ -24,4 +24,4 @@ linters-settings:
- (*os.File).Seek - (*os.File).Seek
- (*bufio.Writer).WriteString - (*bufio.Writer).WriteString
- (*github.com/spf13/pflag.FlagSet).Set - (*github.com/spf13/pflag.FlagSet).Set
- (*github.com/jmorganca/ollama/llm.readSeekOffset).Seek - (*github.com/ollama/ollama/llm.readSeekOffset).Seek
Dockerfile
View file @ 1b272d5b
...@@ -15,8 +15,8 @@ ARG CMAKE_VERSION ...@@ -15,8 +15,8 @@ ARG CMAKE_VERSION
COPY ./scripts/rh_linux_deps.sh / COPY ./scripts/rh_linux_deps.sh /
RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
COPY --from=llm-code / /go/src/github.com/jmorganca/ollama/ COPY --from=llm-code / /go/src/github.com/ollama/ollama/
WORKDIR /go/src/github.com/jmorganca/ollama/llm/generate WORKDIR /go/src/github.com/ollama/ollama/llm/generate
ARG CGO_CFLAGS ARG CGO_CFLAGS
RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh
...@@ -25,8 +25,8 @@ ARG CMAKE_VERSION ...@@ -25,8 +25,8 @@ ARG CMAKE_VERSION
COPY ./scripts/rh_linux_deps.sh / COPY ./scripts/rh_linux_deps.sh /
RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH
COPY --from=llm-code / /go/src/github.com/jmorganca/ollama/ COPY --from=llm-code / /go/src/github.com/ollama/ollama/
WORKDIR /go/src/github.com/jmorganca/ollama/llm/generate WORKDIR /go/src/github.com/ollama/ollama/llm/generate
ARG CGO_CFLAGS ARG CGO_CFLAGS
RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh
...@@ -36,18 +36,18 @@ COPY ./scripts/rh_linux_deps.sh / ...@@ -36,18 +36,18 @@ COPY ./scripts/rh_linux_deps.sh /
RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh RUN CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
ENV LIBRARY_PATH /opt/amdgpu/lib64 ENV LIBRARY_PATH /opt/amdgpu/lib64
COPY --from=llm-code / /go/src/github.com/jmorganca/ollama/ COPY --from=llm-code / /go/src/github.com/ollama/ollama/
WORKDIR /go/src/github.com/jmorganca/ollama/llm/generate WORKDIR /go/src/github.com/ollama/ollama/llm/generate
ARG CGO_CFLAGS ARG CGO_CFLAGS
ARG AMDGPU_TARGETS ARG AMDGPU_TARGETS
RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh RUN OLLAMA_SKIP_CPU_GENERATE=1 sh gen_linux.sh
RUN mkdir /tmp/scratch && \ RUN mkdir /tmp/scratch && \
for dep in $(cat /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/x86_64/rocm*/lib/deps.txt) ; do \ for dep in $(cat /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/x86_64/rocm*/lib/deps.txt) ; do \
cp ${dep} /tmp/scratch/ || exit 1 ; \ cp ${dep} /tmp/scratch/ || exit 1 ; \
done && \ done && \
(cd /opt/rocm/lib && tar cf - rocblas/library) | (cd /tmp/scratch/ && tar xf - ) && \ (cd /opt/rocm/lib && tar cf - rocblas/library) | (cd /tmp/scratch/ && tar xf - ) && \
mkdir -p /go/src/github.com/jmorganca/ollama/dist/deps/ && \ mkdir -p /go/src/github.com/ollama/ollama/dist/deps/ && \
(cd /tmp/scratch/ && tar czvf /go/src/github.com/jmorganca/ollama/dist/deps/ollama-linux-amd64-rocm.tgz . ) (cd /tmp/scratch/ && tar czvf /go/src/github.com/ollama/ollama/dist/deps/ollama-linux-amd64-rocm.tgz . )
FROM --platform=linux/amd64 centos:7 AS cpu-builder-amd64 FROM --platform=linux/amd64 centos:7 AS cpu-builder-amd64
...@@ -56,10 +56,10 @@ ARG GOLANG_VERSION ...@@ -56,10 +56,10 @@ ARG GOLANG_VERSION
COPY ./scripts/rh_linux_deps.sh / COPY ./scripts/rh_linux_deps.sh /
RUN CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh RUN CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
COPY --from=llm-code / /go/src/github.com/jmorganca/ollama/ COPY --from=llm-code / /go/src/github.com/ollama/ollama/
ARG OLLAMA_CUSTOM_CPU_DEFS ARG OLLAMA_CUSTOM_CPU_DEFS
ARG CGO_CFLAGS ARG CGO_CFLAGS
WORKDIR /go/src/github.com/jmorganca/ollama/llm/generate WORKDIR /go/src/github.com/ollama/ollama/llm/generate
FROM --platform=linux/amd64 cpu-builder-amd64 AS cpu-build-amd64 FROM --platform=linux/amd64 cpu-builder-amd64 AS cpu-build-amd64
RUN OLLAMA_CPU_TARGET="cpu" sh gen_linux.sh RUN OLLAMA_CPU_TARGET="cpu" sh gen_linux.sh
...@@ -74,8 +74,8 @@ ARG GOLANG_VERSION ...@@ -74,8 +74,8 @@ ARG GOLANG_VERSION
COPY ./scripts/rh_linux_deps.sh / COPY ./scripts/rh_linux_deps.sh /
RUN CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh RUN CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
COPY --from=llm-code / /go/src/github.com/jmorganca/ollama/ COPY --from=llm-code / /go/src/github.com/ollama/ollama/
WORKDIR /go/src/github.com/jmorganca/ollama/llm/generate WORKDIR /go/src/github.com/ollama/ollama/llm/generate
# Note, we only build the "base" CPU variant on arm since avx/avx2 are x86 features # Note, we only build the "base" CPU variant on arm since avx/avx2 are x86 features
ARG OLLAMA_CUSTOM_CPU_DEFS ARG OLLAMA_CUSTOM_CPU_DEFS
ARG CGO_CFLAGS ARG CGO_CFLAGS
...@@ -84,13 +84,13 @@ RUN OLLAMA_CPU_TARGET="cpu" sh gen_linux.sh ...@@ -84,13 +84,13 @@ RUN OLLAMA_CPU_TARGET="cpu" sh gen_linux.sh
# Intermediate stage used for ./scripts/build_linux.sh # Intermediate stage used for ./scripts/build_linux.sh
FROM --platform=linux/amd64 cpu-build-amd64 AS build-amd64 FROM --platform=linux/amd64 cpu-build-amd64 AS build-amd64
ENV CGO_ENABLED 1 ENV CGO_ENABLED 1
WORKDIR /go/src/github.com/jmorganca/ollama WORKDIR /go/src/github.com/ollama/ollama
COPY . . COPY . .
COPY --from=cpu_avx-build-amd64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ COPY --from=cpu_avx-build-amd64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
COPY --from=cpu_avx2-build-amd64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ COPY --from=cpu_avx2-build-amd64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
COPY --from=cuda-build-amd64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ COPY --from=cuda-build-amd64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
COPY --from=rocm-build-amd64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ COPY --from=rocm-build-amd64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
COPY --from=rocm-build-amd64 /go/src/github.com/jmorganca/ollama/dist/deps/ ./dist/deps/ COPY --from=rocm-build-amd64 /go/src/github.com/ollama/ollama/dist/deps/ ./dist/deps/
ARG GOFLAGS ARG GOFLAGS
ARG CGO_CFLAGS ARG CGO_CFLAGS
RUN go build -trimpath . RUN go build -trimpath .
...@@ -99,10 +99,10 @@ RUN go build -trimpath . ...@@ -99,10 +99,10 @@ RUN go build -trimpath .
FROM --platform=linux/arm64 cpu-build-arm64 AS build-arm64 FROM --platform=linux/arm64 cpu-build-arm64 AS build-arm64
ENV CGO_ENABLED 1 ENV CGO_ENABLED 1
ARG GOLANG_VERSION ARG GOLANG_VERSION
WORKDIR /go/src/github.com/jmorganca/ollama WORKDIR /go/src/github.com/ollama/ollama
COPY . . COPY . .
COPY --from=cuda-build-arm64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ COPY --from=cuda-build-arm64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
RUN mkdir -p /go/src/github.com/jmorganca/ollama/dist/deps/ RUN mkdir -p /go/src/github.com/ollama/ollama/dist/deps/
ARG GOFLAGS ARG GOFLAGS
ARG CGO_CFLAGS ARG CGO_CFLAGS
RUN go build -trimpath . RUN go build -trimpath .
...@@ -110,15 +110,15 @@ RUN go build -trimpath . ...@@ -110,15 +110,15 @@ RUN go build -trimpath .
# Runtime stages # Runtime stages
FROM --platform=linux/amd64 ubuntu:22.04 as runtime-amd64 FROM --platform=linux/amd64 ubuntu:22.04 as runtime-amd64
RUN apt-get update && apt-get install -y ca-certificates RUN apt-get update && apt-get install -y ca-certificates
COPY --from=build-amd64 /go/src/github.com/jmorganca/ollama/ollama /bin/ollama COPY --from=build-amd64 /go/src/github.com/ollama/ollama/ollama /bin/ollama
FROM --platform=linux/arm64 ubuntu:22.04 as runtime-arm64 FROM --platform=linux/arm64 ubuntu:22.04 as runtime-arm64
RUN apt-get update && apt-get install -y ca-certificates RUN apt-get update && apt-get install -y ca-certificates
COPY --from=build-arm64 /go/src/github.com/jmorganca/ollama/ollama /bin/ollama COPY --from=build-arm64 /go/src/github.com/ollama/ollama/ollama /bin/ollama
# Radeon images are much larger so we keep it distinct from the CPU/CUDA image # Radeon images are much larger so we keep it distinct from the CPU/CUDA image
FROM --platform=linux/amd64 rocm/dev-centos-7:${ROCM_VERSION}-complete as runtime-rocm FROM --platform=linux/amd64 rocm/dev-centos-7:${ROCM_VERSION}-complete as runtime-rocm
RUN update-pciids RUN update-pciids
COPY --from=build-amd64 /go/src/github.com/jmorganca/ollama/ollama /bin/ollama COPY --from=build-amd64 /go/src/github.com/ollama/ollama/ollama /bin/ollama
EXPOSE 11434 EXPOSE 11434
ENV OLLAMA_HOST 0.0.0.0 ENV OLLAMA_HOST 0.0.0.0
......
README.md
View file @ 1b272d5b
<div align="center"> <div align="center">
<img alt="ollama" height="200px" src="https://github.com/jmorganca/ollama/assets/3325447/0d0b44e2-8f4a-4e99-9b52-a5c1c741c8f7"> <img alt="ollama" height="200px" src="https://github.com/ollama/ollama/assets/3325447/0d0b44e2-8f4a-4e99-9b52-a5c1c741c8f7">
</div> </div>
# Ollama # Ollama
...@@ -22,7 +22,7 @@ Get up and running with large language models locally. ...@@ -22,7 +22,7 @@ Get up and running with large language models locally.
curl -fsSL https://ollama.com/install.sh | sh curl -fsSL https://ollama.com/install.sh | sh
``` ```
[Manual install instructions](https://github.com/jmorganca/ollama/blob/main/docs/linux.md) [Manual install instructions](https://github.com/ollama/ollama/blob/main/docs/linux.md)
### Docker ### Docker
...@@ -213,7 +213,7 @@ Then build the binary: ...@@ -213,7 +213,7 @@ Then build the binary:
go build . go build .
``` ```
More detailed instructions can be found in the [developer guide](https://github.com/jmorganca/ollama/blob/main/docs/development.md) More detailed instructions can be found in the [developer guide](https://github.com/ollama/ollama/blob/main/docs/development.md)
### Running local builds ### Running local builds
......
api/client.go
View file @ 1b272d5b
...@@ -15,8 +15,8 @@ import ( ...@@ -15,8 +15,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/jmorganca/ollama/format" "github.com/ollama/ollama/format"
"github.com/jmorganca/ollama/version" "github.com/ollama/ollama/version"
) )
type Client struct { type Client struct {
......
app/lifecycle/lifecycle.go
View file @ 1b272d5b
...@@ -9,8 +9,8 @@ import ( ...@@ -9,8 +9,8 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/jmorganca/ollama/app/store" "github.com/ollama/ollama/app/store"
"github.com/jmorganca/ollama/app/tray" "github.com/ollama/ollama/app/tray"
) )
func Run() { func Run() {
......
app/lifecycle/server.go
View file @ 1b272d5b
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
) )
func getCLIFullPath(command string) string { func getCLIFullPath(command string) string {
......
app/lifecycle/updater.go
View file @ 1b272d5b
...@@ -18,8 +18,8 @@ import ( ...@@ -18,8 +18,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/jmorganca/ollama/auth" "github.com/ollama/ollama/auth"
"github.com/jmorganca/ollama/version" "github.com/ollama/ollama/version"
) )
var ( var (
......
app/main.go
View file @ 1b272d5b
...@@ -4,7 +4,7 @@ package main ...@@ -4,7 +4,7 @@ package main
// go build -ldflags="-H windowsgui" . // go build -ldflags="-H windowsgui" .
import ( import (
"github.com/jmorganca/ollama/app/lifecycle" "github.com/ollama/ollama/app/lifecycle"
) )
func main() { func main() {
......
app/tray/tray.go
View file @ 1b272d5b
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"runtime" "runtime"
"github.com/jmorganca/ollama/app/assets" "github.com/ollama/ollama/app/assets"
"github.com/jmorganca/ollama/app/tray/commontray" "github.com/ollama/ollama/app/tray/commontray"
) )
func NewTray() (commontray.OllamaTray, error) { func NewTray() (commontray.OllamaTray, error) {
......
app/tray/tray_nonwindows.go
View file @ 1b272d5b
...@@ -5,7 +5,7 @@ package tray ...@@ -5,7 +5,7 @@ package tray
import ( import (
"fmt" "fmt"
"github.com/jmorganca/ollama/app/tray/commontray" "github.com/ollama/ollama/app/tray/commontray"
) )
func InitPlatformTray(icon, updateIcon []byte) (commontray.OllamaTray, error) { func InitPlatformTray(icon, updateIcon []byte) (commontray.OllamaTray, error) {
......
app/tray/tray_windows.go
View file @ 1b272d5b
package tray package tray
import ( import (
"github.com/jmorganca/ollama/app/tray/commontray" "github.com/ollama/ollama/app/tray/commontray"
"github.com/jmorganca/ollama/app/tray/wintray" "github.com/ollama/ollama/app/tray/wintray"
) )
func InitPlatformTray(icon, updateIcon []byte) (commontray.OllamaTray, error) { func InitPlatformTray(icon, updateIcon []byte) (commontray.OllamaTray, error) {
......
app/tray/wintray/tray.go
View file @ 1b272d5b
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"sync" "sync"
"unsafe" "unsafe"
"github.com/jmorganca/ollama/app/tray/commontray" "github.com/ollama/ollama/app/tray/commontray"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )
......
cmd/cmd.go
View file @ 1b272d5b
...@@ -30,12 +30,12 @@ import ( ...@@ -30,12 +30,12 @@ import (
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"golang.org/x/term" "golang.org/x/term"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
"github.com/jmorganca/ollama/format" "github.com/ollama/ollama/format"
"github.com/jmorganca/ollama/parser" "github.com/ollama/ollama/parser"
"github.com/jmorganca/ollama/progress" "github.com/ollama/ollama/progress"
"github.com/jmorganca/ollama/server" "github.com/ollama/ollama/server"
"github.com/jmorganca/ollama/version" "github.com/ollama/ollama/version"
) )
func CreateHandler(cmd *cobra.Command, args []string) error { func CreateHandler(cmd *cobra.Command, args []string) error {
......
cmd/interactive.go
View file @ 1b272d5b
...@@ -14,9 +14,9 @@ import ( ...@@ -14,9 +14,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
"github.com/jmorganca/ollama/progress" "github.com/ollama/ollama/progress"
"github.com/jmorganca/ollama/readline" "github.com/ollama/ollama/readline"
) )
type MultilineState int type MultilineState int
......
cmd/interactive_test.go
View file @ 1b272d5b
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
) )
func TestExtractFilenames(t *testing.T) { func TestExtractFilenames(t *testing.T) {
......
cmd/start_darwin.go
View file @ 1b272d5b
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
) )
func startApp(ctx context.Context, client *api.Client) error { func startApp(ctx context.Context, client *api.Client) error {
......
cmd/start_default.go
View file @ 1b272d5b
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
) )
func startApp(ctx context.Context, client *api.Client) error { func startApp(ctx context.Context, client *api.Client) error {
......
cmd/start_windows.go
View file @ 1b272d5b
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/jmorganca/ollama/api" "github.com/ollama/ollama/api"
) )
func startApp(ctx context.Context, client *api.Client) error { func startApp(ctx context.Context, client *api.Client) error {
......
convert/convert.go
View file @ 1b272d5b
...@@ -16,8 +16,8 @@ import ( ...@@ -16,8 +16,8 @@ import (
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"github.com/jmorganca/ollama/convert/sentencepiece" "github.com/ollama/ollama/convert/sentencepiece"
"github.com/jmorganca/ollama/llm" "github.com/ollama/ollama/llm"
) )
type Params struct { type Params struct {
......
docs/faq.md
View file @ 1b272d5b
...@@ -154,7 +154,7 @@ No. Ollama runs locally, and conversation data does not leave your machine. ...@@ -154,7 +154,7 @@ No. Ollama runs locally, and conversation data does not leave your machine.
## How can I use Ollama in Visual Studio Code? ## How can I use Ollama in Visual Studio Code?
There is already a large collection of plugins available for VSCode as well as other editors that leverage Ollama. See the list of [extensions & plugins](https://github.com/jmorganca/ollama#extensions--plugins) at the bottom of the main repository readme. There is already a large collection of plugins available for VSCode as well as other editors that leverage Ollama. See the list of [extensions & plugins](https://github.com/ollama/ollama#extensions--plugins) at the bottom of the main repository readme.
## How do I use Ollama behind a proxy? ## How do I use Ollama behind a proxy?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment