Fix editorconfig trailing whitespace errors

- Remove trailing whitespace from CMakeLists.txt lines 200, 208
- Remove trailing whitespace from common/arg.cpp lines 77, 80, 100, 126, 134, 142, 183, 197, 205, 209, 214, 221, 231
- Remove trailing whitespace from tests/test-arg-parser.cpp lines 182, 198, 203, 219, 226, 231, 234, 237, 240

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

Author: devin-ai-integration[bot]

CMakeLists.txt

@@ -197,15 +197,15 @@ if (LLAMA_YAML_CPP)
     if (PkgConfig_FOUND)
         pkg_check_modules(YAML_CPP QUIET yaml-cpp)
     endif()
-    
+
     if (NOT YAML_CPP_FOUND)
         find_package(yaml-cpp QUIET)
         if (yaml-cpp_FOUND)
             set(YAML_CPP_LIBRARIES yaml-cpp)
             set(YAML_CPP_INCLUDE_DIRS ${yaml-cpp_INCLUDE_DIRS})
         endif()
     endif()
-    
+
     if (NOT YAML_CPP_FOUND AND NOT yaml-cpp_FOUND)
         message(STATUS "yaml-cpp not found, disabling YAML config support")
         set(LLAMA_YAML_CPP OFF)

common/arg.cpp

@@ -74,10 +74,9 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
     if (config_file.empty()) {
         return true;
     }
-    
+
     try {
         YAML::Node config = YAML::LoadFile(config_file);
-        
         // Model parameters
         if (config["model"]) {
             params.model.path = config["model"].as<std::string>();
@@ -97,7 +96,7 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
         if (config["hf_token"]) {
             params.hf_token = config["hf_token"].as<std::string>();
         }
-        
+
         // Context and prediction parameters
         if (config["ctx_size"]) {
             params.n_ctx = config["ctx_size"].as<int32_t>();
@@ -123,23 +122,23 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
         if (config["sequences"]) {
             params.n_sequences = config["sequences"].as<int32_t>();
         }
-        
+
         // CPU parameters
         if (config["threads"]) {
             params.cpuparams.n_threads = config["threads"].as<int>();
         }
         if (config["threads_batch"]) {
             params.cpuparams_batch.n_threads = config["threads_batch"].as<int>();
         }
-        
+
         // GPU parameters
         if (config["n_gpu_layers"]) {
             params.n_gpu_layers = config["n_gpu_layers"].as<int32_t>();
         }
         if (config["main_gpu"]) {
             params.main_gpu = config["main_gpu"].as<int32_t>();
         }
-        
+
         // Sampling parameters
         if (config["seed"]) {
             params.sampling.seed = config["seed"].as<uint32_t>();
@@ -180,7 +179,7 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
         if (config["mirostat_eta"]) {
             params.sampling.mirostat_eta = config["mirostat_eta"].as<float>();
         }
-        
+
         // Prompt and system parameters
         if (config["prompt"]) {
             params.prompt = config["prompt"].as<std::string>();
@@ -194,31 +193,31 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
         if (config["prompt_cache"]) {
             params.path_prompt_cache = config["prompt_cache"].as<std::string>();
         }
-        
+
         // Input/Output parameters
         if (config["input_prefix"]) {
             params.input_prefix = config["input_prefix"].as<std::string>();
         }
         if (config["input_suffix"]) {
             params.input_suffix = config["input_suffix"].as<std::string>();
         }
-        
+
         if (config["verbose"]) {
             params.verbosity = config["verbose"].as<int32_t>();
         }
-        
+
         if (config["conversation"]) {
             bool conv = config["conversation"].as<bool>();
             params.conversation_mode = conv ? COMMON_CONVERSATION_MODE_ENABLED : COMMON_CONVERSATION_MODE_DISABLED;
         }
-        
+
         if (config["interactive"]) {
             params.interactive = config["interactive"].as<bool>();
         }
         if (config["interactive_first"]) {
             params.interactive_first = config["interactive_first"].as<bool>();
         }
-        
+
         if (config["antiprompt"]) {
             if (config["antiprompt"].IsSequence()) {
                 for (const auto & item : config["antiprompt"]) {
@@ -228,7 +227,7 @@ static bool common_params_load_from_yaml(const std::string & config_file, common
                 params.antiprompt.push_back(config["antiprompt"].as<std::string>());
             }
         }
-        
+
         return true;
     } catch (const YAML::Exception & e) {
         fprintf(stderr, "Error parsing YAML config file '%s': %s\n", config_file.c_str(), e.what());

tests/test-arg-parser.cpp

@@ -179,7 +179,6 @@ int main(void) {
 
 #ifdef LLAMA_YAML_CPP
     printf("test-arg-parser: testing YAML config functionality\n\n");
-    
     std::string yaml_content = R"(
 model: "test_model.gguf"
 threads: 8
@@ -195,12 +194,10 @@ conversation: true
   - "User:"
   - "Stop"
 )";
-    
     std::string temp_config = "/tmp/test_config.yaml";
     std::ofstream config_file(temp_config);
     config_file << yaml_content;
     config_file.close();
-    
     argv = {"binary_name", "--config", temp_config.c_str()};
     assert(true == common_params_parse(argv.size(), list_str_to_char(argv).data(), params, LLAMA_EXAMPLE_COMMON));
     assert(params.model.path == "test_model.gguf");
@@ -216,28 +213,22 @@ conversation: true
     assert(params.antiprompt.size() == 2);
     assert(params.antiprompt[0] == "User:");
     assert(params.antiprompt[1] == "Stop");
-    
     argv = {"binary_name", "--config", temp_config.c_str(), "-t", "16", "--ctx-size", "8192"};
     assert(true == common_params_parse(argv.size(), list_str_to_char(argv).data(), params, LLAMA_EXAMPLE_COMMON));
     assert(params.model.path == "test_model.gguf");  // from config
     assert(params.cpuparams.n_threads == 16);        // overridden by CLI
     assert(params.n_ctx == 8192);                    // overridden by CLI
     assert(params.sampling.temp == 0.7f);            // from config
-    
     std::string invalid_yaml = "/tmp/invalid_config.yaml";
     std::ofstream invalid_file(invalid_yaml);
     invalid_file << "invalid: yaml: content: [unclosed";
     invalid_file.close();
-    
     argv = {"binary_name", "--config", invalid_yaml.c_str()};
     assert(false == common_params_parse(argv.size(), list_str_to_char(argv).data(), params, LLAMA_EXAMPLE_COMMON));
-    
     argv = {"binary_name", "--config", "/tmp/nonexistent_config.yaml"};
     assert(false == common_params_parse(argv.size(), list_str_to_char(argv).data(), params, LLAMA_EXAMPLE_COMMON));
-    
     std::remove(temp_config.c_str());
     std::remove(invalid_yaml.c_str());
-    
     printf("test-arg-parser: YAML config tests passed\n\n");
 #else
     printf("test-arg-parser: YAML config support not compiled, skipping YAML tests\n\n");