Merge branch 'layla-build' of https://github.com/l3utterfly/llama.cpp into layla-build

l3utterfly · l3utterfly · commit 0f216d3e919d · 2025-10-28T13:10:18.000Z
diff --git a/ggml/src/ggml-backend-reg.cpp b/ggml/src/ggml-backend-reg.cpp
@@ -380,7 +380,10 @@ void ggml_backend_reg_layla(bool useVulkan, bool useOpenCL, bool useHexagon, boo
     }
 
     if(useHexagon) {
-        get_reg().load_backend("libggml-hexagon.so", false);
+        //setenv("GGML_HEXAGON_VERBOSE", "1", 1);
+        setenv("LD_LIBRARY_PATH", "/data/data/com.layla/files/app-data/hexagon-inference", 1);
+        setenv("ADSP_LIBRARY_PATH", "/data/data/com.layla/files/app-data/hexagon-inference", 1);
+        get_reg().load_backend("/data/data/com.layla/files/app-data/hexagon-inference/libggml-hexagon.so", false);
     }
 
     // load cpu backend depending on feature detection

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,10 @@ void ggml_backend_reg_layla(bool useVulkan, bool useOpenCL, bool useHexagon, boo`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`if(useHexagon) {`
`383`		`- get_reg().load_backend("libggml-hexagon.so", false);`
	`383`	`+ //setenv("GGML_HEXAGON_VERBOSE", "1", 1);`
	`384`	`+ setenv("LD_LIBRARY_PATH", "/data/data/com.layla/files/app-data/hexagon-inference", 1);`
	`385`	`+ setenv("ADSP_LIBRARY_PATH", "/data/data/com.layla/files/app-data/hexagon-inference", 1);`
	`386`	`+ get_reg().load_backend("/data/data/com.layla/files/app-data/hexagon-inference/libggml-hexagon.so", false);`
`384`	`387`	`}`
`385`	`388`
`386`	`389`	`// load cpu backend depending on feature detection`