mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-11-03 09:22:01 +00:00 
			
		
		
		
	Merge branch 'master' into add_stop_token
This commit is contained in:
		@@ -114,6 +114,17 @@ int main(int argc, char ** argv) {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (!params.lora_adapter.empty()) {
 | 
			
		||||
        int err = llama_apply_lora_from_file(ctx,
 | 
			
		||||
                                             params.lora_adapter.c_str(),
 | 
			
		||||
                                             params.lora_base.empty() ? NULL : params.lora_base.c_str(),
 | 
			
		||||
                                             params.n_threads);
 | 
			
		||||
        if (err != 0) {
 | 
			
		||||
            fprintf(stderr, "%s: error: failed to apply lora adapter\n", __func__);
 | 
			
		||||
            return 1;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // print system information
 | 
			
		||||
    {
 | 
			
		||||
        fprintf(stderr, "\n");
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user