fix: add CMake policy version minimum and remove trailing whitespace

- Add cmake_policy(VERSION 3.5) to handle older CMake versions on MSYS2/macOS
- Remove trailing whitespace from test files to fix editorconfig failures
- Addresses Windows MSYS2 and macOS build failures with yaml-cpp compatibility

Co-Authored-By: Jake Cosme <[email protected]>

Author: devin-ai-integration[bot]

CMakeLists.txt

@@ -102,6 +102,11 @@ if(WIN32 AND (CMAKE_GENERATOR MATCHES "MSYS Makefiles" OR MSYS))
     set(CMAKE_POLICY_DEFAULT_CMP0077 NEW CACHE STRING "Use NEW policy for option() behavior")
 endif()
 
+# Add CMake policy version minimum to handle older CMake versions
+if(CMAKE_VERSION VERSION_LESS "3.5")
+    cmake_policy(VERSION 3.5)
+endif()
+
 # Disable yaml-cpp tests and tools to avoid build issues
 set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Disable yaml-cpp tests")
 set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Disable yaml-cpp tools")

common/arg.cpp

@@ -1524,15 +1524,15 @@ bool common_params_parse(int argc, char ** argv, common_params & params, llama_e
         if (has_config) {
             std::vector<char*> filtered_argv;
             filtered_argv.push_back(argv[0]); // Keep program name
-            
+
             for (int i = 1; i < argc; i++) {
                 if (strcmp(argv[i], "--config") == 0 && i + 1 < argc) {
                     i++; // Skip both --config and filename
                 } else {
                     filtered_argv.push_back(argv[i]);
                 }
             }
-            
+
             if (!common_params_parse_ex(filtered_argv.size(), filtered_argv.data(), ctx_arg)) {
                 ctx_arg.params = params_org;
                 return false;

tests/test-yaml-backward-compat.cpp

@@ -76,9 +76,9 @@ prompt: "Test prompt"
 
     common_params cli_params;
     const char* cli_argv[] = {
-        "test", 
+        "test",
         "-n", "100",
-        "-c", "2048", 
+        "-c", "2048",
         "-b", "512",
         "-p", "Test prompt",
         "-s", "42",
@@ -88,7 +88,7 @@ prompt: "Test prompt"
         "--repeat-penalty", "1.1"
     };
     const int cli_argc = sizeof(cli_argv) / sizeof(cli_argv[0]);
-    
+
     bool cli_result = common_params_parse(cli_argc, const_cast<char**>(cli_argv), cli_params, LLAMA_EXAMPLE_COMMON);
 
     assert(yaml_result == true);
@@ -104,8 +104,7 @@ prompt: "Test prompt"
     assert(yaml_params.sampling.temp == cli_params.sampling.temp);
     assert(yaml_params.sampling.top_k == cli_params.sampling.top_k);
     assert(yaml_params.sampling.top_p == cli_params.sampling.top_p);
-    
-    
+
     const float epsilon = 1e-6f;
     assert(std::abs(yaml_params.sampling.penalty_repeat - cli_params.sampling.penalty_repeat) < epsilon);
 

tests/test-yaml-config.cpp

@@ -53,29 +53,29 @@ prompt: "Hello, world!"
 
 static void test_cli_override_yaml() {
     std::cout << "Testing CLI override of YAML values..." << std::endl;
-    
+
     const std::string yaml_content = R"(
 n_predict: 100
 n_ctx: 2048
 prompt: "YAML prompt"
 sampling:
   temp: 0.7
 )";
-    
+
     write_test_yaml("test_override.yaml", yaml_content);
-    
+
     common_params params;
     const char* argv[] = {"test", "--config", "test_override.yaml", "-n", "200", "-p", "CLI prompt"};
     int argc = 7;
-    
+
     bool result = common_params_parse(argc, const_cast<char**>(argv), params, LLAMA_EXAMPLE_COMMON);
     assert(result == true);
-    (void)result; // Suppress unused variable warning
-    assert(params.n_predict == 200); // CLI should override YAML
-    assert(params.n_ctx == 2048); // YAML value should remain
-    assert(params.prompt == "CLI prompt"); // CLI should override YAML
-    assert(params.sampling.temp == 0.7f); // YAML value should remain
-    
+    (void)result;
+    assert(params.n_predict == 200);
+    assert(params.n_ctx == 2048);
+    assert(params.prompt == "CLI prompt");
+    assert(params.sampling.temp == 0.7f);
+
     std::filesystem::remove("test_override.yaml");
     std::cout << "CLI override test passed!" << std::endl;
 }