Merge branch 'ikawrakow:main' into main

Thireus · web-flow · commit 3a55c53ee6ba · 2025-10-29T07:12:55.000Z
diff --git a/src/llama.cpp b/src/llama.cpp
@@ -3975,7 +3975,7 @@ struct llama_model * llama_load_model_from_file(
     // if device is specified, only those in the devices are included in the model->devices
 
     std::vector<std::string> params_devices = {};
-    if (!striequals(params.devices, "")) {
+    if (params.devices && !striequals(params.devices, "")) {
         params_devices = llama_string_split(params.devices, ",");
         params_devices = extract_ip_from_rpc_device(params_devices);
     }
@@ -4000,7 +4000,6 @@ struct llama_model * llama_load_model_from_file(
             } else {
                 LLAMA_LOG_ERROR("%s backend not available.\n", device.c_str());
             }
-            
         }
     } else {
         // add all backend buffer to device

Original file line number	Diff line number	Diff line change
`@@ -3975,7 +3975,7 @@ struct llama_model * llama_load_model_from_file(`
`3975`	`3975`	`// if device is specified, only those in the devices are included in the model->devices`
`3976`	`3976`
`3977`	`3977`	`std::vector<std::string> params_devices = {};`
`3978`		`- if (!striequals(params.devices, "")) {`
	`3978`	`+ if (params.devices && !striequals(params.devices, "")) {`
`3979`	`3979`	`params_devices = llama_string_split(params.devices, ",");`
`3980`	`3980`	`params_devices = extract_ip_from_rpc_device(params_devices);`
`3981`	`3981`	`}`
`@@ -4000,7 +4000,6 @@ struct llama_model * llama_load_model_from_file(`
`4000`	`4000`	`} else {`
`4001`	`4001`	`LLAMA_LOG_ERROR("%s backend not available.\n", device.c_str());`
`4002`	`4002`	`}`
`4003`		`-`
`4004`	`4003`	`}`
`4005`	`4004`	`} else {`
`4006`	`4005`	`// add all backend buffer to device`