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
0b5c589c
Unverified
Commit
0b5c589c
authored
Apr 26, 2024
by
Daniel Hiltgen
Committed by
GitHub
Apr 26, 2024
Browse files
Merge pull request #3966 from dhiltgen/bump
Fix target in gen_windows.ps1
parents
65fadddc
ed5fb088
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
llm/generate/gen_windows.ps1
llm/generate/gen_windows.ps1
+5
-1
No files found.
llm/generate/gen_windows.ps1
View file @
0b5c589c
...
@@ -26,7 +26,6 @@ function amdGPUs {
...
@@ -26,7 +26,6 @@ function amdGPUs {
$GPU_LIST
-join
';'
$GPU_LIST
-join
';'
}
}
$
script
:
cmakeTargets
=
@(
"ollama_llama_server"
)
function
init_vars
{
function
init_vars
{
if
(
!
$
script
:
SRC_DIR
)
{
if
(
!
$
script
:
SRC_DIR
)
{
...
@@ -35,6 +34,9 @@ function init_vars {
...
@@ -35,6 +34,9 @@ function init_vars {
if
(
!
$
script
:
llamacppDir
)
{
if
(
!
$
script
:
llamacppDir
)
{
$
script
:
llamacppDir
=
"../llama.cpp"
$
script
:
llamacppDir
=
"../llama.cpp"
}
}
if
(
!
$
script
:
cmakeTargets
)
{
$
script
:
cmakeTargets
=
@(
"ollama_llama_server"
)
}
$
script
:
cmakeDefs
=
@(
$
script
:
cmakeDefs
=
@(
"-DBUILD_SHARED_LIBS=on"
,
"-DBUILD_SHARED_LIBS=on"
,
"-DLLAMA_NATIVE=off"
"-DLLAMA_NATIVE=off"
...
@@ -188,6 +190,7 @@ function build_static() {
...
@@ -188,6 +190,7 @@ function build_static() {
# error action ensures we exit on failure
# error action ensures we exit on failure
get-command gcc
get-command gcc
get-command mingw32-make
get-command mingw32-make
$oldTargets
=
$
script
:
cmakeTargets
$
script
:
cmakeTargets
= @("
llama
", "
ggml
")
$
script
:
cmakeTargets
= @("
llama
", "
ggml
")
$
script
:
cmakeDefs
= @(
$
script
:
cmakeDefs
= @(
"
-G
", "
MinGW
Makefiles
"
"
-G
", "
MinGW
Makefiles
"
...
@@ -203,6 +206,7 @@ function build_static() {
...
@@ -203,6 +206,7 @@ function build_static() {
$
script
:
buildDir
="
..
/build/windows/
${script:ARCH}
_static
"
$
script
:
buildDir
="
..
/build/windows/
${script:ARCH}
_static
"
write-host "
Building
static
library
"
write-host "
Building
static
library
"
build
build
$
script
:
cmakeTargets
=
$oldTargets
} else {
} else {
write-host "
Skipping
CPU
generation
step
as
requested
"
write-host "
Skipping
CPU
generation
step
as
requested
"
}
}
...
...
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