Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	examples/llava/clip.cpp
This commit is contained in:
Concedo 2025-04-27 23:51:19 +08:00
commit 87cd8e6a00

View file

@ -639,6 +639,8 @@ void ggml_cuda_cpy(ggml_backend_cuda_context & ctx, const ggml_tensor * src0, gg
if(ctx.cuda_graph->use_cpy_indirection && !disable_indirection_for_this_node) { if(ctx.cuda_graph->use_cpy_indirection && !disable_indirection_for_this_node) {
ctx.cuda_graph->graph_cpynode_index = graph_cpynode_index; ctx.cuda_graph->graph_cpynode_index = graph_cpynode_index;
} }
#else
GGML_UNUSED(disable_indirection_for_this_node);
#endif #endif
} }