瀏覽代碼

Rename the ollama cmakefile

Daniel Hiltgen 1 年之前
父節點
當前提交
738a8d12eb
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 0 0
      llm/llama.cpp/CMakeLists.txt
  2. 2 2
      llm/llama.cpp/gen_common.sh
  3. 2 2
      llm/llama.cpp/gen_windows.ps1

+ 0 - 0
llm/llama.cpp/ollama.txt → llm/llama.cpp/CMakeLists.txt


+ 2 - 2
llm/llama.cpp/gen_common.sh

@@ -26,8 +26,8 @@ git_module_setup() {
 
 
 apply_patches() {
 apply_patches() {
     # Wire up our CMakefile
     # Wire up our CMakefile
-    if ! grep ollama.txt gguf/examples/server/CMakeLists.txt; then
-        echo 'include (../../../ollama.txt)' >>gguf/examples/server/CMakeLists.txt
+    if ! grep ollama gguf/examples/server/CMakeLists.txt; then
+        echo 'include (../../../CMakeLists.txt) # ollama' >>gguf/examples/server/CMakeLists.txt
     fi
     fi
     # Avoid duplicate main symbols when we link into the cgo binary
     # Avoid duplicate main symbols when we link into the cgo binary
     sed -e 's/int main(/int __main(/g' <./gguf/examples/server/server.cpp >./gguf/examples/server/server.cpp.tmp &&
     sed -e 's/int main(/int __main(/g' <./gguf/examples/server/server.cpp >./gguf/examples/server/server.cpp.tmp &&

+ 2 - 2
llm/llama.cpp/gen_windows.ps1

@@ -25,8 +25,8 @@ function git_module_setup {
 
 
 function apply_patches {
 function apply_patches {
     # Wire up our CMakefile
     # Wire up our CMakefile
-    if (!(Select-String -Path "gguf/examples/server/CMakeLists.txt" -Pattern 'ollama.txt')) {
-        Add-Content -Path "gguf/examples/server/CMakeLists.txt" -Value 'include (../../../ollama.txt)'
+    if (!(Select-String -Path "gguf/examples/server/CMakeLists.txt" -Pattern 'ollama')) {
+        Add-Content -Path "gguf/examples/server/CMakeLists.txt" -Value 'include (../../../CMakeLists.txt) # ollama'
     }
     }
     # Avoid duplicate main symbols when we link into the cgo binary
     # Avoid duplicate main symbols when we link into the cgo binary
     $content = Get-Content -Path "./gguf/examples/server/server.cpp"
     $content = Get-Content -Path "./gguf/examples/server/server.cpp"