Update build_ci.yml

Author: RealTimeChris

.github/workflows/build_ci.yml

@@ -38,13 +38,14 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
+          token: ${{ secrets.PAT_SIBLING_REPO_ACCESS }}
           submodules: recursive
 
       - name: Install CMake
         uses: lukka/get-cmake@latest
         with:
-          useLocalCache: true
-          useCloudCache: true
+          useLocalCache: false
+          useCloudCache: false
           cmakeVersion: 3.31.4
           ninjaVersion: 1.12.1
 
@@ -85,7 +86,7 @@ jobs:
 
       - name: Configure CMake.
         run: |
-              cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=Release -DGGML_TESTS=TRUE
+              cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=Release
 
       - name: Build the executable.
         run: |
@@ -127,9 +128,7 @@ jobs:
             wget -q https://huggingface.co/bartowski/Llama-3.2-1B-Instruct-GGUF/resolve/main/Llama-3.2-1B-Instruct-Q8_0.gguf &&
             ls /usr/local/lib/ &&
             sudo chmod +x /usr/local/lib/libllama.so &&
-            sudo chmod +x /usr/local/lib/libggml-cpu.so &&
             sudo chmod +x /usr/local/bin/llama-cli &&
             sudo chmod +x /usr/local/bin/Llama-3.2-1B-Instruct-Q8_0.gguf &&
             sudo patchelf --set-rpath /usr/local/lib /usr/local/bin/llama-cli
-            sudo patchelf --add-needed /usr/local/bin/libggml-cpu.so /usr/local/bin/llama-cli
             sudo /usr/local/bin/llama-cli -m ./Llama-3.2-1B-Instruct-Q8_0.gguf -p "What is the meaning of life?" -b 1 -c 1024 -n 16 -no-cnv

CMakeLists.txt

@@ -7,6 +7,16 @@ set(CMAKE_WARN_UNUSED_CLI YES)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi ${AVX_FLAGS}" CACHE STRING "C++ flags for release build with AVX" FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF" CACHE STRING "Linker flags for release build with optimizations" FORCE)
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF" CACHE STRING "Shared linker flags for release build with optimizations" FORCE)
+
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zi /DEBUG /ZI ${AVX_FLAGS}" CACHE STRING "C++ flags for debug build with AVX" FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG" CACHE STRING "Linker flags for debug build" FORCE)
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG" CACHE STRING "Shared linker flags for debug build" FORCE)
+endif()
+
 if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")

CMakePresets.json

@@ -20,16 +20,16 @@
             "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
             "CMAKE_CXX_COMPILER": "icx",
             "CMAKE_C_COMPILER": "cl",
-            "GGML_SYCL": "ON",
+            "OIML_SYCL": "ON",
             "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
         }
     },
     { "name": "debug",    "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } },
     { "name": "release",  "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } },
     { "name": "reldbg",   "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
-    { "name": "static",   "hidden": true, "cacheVariables": { "GGML_STATIC":      "ON" } },
-    { "name": "sycl_f16", "hidden": true, "cacheVariables": { "GGML_SYCL_F16":    "ON" } },
-    { "name": "vulkan",   "hidden": true, "cacheVariables": { "GGML_VULKAN":      "ON" } },
+    { "name": "static",   "hidden": true, "cacheVariables": { "OIML_STATIC":      "ON" } },
+    { "name": "sycl_f16", "hidden": true, "cacheVariables": { "OIML_SYCL_F16":    "ON" } },
+    { "name": "vulkan",   "hidden": true, "cacheVariables": { "OIML_VULKAN":      "ON" } },
 
     {
         "name": "x64-windows-llvm", "hidden": true,
@@ -86,6 +86,10 @@
     { "name": "x64-windows-msvc-release", "inherits": [ "base", "reldbg" ] },
     { "name": "x64-windows-msvc+static-release", "inherits": [ "base", "reldbg", "static" ] },
 
+    { "name": "x64-windows-msvc-debug-cli", "inherits": [ "base", "debug" ],"cacheVariables": { "CLI":"TRUE" } },
+    { "name": "x64-windows-msvc-release-cli", "inherits": [ "base", "reldbg" ],"cacheVariables": { "CLI":"TRUE" } },
+    { "name": "x64-windows-msvc+static-release-cli", "inherits": [ "base", "reldbg", "static" ],"cacheVariables": { "CLI":"TRUE" } },
+
     { "name": "x64-windows-sycl-debug", "inherits": [ "sycl-base", "debug" ] },
     { "name": "x64-windows-sycl-debug-f16", "inherits": [ "sycl-base", "debug", "sycl_f16" ] },
     { "name": "x64-windows-sycl-release", "inherits": [ "sycl-base", "release" ] },