mirror of
https://github.com/ollama/ollama.git
synced 2025-08-03 10:03:15 +02:00
dcfb7a105c
* add build to .dockerignore * test: only build one arch * add build to .gitignore * fix ccache path * filter amdgpu targets * only filter if autodetecting * Don't clobber gpu list for default runner This ensures the GPU specific environment variables are set properly * explicitly set CXX compiler for HIP * Update build_windows.ps1 This isn't complete, but is close. Dependencies are missing, and it only builds the "default" preset. * build: add ollama subdir * add .git to .dockerignore * docs: update development.md * update build_darwin.sh * remove unused scripts * llm: add cwd and build/lib/ollama to library paths * default DYLD_LIBRARY_PATH to LD_LIBRARY_PATH in runner on macOS * add additional cmake output vars for msvc * interim edits to make server detection logic work with dll directories like lib/ollama/cuda_v12 * remove unncessary filepath.Dir, cleanup * add hardware-specific directory to path * use absolute server path * build: linux arm * cmake install targets * remove unused files * ml: visit each library path once * build: skip cpu variants on arm * build: install cpu targets * build: fix workflow * shorter names * fix rocblas install * docs: clean up development.md * consistent build dir removal in development.md * silence -Wimplicit-function-declaration build warnings in ggml-cpu * update readme * update development readme * llm: update library lookup logic now that there is one runner (#8587) * tweak development.md * update docs * add windows cuda/rocm tests --------- Co-authored-by: jmorganca <jmorganca@gmail.com> Co-authored-by: Daniel Hiltgen <daniel@ollama.com>
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Michael Yang <mxyng@pm.me>
|
|
Date: Tue, 14 Jan 2025 15:59:04 -0800
|
|
Subject: [PATCH] add phony target ggml-cpu for all cpu variants
|
|
|
|
---
|
|
ggml/src/CMakeLists.txt | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
|
|
index 84101c32..72b488dd 100644
|
|
--- a/ggml/src/CMakeLists.txt
|
|
+++ b/ggml/src/CMakeLists.txt
|
|
@@ -278,6 +278,7 @@ function(ggml_add_cpu_backend_variant tag_name)
|
|
endforeach()
|
|
|
|
ggml_add_cpu_backend_variant_impl(${tag_name})
|
|
+ add_dependencies(ggml-cpu ggml-cpu-${tag_name})
|
|
endfunction()
|
|
|
|
ggml_add_backend(CPU)
|
|
@@ -286,6 +287,7 @@ if (GGML_CPU_ALL_VARIANTS)
|
|
if (NOT GGML_BACKEND_DL)
|
|
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
|
|
endif()
|
|
+ add_custom_target(ggml-cpu)
|
|
ggml_add_cpu_backend_variant(sandybridge AVX)
|
|
ggml_add_cpu_backend_variant(haswell AVX F16C AVX2 FMA)
|
|
ggml_add_cpu_backend_variant(skylakex AVX F16C AVX2 FMA AVX512)
|