From: Georgi Gerganov <redacted>
Date: Thu, 25 Sep 2025 08:29:42 +0000 (+0300)
Subject: metal : relax reorder conditions (#16216)
X-Git-Tag: upstream/0.0.6641~65
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=4ea00794b8c995b6deaf4bac159c1778dc27419a;p=pkg%2Fggml%2Fsources%2Fllama.cpp

metal : relax reorder conditions (#16216)
---

diff --git a/ggml/src/ggml-metal/ggml-metal-common.cpp b/ggml/src/ggml-metal/ggml-metal-common.cpp
index e61a5706..3ce7d75a 100644
--- a/ggml/src/ggml-metal/ggml-metal-common.cpp
+++ b/ggml/src/ggml-metal/ggml-metal-common.cpp
@@ -256,8 +256,6 @@ static std::vector<int> ggml_metal_graph_optimize_reorder(const std::vector<node
 
     // perform reorders only across these types of ops
     // can be expanded when needed
-    // IMPORTANT: do not add ops such as GGML_OP_CPY or GGML_OP_SET_ROWS
-    //            the dependencies from such ops are not always represented in the graph
     const auto & h_safe = [](ggml_op op) {
         switch (op) {
             case GGML_OP_MUL_MAT:
@@ -273,6 +271,8 @@ static std::vector<int> ggml_metal_graph_optimize_reorder(const std::vector<node
             case GGML_OP_GLU:
             case GGML_OP_SCALE:
             case GGML_OP_GET_ROWS:
+            case GGML_OP_CPY:
+            case GGML_OP_SET_ROWS:
                 return true;
             default:
                 return ggml_op_is_empty(op);