update for pr 8763

Qiskit · Sep 28, 2022 · bcf30ef · bcf30ef
1 parent 3009590
commit bcf30ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/qiskit/dagcircuit/dagcircuit.py b/qiskit/dagcircuit/dagcircuit.py
@@ -1688,14 +1688,7 @@ def count_ops(self, expand_control_flow=False):
 
         Returns a dictionary of counts keyed on the operation name.
         """
-        op_count = self._op_names.copy()
-        if expand_control_flow:
-            for cfop in self.op_nodes(op=ControlFlowOp):
-                if cfop.name in op_count:
-                    del op_count[cfop.name] 
-                for block in cfop.op.blocks:
-                    op_count = Counter(op_count) + Counter(block.count_ops())
-        return op_count
+        return self._op_names.copy()
 
     def count_ops_longest_path(self):
         """Count the occurrences of operation names on the longest path.

diff --git a/qiskit/transpiler/passes/layout/dense_layout.py b/qiskit/transpiler/passes/layout/dense_layout.py
@@ -90,7 +90,7 @@ def run(self, dag):
             num_meas = 1
         else:
             # Get avg number of cx and meas per qubit
-            ops = dag.count_ops(expand_control_flow=True)
+            ops = dag.count_ops(recurse=True)
             if "cx" in ops.keys():
                 num_cx = ops["cx"]
             if "measure" in ops.keys():