Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
1b272d5b
Unverified
Commit
1b272d5b
authored
Mar 26, 2024
by
Patrick Devine
Committed by
GitHub
Mar 26, 2024
Browse files
change `github.com/jmorganca/ollama` to `github.com/ollama/ollama` (#3347)
parent
29715dbc
Changes
54
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
33 additions
and
33 deletions
+33
-33
progress/bar.go
progress/bar.go
+1
-1
scripts/build_darwin.sh
scripts/build_darwin.sh
+1
-1
scripts/build_docker.sh
scripts/build_docker.sh
+2
-2
scripts/build_linux.sh
scripts/build_linux.sh
+3
-3
scripts/build_windows.ps1
scripts/build_windows.ps1
+2
-2
scripts/push_docker.sh
scripts/push_docker.sh
+1
-1
server/auth.go
server/auth.go
+2
-2
server/download.go
server/download.go
+2
-2
server/images.go
server/images.go
+5
-5
server/prompt.go
server/prompt.go
+1
-1
server/prompt_test.go
server/prompt_test.go
+1
-1
server/routes.go
server/routes.go
+6
-6
server/routes_test.go
server/routes_test.go
+4
-4
server/upload.go
server/upload.go
+2
-2
No files found.
progress/bar.go
View file @
1b272d5b
...
...
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/
jmorganc
a/ollama/format"
"github.com/
ollam
a/ollama/format"
"golang.org/x/term"
)
...
...
scripts/build_darwin.sh
View file @
1b272d5b
...
...
@@ -3,7 +3,7 @@
set
-e
export
VERSION
=
${
VERSION
:-
$(
git describe
--tags
--first-parent
--abbrev
=
7
--long
--dirty
--always
|
sed
-e
"s/^v//g"
)
}
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
jmorganc
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
jmorganc
a/ollama/server.mode=release
\"
'"
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
ollam
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
ollam
a/ollama/server.mode=release
\"
'"
mkdir
-p
dist
...
...
scripts/build_docker.sh
View file @
1b272d5b
...
...
@@ -3,7 +3,7 @@
set
-eu
export
VERSION
=
${
VERSION
:-
$(
git describe
--tags
--first-parent
--abbrev
=
7
--long
--dirty
--always
|
sed
-e
"s/^v//g"
)
}
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
jmorganc
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
jmorganc
a/ollama/server.mode=release
\"
'"
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
ollam
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
ollam
a/ollama/server.mode=release
\"
'"
# We use 2 different image repositories to handle combining architecture images into multiarch manifest
# (The ROCm image is x86 only and is not a multiarch manifest)
...
...
scripts/build_linux.sh
View file @
1b272d5b
...
...
@@ -3,7 +3,7 @@
set
-eu
export
VERSION
=
${
VERSION
:-
$(
git describe
--tags
--first-parent
--abbrev
=
7
--long
--dirty
--always
|
sed
-e
"s/^v//g"
)
}
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
jmorganc
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
jmorganc
a/ollama/server.mode=release
\"
'"
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
ollam
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
ollam
a/ollama/server.mode=release
\"
'"
BUILD_ARCH
=
${
BUILD_ARCH
:-
"amd64 arm64"
}
export
AMDGPU_TARGETS
=
${
AMDGPU_TARGETS
:
=
""
}
...
...
@@ -21,10 +21,10 @@ for TARGETARCH in ${BUILD_ARCH}; do
-t
builder:
$TARGETARCH
\
.
docker create
--platform
linux/
$TARGETARCH
--name
builder-
$TARGETARCH
builder:
$TARGETARCH
docker
cp
builder-
$TARGETARCH
:/go/src/github.com/
jmorganc
a/ollama/ollama ./dist/ollama-linux-
$TARGETARCH
docker
cp
builder-
$TARGETARCH
:/go/src/github.com/
ollam
a/ollama/ollama ./dist/ollama-linux-
$TARGETARCH
if
[
"
$TARGETARCH
"
=
"amd64"
]
;
then
docker
cp
builder-
$TARGETARCH
:/go/src/github.com/
jmorganc
a/ollama/dist/deps/ ./dist/
docker
cp
builder-
$TARGETARCH
:/go/src/github.com/
ollam
a/ollama/dist/deps/ ./dist/
fi
docker
rm
builder-
$TARGETARCH
...
...
scripts/build_windows.ps1
View file @
1b272d5b
...
...
@@ -74,7 +74,7 @@ function buildOllama() {
}
else
{
write-host
"Skipping generate step with OLLAMA_SKIP_GENERATE set"
}
&
go
build
-trimpath
-ldflags
"-s -w -X=github.com/
jmorganc
a/ollama/version.Version=
$
script
:
VERSION
-X=github.com/
jmorganc
a/ollama/server.mode=release"
.
&
go
build
-trimpath
-ldflags
"-s -w -X=github.com/
ollam
a/ollama/version.Version=
$
script
:
VERSION
-X=github.com/
ollam
a/ollama/server.mode=release"
.
if
(
$LASTEXITCODE
-ne
0
)
{
exit
(
$LASTEXITCODE
)}
if
(
"
${env:KEY_CONTAINER}
"
)
{
&
"
${script:SignTool}
"
sign
/v
/fd
sha256
/t
http://timestamp.digicert.com
/f
"
${script:OLLAMA_CERT}
"
`
...
...
@@ -89,7 +89,7 @@ function buildApp() {
write-host
"Building Ollama App"
cd
"
${script:SRC_DIR}
\app"
&
windres
-l
0
-o
ollama.syso
ollama.rc
&
go
build
-trimpath
-ldflags
"-s -w -H windowsgui -X=github.com/
jmorganc
a/ollama/version.Version=
$
script
:
VERSION
-X=github.com/
jmorganc
a/ollama/server.mode=release"
.
&
go
build
-trimpath
-ldflags
"-s -w -H windowsgui -X=github.com/
ollam
a/ollama/version.Version=
$
script
:
VERSION
-X=github.com/
ollam
a/ollama/server.mode=release"
.
if
(
$LASTEXITCODE
-ne
0
)
{
exit
(
$LASTEXITCODE
)}
if
(
"
${env:KEY_CONTAINER}
"
)
{
&
"
${script:SignTool}
"
sign
/v
/fd
sha256
/t
http://timestamp.digicert.com
/f
"
${script:OLLAMA_CERT}
"
`
...
...
scripts/push_docker.sh
View file @
1b272d5b
...
...
@@ -3,7 +3,7 @@
set
-eu
export
VERSION
=
${
VERSION
:-
0
.0.0
}
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
jmorganc
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
jmorganc
a/ollama/server.mode=release
\"
'"
export
GOFLAGS
=
"'-ldflags=-w -s
\"
-X=github.com/
ollam
a/ollama/version.Version=
$VERSION
\"
\"
-X=github.com/
ollam
a/ollama/server.mode=release
\"
'"
docker build
\
--push
\
...
...
server/auth.go
View file @
1b272d5b
...
...
@@ -15,8 +15,8 @@ import (
"strings"
"time"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/auth"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/auth"
)
type
registryChallenge
struct
{
...
...
server/download.go
View file @
1b272d5b
...
...
@@ -21,8 +21,8 @@ import (
"golang.org/x/sync/errgroup"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/format"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/format"
)
const
maxRetries
=
6
...
...
server/images.go
View file @
1b272d5b
...
...
@@ -24,11 +24,11 @@ import (
"golang.org/x/exp/slices"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/convert"
"github.com/
jmorganc
a/ollama/llm"
"github.com/
jmorganc
a/ollama/parser"
"github.com/
jmorganc
a/ollama/version"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/convert"
"github.com/
ollam
a/ollama/llm"
"github.com/
ollam
a/ollama/parser"
"github.com/
ollam
a/ollama/version"
)
type
registryOptions
struct
{
...
...
server/prompt.go
View file @
1b272d5b
...
...
@@ -7,7 +7,7 @@ import (
"text/template"
"text/template/parse"
"github.com/
jmorganc
a/ollama/api"
"github.com/
ollam
a/ollama/api"
)
// isResponseNode checks if the node contains .Response
...
...
server/prompt_test.go
View file @
1b272d5b
...
...
@@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/
jmorganc
a/ollama/api"
"github.com/
ollam
a/ollama/api"
)
func
TestPrompt
(
t
*
testing
.
T
)
{
...
...
server/routes.go
View file @
1b272d5b
...
...
@@ -27,12 +27,12 @@ import (
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/gpu"
"github.com/
jmorganc
a/ollama/llm"
"github.com/
jmorganc
a/ollama/openai"
"github.com/
jmorganc
a/ollama/parser"
"github.com/
jmorganc
a/ollama/version"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/gpu"
"github.com/
ollam
a/ollama/llm"
"github.com/
ollam
a/ollama/openai"
"github.com/
ollam
a/ollama/parser"
"github.com/
ollam
a/ollama/version"
)
var
mode
string
=
gin
.
DebugMode
...
...
server/routes_test.go
View file @
1b272d5b
...
...
@@ -15,10 +15,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/llm"
"github.com/
jmorganc
a/ollama/parser"
"github.com/
jmorganc
a/ollama/version"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/llm"
"github.com/
ollam
a/ollama/parser"
"github.com/
ollam
a/ollama/version"
)
func
Test_Routes
(
t
*
testing
.
T
)
{
...
...
server/upload.go
View file @
1b272d5b
...
...
@@ -16,8 +16,8 @@ import (
"sync/atomic"
"time"
"github.com/
jmorganc
a/ollama/api"
"github.com/
jmorganc
a/ollama/format"
"github.com/
ollam
a/ollama/api"
"github.com/
ollam
a/ollama/format"
"golang.org/x/sync/errgroup"
)
...
...
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment