Merge branch 'main' into main

or1426 · Jul 21, 2021 · 714a031 · 714a031
2 parents 7796a82 + 1cfa05e
commit 714a031
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/transpile/fusion.hpp b/src/transpile/fusion.hpp
@@ -658,8 +658,10 @@ bool DiagonalFusion::aggregate_operations(oplist_t& ops,
       continue;
 
     std::vector<uint_t> fusing_op_idxs;
-    for (; op_idx < next_diagonal_start; ++op_idx)
+    while(op_idx < next_diagonal_start && op_idx < fusion_end) {
       fusing_op_idxs.push_back(op_idx);
+      ++op_idx;
+    }
 
     --op_idx;
     allocate_new_operation(ops, op_idx, fusing_op_idxs, method, true);