Fix target in gen_windows.ps1

This commit is contained in:
Daniel Hiltgen 2024-04-26 15:10:42 -07:00
parent 11d83386a5
commit ed5fb088c4

View file

@ -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 {
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() {
# 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() {
$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"
} }