Merge branch 'ollama:main' into main

2025-12-25 07:58:01 +00:00 · 2024-07-10 12:32:28 +08:00
parent 72bcdc1d4e 2d1e3c3229
commit d788d8748b
88 changed files with 1435 additions and 913 deletions
--- a/llm/generate/gen_windows.ps1
+++ b/llm/generate/gen_windows.ps1
@@ -378,6 +378,7 @@ function build_rocm() {
            "-DCMAKE_C_COMPILER=clang.exe",
            "-DCMAKE_CXX_COMPILER=clang++.exe",
            "-DGGML_HIPBLAS=on",
+            "-DLLAMA_CUDA_NO_PEER_COPY=on",
            "-DHIP_PLATFORM=amd",
            "-DGGML_AVX=on",
            "-DGGML_AVX2=off",