baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not build AVX runners on ARM64

Browse source
This commit is contained in:
Hernan Martinez 2024-04-26 23:41:23 -06:00
parent 6d3152a98a
commit 8a65717f55
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
llm/generate/gen_windows.ps1
View file

@ -213,14 +213,10 @@ function build_static() {
} }
} }
function build_cpu() { function build_cpu($gen_arch) {
if ((-not "${env:OLLAMA_SKIP_CPU_GENERATE}" ) -and ((-not "${env:OLLAMA_CPU_TARGET}") -or ("${env:OLLAMA_CPU_TARGET}" -eq "cpu"))) { if ((-not "${env:OLLAMA_SKIP_CPU_GENERATE}" ) -and ((-not "${env:OLLAMA_CPU_TARGET}") -or ("${env:OLLAMA_CPU_TARGET}" -eq "cpu"))) {
# remaining llama.cpp builds use MSVC # remaining llama.cpp builds use MSVC
init_vars init_vars
$gen_arch = "x64"
if ($scrip:ARCH -eq "arm64") {
$gen_arch = "ARM64"
}
$script:cmakeDefs = $script:commonCpuDefs + @("-A", $gen_arch, "-DLLAMA_AVX=off", "-DLLAMA_AVX2=off", "-DLLAMA_AVX512=off", "-DLLAMA_FMA=off", "-DLLAMA_F16C=off") + $script:cmakeDefs $script:cmakeDefs = $script:commonCpuDefs + @("-A", $gen_arch, "-DLLAMA_AVX=off", "-DLLAMA_AVX2=off", "-DLLAMA_AVX512=off", "-DLLAMA_FMA=off", "-DLLAMA_F16C=off") + $script:cmakeDefs
$script:buildDir="../build/windows/${script:ARCH}/cpu" $script:buildDir="../build/windows/${script:ARCH}/cpu"
$script:distDir="$script:DIST_BASE\cpu" $script:distDir="$script:DIST_BASE\cpu"
@ -353,11 +349,15 @@ if ($($args.count) -eq 0) {
git_module_setup git_module_setup
apply_patches apply_patches
build_static build_static
build_cpu if ($script:ARCH -eq "arm64") {
build_cpu_avx build_cpu("ARM64")
build_cpu_avx2 } else { # amd64
build_cuda build_cpu("x64")
build_rocm build_cpu_avx
build_cpu_avx2
build_cuda
build_rocm
}
cleanup cleanup
write-host "`ngo generate completed. LLM runners: $(get-childitem -path $script:DIST_BASE)" write-host "`ngo generate completed. LLM runners: $(get-childitem -path $script:DIST_BASE)"