Remove condition/c_if, duration, and unit from instructions

crates/accelerate/src/barrier_before_final_measurement.rs

@@ -14,7 +14,6 @@ use pyo3::prelude::*;
 use rayon::prelude::*;
 use rustworkx_core::petgraph::stable_graph::NodeIndex;
 
-use qiskit_circuit::circuit_instruction::ExtraInstructionAttributes;
 use qiskit_circuit::dag_circuit::{DAGCircuit, NodeType};
 use qiskit_circuit::operations::{OperationRef, StandardInstruction};
 use qiskit_circuit::packed_instruction::{PackedInstruction, PackedOperation};
@@ -150,7 +149,7 @@ pub fn barrier_before_final_measurements(
         qargs.as_slice(),
         &[],
         None,
-        ExtraInstructionAttributes::new(label, None, None, None),
+        label,
         #[cfg(feature = "cache_pygates")]
         None,
     )?;

crates/accelerate/src/basis/basis_translator/compose_transforms.rs

@@ -75,7 +75,7 @@ pub(super) fn compose_transforms<'a>(
             } else {
                 Some(gate_obj.params)
             },
-            gate_obj.extra_attrs,
+            gate_obj.label.map(|x| *x),
             #[cfg(feature = "cache_pygates")]
             Some(gate.into()),
         )?;
@@ -121,7 +121,7 @@ pub(super) fn compose_transforms<'a>(
                         op_node.bind(py),
                         &replace_dag,
                         None,
-                        true,
+                        None,
                     )?;
                 }
             }

crates/accelerate/src/basis/basis_translator/mod.rs

@@ -522,7 +522,7 @@ fn apply_translation(
                     } else {
                         Some(new_op.params)
                     },
-                    new_op.extra_attrs,
+                    new_op.label.map(|x| *x),
                     #[cfg(feature = "cache_pygates")]
                     None,
                 )?;
@@ -543,7 +543,7 @@ fn apply_translation(
                                 .collect(),
                         )
                     },
-                    node_obj.extra_attrs.clone(),
+                    node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                     #[cfg(feature = "cache_pygates")]
                     None,
                 )?;
@@ -571,7 +571,7 @@ fn apply_translation(
                             .collect(),
                     )
                 },
-                node_obj.extra_attrs.clone(),
+                node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;
@@ -595,7 +595,7 @@ fn apply_translation(
                             .collect(),
                     )
                 },
-                node_obj.extra_attrs.clone(),
+                node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;
@@ -667,27 +667,12 @@ fn replace_node(
             } else {
                 inner_node.op.clone()
             };
-            if node.condition().is_some() {
-                match new_op.view() {
-                    OperationRef::Gate(gate) => {
-                        gate.gate.setattr(py, "condition", node.condition())?
-                    }
-                    OperationRef::Instruction(inst) => {
-                        inst.instruction
-                            .setattr(py, "condition", node.condition())?
-                    }
-                    OperationRef::Operation(oper) => {
-                        oper.operation.setattr(py, "condition", node.condition())?
-                    }
-                    _ => (),
-                }
-            }
             let new_params: SmallVec<[Param; 3]> = inner_node
                 .params_view()
                 .iter()
                 .map(|param| param.clone_ref(py))
                 .collect();
-            let new_extra_props = node.extra_attrs.clone();
+            let new_extra_props = node.label.as_ref().map(|x| x.as_ref().clone());
             dag.apply_operation_back(
                 py,
                 new_op,
@@ -802,7 +787,7 @@ fn replace_node(
                 } else {
                     Some(new_params)
                 },
-                inner_node.extra_attrs.clone(),
+                inner_node.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;

crates/accelerate/src/commutation_analysis.rs

@@ -95,12 +95,10 @@ pub(crate) fn analyze_commutations_inner(
                             py,
                             &op1,
                             params1,
-                            &packed_inst0.extra_attrs,
                             qargs1,
                             cargs1,
                             &op2,
                             params2,
-                            &packed_inst1.extra_attrs,
                             qargs2,
                             cargs2,
                             MAX_NUM_QUBITS,

crates/accelerate/src/commutation_checker.rs

@@ -25,7 +25,7 @@ use pyo3::types::{PyBool, PyDict, PySequence, PyTuple};
 use pyo3::BoundObject;
 
 use qiskit_circuit::bit_data::BitData;
-use qiskit_circuit::circuit_instruction::{ExtraInstructionAttributes, OperationFromPython};
+use qiskit_circuit::circuit_instruction::OperationFromPython;
 use qiskit_circuit::dag_node::DAGOpNode;
 use qiskit_circuit::imports::QI_OPERATOR;
 use qiskit_circuit::operations::OperationRef::{Gate as PyGateType, Operation as PyOperationType};
@@ -178,12 +178,10 @@ impl CommutationChecker {
             py,
             &op1.instruction.operation.view(),
             &op1.instruction.params,
-            &op1.instruction.extra_attrs,
             &qargs1,
             &cargs1,
             &op2.instruction.operation.view(),
             &op2.instruction.params,
-            &op2.instruction.extra_attrs,
             &qargs2,
             &cargs2,
             max_num_qubits,
@@ -215,12 +213,10 @@ impl CommutationChecker {
             py,
             &op1.operation.view(),
             &op1.params,
-            &op1.extra_attrs,
             &qargs1,
             &cargs1,
             &op2.operation.view(),
             &op2.params,
-            &op2.extra_attrs,
             &qargs2,
             &cargs2,
             max_num_qubits,
@@ -285,12 +281,10 @@ impl CommutationChecker {
         py: Python,
         op1: &OperationRef,
         params1: &[Param],
-        attrs1: &ExtraInstructionAttributes,
         qargs1: &[Qubit],
         cargs1: &[Clbit],
         op2: &OperationRef,
         params2: &[Param],
-        attrs2: &ExtraInstructionAttributes,
         qargs2: &[Qubit],
         cargs2: &[Clbit],
         max_num_qubits: u32,
@@ -321,12 +315,10 @@ impl CommutationChecker {
         let commutation: Option<bool> = commutation_precheck(
             op1,
             params1,
-            attrs1,
             qargs1,
             cargs1,
             op2,
             params2,
-            attrs2,
             qargs2,
             cargs2,
             max_num_qubits,
@@ -576,21 +568,15 @@ impl CommutationChecker {
 fn commutation_precheck(
     op1: &OperationRef,
     params1: &[Param],
-    attrs1: &ExtraInstructionAttributes,
     qargs1: &[Qubit],
     cargs1: &[Clbit],
     op2: &OperationRef,
     params2: &[Param],
-    attrs2: &ExtraInstructionAttributes,
     qargs2: &[Qubit],
     cargs2: &[Clbit],
     max_num_qubits: u32,
 ) -> Option<bool> {
-    if op1.control_flow()
-        || op2.control_flow()
-        || attrs1.condition().is_some()
-        || attrs2.condition().is_some()
-    {
+    if op1.control_flow() || op2.control_flow() {
         return Some(false);
     }
 

crates/accelerate/src/consolidate_blocks.rs

@@ -21,7 +21,6 @@ use rustworkx_core::petgraph::stable_graph::NodeIndex;
 use smallvec::smallvec;
 
 use qiskit_circuit::circuit_data::CircuitData;
-use qiskit_circuit::circuit_instruction::ExtraInstructionAttributes;
 use qiskit_circuit::dag_circuit::DAGCircuit;
 use qiskit_circuit::gate_matrix::{ONE_QUBIT_IDENTITY, TWO_QUBIT_IDENTITY};
 use qiskit_circuit::imports::{QI_OPERATOR, QUANTUM_CIRCUIT};
@@ -125,7 +124,7 @@ pub(crate) fn consolidate_blocks(
                     inst_node,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                 )?;
                 continue;
             }
@@ -199,7 +198,7 @@ pub(crate) fn consolidate_blocks(
                     &block,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                     false,
                     &block_index_map,
                     &clbit_pos_map,
@@ -238,7 +237,7 @@ pub(crate) fn consolidate_blocks(
                             &block,
                             PackedOperation::from_unitary(Box::new(unitary_gate)),
                             smallvec![],
-                            ExtraInstructionAttributes::default(),
+                            None,
                             false,
                             &qubit_pos_map,
                             &clbit_pos_map,
@@ -276,7 +275,7 @@ pub(crate) fn consolidate_blocks(
                     first_inst_node,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                 )?;
                 continue;
             }
@@ -320,7 +319,7 @@ pub(crate) fn consolidate_blocks(
                     &run,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                     false,
                     &block_index_map,
                     &clbit_pos_map,

crates/accelerate/src/elide_permutations.rs

@@ -40,14 +40,14 @@ fn run(py: Python, dag: &mut DAGCircuit) -> PyResult<Option<(DAGCircuit, Vec<usi
     let mut new_dag = dag.copy_empty_like(py, "alike")?;
     for node_index in dag.topological_op_nodes()? {
         if let NodeType::Operation(inst) = &dag[node_index] {
-            match (inst.op.name(), inst.condition()) {
-                ("swap", None) => {
+            match inst.op.name() {
+                "swap" => {
                     let qargs = dag.get_qargs(inst.qubits);
                     let index0 = qargs[0].index();
                     let index1 = qargs[1].index();
                     mapping.swap(index0, index1);
                 }
-                ("permutation", None) => {
+                "permutation" => {
                     if let Param::Obj(ref pyobj) = inst.params.as_ref().unwrap()[0] {
                         let pyarray: PyReadonlyArray1<i32> = pyobj.extract(py)?;
                         let pattern = pyarray.as_array();
@@ -88,7 +88,7 @@ fn run(py: Python, dag: &mut DAGCircuit) -> PyResult<Option<(DAGCircuit, Vec<usi
                         &mapped_qargs,
                         cargs,
                         inst.params.as_deref().cloned(),
-                        inst.extra_attrs.clone(),
+                        inst.label.as_ref().map(|x| x.as_ref().clone()),
                         #[cfg(feature = "cache_pygates")]
                         inst.py_op.get().map(|x| x.clone_ref(py)),
                     )?;

crates/accelerate/src/gate_direction.rs

@@ -21,7 +21,6 @@ use qiskit_circuit::operations::OperationRef;
 use qiskit_circuit::packed_instruction::PackedOperation;
 use qiskit_circuit::{
     circuit_instruction::CircuitInstruction,
-    circuit_instruction::ExtraInstructionAttributes,
     converters::{circuit_to_dag, QuantumCircuitData},
     dag_circuit::DAGCircuit,
     dag_node::{DAGNode, DAGOpNode},
@@ -360,7 +359,7 @@ where
             .bind(py)
             .call_method1("replace_blocks", (op_blocks,))?;
 
-        dag.py_substitute_node(dag.get_node(py, node)?.bind(py), &new_op, false, false)?;
+        dag.py_substitute_node(py, dag.get_node(py, node)?.bind(py), &new_op, false, None)?;
     }
 
     for (node, replacemanet_dag) in nodes_to_replace {
@@ -369,7 +368,7 @@ where
             dag.get_node(py, node)?.bind(py),
             &replacemanet_dag,
             None,
-            true,
+            None,
         )?;
     }
 
@@ -394,7 +393,7 @@ fn has_calibration_for_op_node(
                     qubits: py_args.unbind(),
                     clbits: PyTuple::empty(py).unbind(),
                     params: packed_inst.params_view().iter().cloned().collect(),
-                    extra_attrs: packed_inst.extra_attrs.clone(),
+                    label: packed_inst.label.clone(),
                     #[cfg(feature = "cache_pygates")]
                     py_op: packed_inst.py_op.clone(),
                 },
@@ -467,7 +466,7 @@ fn apply_operation_back(
         qargs,
         &[],
         param,
-        ExtraInstructionAttributes::default(),
+        None,
         #[cfg(feature = "cache_pygates")]
         None,
     )?;

crates/accelerate/src/split_2q_unitaries.rs

@@ -18,7 +18,6 @@ use pyo3::prelude::*;
 use rustworkx_core::petgraph::stable_graph::NodeIndex;
 use smallvec::{smallvec, SmallVec};
 
-use qiskit_circuit::circuit_instruction::ExtraInstructionAttributes;
 use qiskit_circuit::dag_circuit::{DAGCircuit, NodeType, Wire};
 use qiskit_circuit::operations::{ArrayType, Operation, OperationRef, Param, UnitaryGate};
 use qiskit_circuit::packed_instruction::PackedOperation;
@@ -148,7 +147,7 @@ pub fn split_2q_unitaries(
                         &[Qubit::new(mapping[index0])],
                         &[],
                         None,
-                        ExtraInstructionAttributes::default(),
+                        None,
                         #[cfg(feature = "cache_pygates")]
                         None,
                     )?;
@@ -158,7 +157,7 @@ pub fn split_2q_unitaries(
                         &[Qubit::new(mapping[index1])],
                         &[],
                         None,
-                        ExtraInstructionAttributes::default(),
+                        None,
                         #[cfg(feature = "cache_pygates")]
                         None,
                     )?;
@@ -180,7 +179,7 @@ pub fn split_2q_unitaries(
                 &mapped_qargs,
                 cargs,
                 inst.params.as_deref().cloned(),
-                inst.extra_attrs.clone(),
+                inst.label.as_ref().map(|x| x.to_string()),
                 #[cfg(feature = "cache_pygates")]
                 inst.py_op.get().map(|x| x.clone_ref(py)),
             )?;

crates/accelerate/src/target_transpiler/mod.rs

@@ -32,7 +32,7 @@ use pyo3::{
     IntoPyObjectExt,
 };
 
-use qiskit_circuit::circuit_instruction::{ExtraInstructionAttributes, OperationFromPython};
+use qiskit_circuit::circuit_instruction::OperationFromPython;
 use qiskit_circuit::operations::{Operation, OperationRef, Param};
 use qiskit_circuit::packed_instruction::PackedOperation;
 use smallvec::SmallVec;
@@ -775,17 +775,15 @@ impl Target {
             let out_inst = match inst {
                 TargetOperation::Normal(op) => match op.operation.view() {
                     OperationRef::StandardGate(standard) => standard
-                        .create_py_op(py, Some(&op.params), &ExtraInstructionAttributes::default())?
+                        .create_py_op(py, Some(&op.params), None)?
                         .into_any(),
                     OperationRef::StandardInstruction(standard) => standard
-                        .create_py_op(py, Some(&op.params), &ExtraInstructionAttributes::default())?
+                        .create_py_op(py, Some(&op.params), None)?
                         .into_any(),
                     OperationRef::Gate(gate) => gate.gate.clone_ref(py),
                     OperationRef::Instruction(instruction) => instruction.instruction.clone_ref(py),
                     OperationRef::Operation(operation) => operation.operation.clone_ref(py),
-                    OperationRef::Unitary(unitary) => unitary
-                        .create_py_op(py, &ExtraInstructionAttributes::default())?
-                        .into_any(),
+                    OperationRef::Unitary(unitary) => unitary.create_py_op(py, None)?.into_any(),
                 },
                 TargetOperation::Variadic(op_cls) => op_cls.clone_ref(py),
             };