fix(ci): use existing tinyllama model and scope yaml-cpp to tools

- Update CI workflow to use existing tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf model
- Update all config files and tests to reference the existing model
- Scope yaml-cpp dependency to LLAMA_BUILD_TOOLS only with compile guards
- Suppress all warnings for yaml-cpp to avoid -Werror failures
- This resolves the 404 model download and cross-platform build issues

Co-Authored-By: Jaime Mizrachi <[email protected]>

Author: devin-ai-integration[bot]

.github/workflows/config.yml

@@ -19,18 +19,18 @@ jobs:
       id: depends
       run: |
         sudo apt-get update
-        sudo apt-get install build-essential cmake
+        sudo apt-get install -y build-essential cmake wget
 
     - name: Build
       id: cmake_build
       run: |
         cmake -B build -DLLAMA_BUILD_TESTS=ON -DLLAMA_BUILD_TOOLS=ON -DLLAMA_FATAL_WARNINGS=ON -DLLAMA_CURL=OFF
         cmake --build build --config Release -j $(nproc)
 
-    - name: Download tiny model
+    - name: Use existing tiny model
       run: |
-        mkdir -p models
-        wget https://huggingface.co/ggml-org/models/resolve/main/tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf -O models/tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
+        # Use the existing tinyllama model that's already in the repo
+        ls -la models/tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
 
     - name: Test YAML config functionality
       run: |

common/CMakeLists.txt

@@ -2,20 +2,6 @@
 
 find_package(Threads REQUIRED)
 
-find_package(yaml-cpp QUIET)
-if (NOT yaml-cpp_FOUND)
-    include(FetchContent)
-    FetchContent_Declare(yaml-cpp
-        GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-        GIT_TAG        0.8.0)
-    
-    set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
-    set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
-    
-    FetchContent_MakeAvailable(yaml-cpp)
-endif()
-
 llama_add_compile_flags()
 
 # Build info header
@@ -68,8 +54,6 @@ add_library(${TARGET} STATIC
     chat.h
     common.cpp
     common.h
-    config.cpp
-    config.h
     console.cpp
     console.h
     json-partial.cpp
@@ -149,9 +133,36 @@ if (LLAMA_LLGUIDANCE)
     set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} llguidance ${LLGUIDANCE_PLATFORM_LIBS})
 endif ()
 
+if (LLAMA_BUILD_TOOLS)
+    # yaml-cpp for YAML config (CLI-only)
+    find_package(yaml-cpp QUIET)
+    if (NOT yaml-cpp_FOUND)
+        include(FetchContent)
+        FetchContent_Declare(yaml-cpp
+            GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+            GIT_TAG        0.8.0)
+        set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+        set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+        set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
+        FetchContent_MakeAvailable(yaml-cpp)
+        
+        # Suppress all warnings for yaml-cpp to avoid -Werror failures
+        if(TARGET yaml-cpp)
+            target_compile_options(yaml-cpp PRIVATE -w)
+        endif()
+    endif()
+
+    target_sources(${TARGET} PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/config.h
+    )
+    target_link_libraries(${TARGET} PRIVATE yaml-cpp)
+    target_compile_definitions(${TARGET} PUBLIC LLAMA_ENABLE_CONFIG_YAML)
+endif()
+
 target_include_directories(${TARGET} PUBLIC . ../vendor)
 target_compile_features   (${TARGET} PUBLIC cxx_std_17)
-target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} yaml-cpp PUBLIC llama Threads::Threads)
+target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)
 
 
 #

common/arg.cpp

@@ -2,7 +2,9 @@
 
 #include "chat.h"
 #include "common.h"
+#ifdef LLAMA_ENABLE_CONFIG_YAML
 #include "config.h"
+#endif
 #include "gguf.h" // for reading GGUF splits
 #include "json-schema-to-grammar.h"
 #include "log.h"
@@ -1224,6 +1226,7 @@ bool common_params_parse(int argc, char ** argv, common_params & params, llama_e
     const common_params params_org = ctx_arg.params; // the example can modify the default params
 
     try {
+#ifdef LLAMA_ENABLE_CONFIG_YAML
         for (int i = 1; i < argc; ++i) {
             if (std::string(argv[i]) == "--config") {
                 if (i + 1 >= argc) {
@@ -1233,9 +1236,16 @@ bool common_params_parse(int argc, char ** argv, common_params & params, llama_e
                 if (!common_load_yaml_config(cfg_path, ctx_arg.params)) {
                     throw std::invalid_argument("error: failed to load YAML config: " + cfg_path);
                 }
-                break; // single --config supported; first one wins
+                break;
+            }
+        }
+#else
+        for (int i = 1; i < argc; ++i) {
+            if (std::string(argv[i]) == "--config") {
+                throw std::invalid_argument("error: this build does not include YAML config support (LLAMA_BUILD_TOOLS=OFF)");
             }
         }
+#endif
         if (!common_params_parse_ex(argc, argv, ctx_arg)) {
             ctx_arg.params = params_org;
             return false;

tests/CMakeLists.txt

@@ -184,7 +184,9 @@ llama_build_and_test(test-chat-template.cpp)
 llama_build_and_test(test-json-partial.cpp)
 llama_build_and_test(test-log.cpp)
 llama_build_and_test(test-regex-partial.cpp)
-llama_build_and_test(test-config-yaml.cpp)
+if (LLAMA_BUILD_TOOLS)
+    llama_build_and_test(test-config-yaml.cpp)
+endif()
 
 llama_build_and_test(test-thread-safety.cpp ARGS -hf ggml-org/models -hff tinyllamas/stories15M-q4_0.gguf -ngl 99 -p "The meaning of life is" -n 128 -c 256 -ub 32 -np 4 -t 2)
 
@@ -195,13 +197,13 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/models/tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf)
         NAME test-config-yaml-cli-only
         ARGS --config ${PROJECT_SOURCE_DIR}/configs/minimal.yaml -no-cnv
     )
-    
+
     llama_test_cmd(
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llama-cli
         NAME test-config-yaml-cli-overrides
         ARGS --config ${PROJECT_SOURCE_DIR}/configs/override.yaml -n 8 --temp 0.0 -no-cnv
     )
-    
+
     # Parity test - compare YAML config vs equivalent flags
     add_test(
         NAME test-config-yaml-parity