fix merge problem

ngxson · ngxson · commit cee80d48facf · 2025-03-16T12:17:16.000+01:00
diff --git a/src/llama-graph.cpp b/src/llama-graph.cpp
@@ -43,7 +43,7 @@ void llm_graph_input_embd::set_input(const llama_ubatch * ubatch) {
         ggml_backend_tensor_set(tokens, ubatch->token, 0, n_tokens*ggml_element_size(tokens));
     }
 
-    if (ubatch->embd) {
+    if (ubatch->embd && !ubatch->embd_tensor) {
         const int64_t n_embd   = embd->ne[0];
         const int64_t n_tokens = ubatch->n_tokens;
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void llm_graph_input_embd::set_input(const llama_ubatch * ubatch) {`
`43`	`43`	`ggml_backend_tensor_set(tokens, ubatch->token, 0, n_tokens*ggml_element_size(tokens));`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (ubatch->embd) {`
	`46`	`+ if (ubatch->embd && !ubatch->embd_tensor) {`
`47`	`47`	`const int64_t n_embd = embd->ne[0];`
`48`	`48`	`const int64_t n_tokens = ubatch->n_tokens;`
`49`	`49`