Merge 203cec4 into 4d3821b

crates/circuit/src/gate_matrix.rs

@@ -226,6 +226,13 @@ pub static TDG_GATE: [[Complex64; 2]; 2] = [
     [c64(0., 0.), c64(FRAC_1_SQRT_2, -FRAC_1_SQRT_2)],
 ];
 
+pub static DCX_GATE: [[Complex64; 4]; 4] = [
+    [c64(1., 0.), c64(0., 0.), c64(0., 0.), c64(0., 0.)],
+    [c64(0., 0.), c64(0., 0.), c64(0., 0.), c64(1., 0.)],
+    [c64(0., 0.), c64(1., 0.), c64(0., 0.), c64(0., 0.)],
+    [c64(0., 0.), c64(0., 0.), c64(1., 0.), c64(0., 0.)],
+];
+
 #[inline]
 pub fn global_phase_gate(theta: f64) -> [[Complex64; 1]; 1] {
     [[c64(0., theta).exp()]]

crates/circuit/src/imports.rs

@@ -183,7 +183,7 @@ static STDGATE_IMPORT_PATHS: [[&str; 2]; STANDARD_GATE_SIZE] = [
     // C4XGate = 44
     ["placeholder", "placeholder"],
     // DCXGate = 45
-    ["placeholder", "placeholder"],
+    ["qiskit.circuit.library.standard_gates.dcx", "DCXGate"],
     // CCZGate = 46
     ["placeholder", "placeholder"],
     // RCCXGate = 47

crates/circuit/src/operations.rs

@@ -240,7 +240,7 @@ static STANDARD_GATE_NUM_QUBITS: [u32; STANDARD_GATE_SIZE] = [
     2, 2, 1, 0, 1, 1, 1, 1, 1, 1, // 10-19
     1, 1, 1, 2, 2, 2, 1, 1, 1, 34, // 20-29
     34, 34, 34, 2, 2, 2, 2, 2, 3, 2, // 30-39
-    2, 2, 34, 34, 34, 34, 34, 34, 34, 34, // 40-49
+    2, 2, 34, 34, 34, 2, 34, 34, 34, 34, // 40-49
     34, 34, 34, // 50-52
 ];
 
@@ -250,7 +250,7 @@ static STANDARD_GATE_NUM_PARAMS: [u32; STANDARD_GATE_SIZE] = [
     0, 0, 0, 1, 0, 0, 1, 3, 0, 0, // 10-19
     0, 0, 0, 0, 2, 2, 1, 2, 3, 34, // 20-29
     34, 34, 34, 0, 1, 0, 0, 0, 0, 3, // 30-39
-    1, 3, 34, 34, 34, 34, 34, 34, 34, 34, // 40-49
+    1, 3, 34, 34, 34, 0, 34, 34, 34, 34, // 40-49
     34, 34, 34, // 50-52
 ];
 
@@ -523,7 +523,10 @@ impl Operation for StandardGate {
             Self::CSwapGate => todo!(),
             Self::CUGate | Self::CU1Gate | Self::CU3Gate => todo!(),
             Self::C3XGate | Self::C3SXGate | Self::C4XGate => todo!(),
-            Self::DCXGate => todo!(),
+            Self::DCXGate => match params {
+                [] => Some(aview2(&gate_matrix::DCX_GATE).to_owned()),
+                _ => None,
+            },
             Self::CCZGate => todo!(),
             Self::RCCXGate | Self::RC3XGate => todo!(),
             Self::RXXGate | Self::RYYGate | Self::RZZGate => todo!(),
@@ -965,7 +968,21 @@ impl Operation for StandardGate {
             Self::CU1Gate => todo!(),
             Self::CU3Gate => todo!(),
             Self::C3XGate | Self::C3SXGate | Self::C4XGate => todo!(),
-            Self::DCXGate => todo!(),
+            Self::DCXGate => Python::with_gil(|py| -> Option<CircuitData> {
+                Some(
+                    CircuitData::from_standard_gates(
+                        py,
+                        2,
+                        [
+                            (Self::CXGate, smallvec![], smallvec![Qubit(0), Qubit(1)]),
+                            (Self::CXGate, smallvec![], smallvec![Qubit(1), Qubit(0)]),
+                        ],
+                        FLOAT_ZERO,
+                    )
+                    .expect("Unexpected Qiskit python bug"),
+                )
+            }),
+
             Self::CCZGate => todo!(),
             Self::RCCXGate | Self::RC3XGate => todo!(),
             Self::RXXGate | Self::RYYGate | Self::RZZGate => todo!(),

qiskit/circuit/library/standard_gates/dcx.py

@@ -15,6 +15,7 @@
 from qiskit.circuit.singleton import SingletonGate, stdlib_singleton_key
 from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit.circuit._utils import with_gate_array
+from qiskit._accelerate.circuit import StandardGate
 
 
 @with_gate_array([[1, 0, 0, 0], [0, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0]])
@@ -48,6 +49,8 @@ class DCXGate(SingletonGate):
             \end{pmatrix}
     """
 
+    _standard_gate = StandardGate.DCXGate
+
     def __init__(self, label=None, *, duration=None, unit="dt"):
         """Create new DCX gate."""
         super().__init__("dcx", 2, [], label=label, duration=duration, unit=unit)

qiskit/circuit/quantumcircuit.py

@@ -5328,9 +5328,7 @@ def dcx(self, qubit1: QubitSpecifier, qubit2: QubitSpecifier) -> InstructionSet:
         Returns:
             A handle to the instructions created.
         """
-        from .library.standard_gates.dcx import DCXGate
-
-        return self.append(DCXGate(), [qubit1, qubit2], [], copy=False)
+        return self._append_standard_gate(op=StandardGate.DCXGate, qargs=[qubit1, qubit2])
 
     def ccx(
         self,