mirror of
https://github.com/ollama/ollama.git
synced 2025-03-27 10:11:54 +01: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>
26 lines
919 B
Diff
26 lines
919 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Hiltgen <daniel@ollama.com>
|
|
Date: Wed, 9 Oct 2024 17:26:23 -0700
|
|
Subject: [PATCH] conditional-fattn
|
|
|
|
---
|
|
ggml/src/ggml-cuda/ggml-cuda.cu | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/ggml/src/ggml-cuda/ggml-cuda.cu b/ggml/src/ggml-cuda/ggml-cuda.cu
|
|
index be29e979..aaa79ea4 100644
|
|
--- a/ggml/src/ggml-cuda/ggml-cuda.cu
|
|
+++ b/ggml/src/ggml-cuda/ggml-cuda.cu
|
|
@@ -2159,9 +2159,11 @@ static bool ggml_cuda_compute_forward(ggml_backend_cuda_context & ctx, struct gg
|
|
case GGML_OP_ARGSORT:
|
|
ggml_cuda_op_argsort(ctx, dst);
|
|
break;
|
|
+#if !defined(GGML_DISABLE_FLASH_ATTN)
|
|
case GGML_OP_FLASH_ATTN_EXT:
|
|
ggml_cuda_flash_attn_ext(ctx, dst);
|
|
break;
|
|
+#endif
|
|
case GGML_OP_CROSS_ENTROPY_LOSS:
|
|
ggml_cuda_cross_entropy_loss(ctx, dst);
|
|
break;
|