Feat new gate

.gitignore

@@ -15,6 +15,7 @@ __pycache__/
 .mypy_cache/
 .pytest_cache/
 .ipynb_checkpoints/
+venv/
 
 # IDE
 .vscode/

docs/gates.rst

@@ -59,3 +59,13 @@ Controlled Custom Gates
 -----------------------
 
 .. automodule:: mpqp.core.instruction.gates.custom_controlled_gate
+
+Gate Decomposition
+------------------
+
+When a target language or device does not support a
+:class:`~mpqp.core.instruction.gates.native_gates.ComposedGate` natively, MPQP
+recursively resolves it into gates supported by the target gate set. Gates that
+are already supported are preserved without decomposition.
+
+.. automodule:: mpqp.core.instruction.gates.gate_decomposition

examples/notebooks/4c_Quantum_Phase_Estimation.ipynb

@@ -26,7 +26,7 @@
     "    IBMDevice,\n",
     "    run,\n",
     ")\n",
-    "from mpqp.qasm.qasm_to_mpqp import qasm2_parse\n",
+    "from mpqp.translation.qasm.qasm_to_mpqp import qasm2_parse\n",
     "from mpqp.tools.maths import normalize"
    ]
   },

examples/scripts/aws_execution_trials.py

@@ -7,7 +7,7 @@
 from mpqp.execution.devices import ATOSDevice, AWSDevice
 from mpqp.gates import *
 from mpqp.measures import BasisMeasure
-from mpqp.qasm.qasm_to_braket import qasm3_to_braket_Circuit
+from mpqp.translation.qasm.qasm_to_braket import qasm3_to_braket_Circuit
 
 device = LocalSimulator()
 

examples/scripts/open_qasm_conversions.py

@@ -1,6 +1,6 @@
 """Examples of OpenQASM conversion from 2.0 to 3.0"""
 
-from mpqp.qasm import open_qasm_2_to_3, remove_user_gates
+from mpqp.translation.qasm import open_qasm_2_to_3, remove_user_gates
 
 print("-------------------------")
 print("-------------------------")

mpqp/__init__.py

@@ -37,6 +37,7 @@
     CNOT,
     CP,
     CZ,
+    PRX,
     SWAP,
     TOF,
     ControlledGate,
@@ -53,8 +54,11 @@
     Rk,
     Rk_dagger,
     Rx,
+    Rxx,
     Ry,
+    Ryy,
     Rz,
+    Rzz,
     S,
     S_dagger,
     T,

mpqp/core/circuit.py

@@ -47,7 +47,6 @@
 from mpqp.core.instruction.gates import ControlledGate, Gate
 from mpqp.core.instruction.gates.custom_controlled_gate import CustomControlledGate
 from mpqp.core.instruction.gates.custom_gate import CustomGate
-from mpqp.core.instruction.gates.native_gates import NativeGate
 from mpqp.core.instruction.gates.parametrized_gate import ParametrizedGate
 from mpqp.core.instruction.measurement import BasisMeasure, Measure
 from mpqp.core.instruction.measurement.expectation_value import ExpectationMeasure
@@ -58,6 +57,7 @@
     InstructionParsingError,
     NonReversibleWarning,
     NumberQubitsError,
+    UnsupportedGateError,
 )
 from mpqp.tools.generics import OneOrMany
 from mpqp.tools.maths import matrix_eq
@@ -946,7 +946,7 @@ def initializer(cls, state: npt.NDArray[np.complex128]) -> QCircuit:
         qiskit_circuit.append(
             StatePreparation(Statevector(normalize(state))), range(size)
         )
-        circ, phase = replace_custom_gate(qiskit_circuit[0], size, list(range(size)))
+        circ, phase = replace_custom_gate(qiskit_circuit, size, list(range(size)))
         cls = QCircuit.from_other_language(circ.reverse_bits())
         cls.input_g_phase = phase
         return cls
@@ -1109,7 +1109,6 @@ def to_other_language(
         language: Literal[Language.QASM2, Language.QASM3],
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> str: ...
 
@@ -1119,7 +1118,6 @@ def to_other_language(
         language: Literal[Language.CIRQ],
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> cirq_Circuit: ...
 
@@ -1129,7 +1127,6 @@ def to_other_language(
         language: Literal[Language.BRAKET],
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> braket_Circuit: ...
     @overload
@@ -1138,7 +1135,6 @@ def to_other_language(
         language: Literal[Language.MY_QLM],
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> myQLM_Circuit: ...
 
@@ -1148,7 +1144,6 @@ def to_other_language(
         language: Literal[Language.QISKIT],
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> QuantumCircuit: ...
 
@@ -1158,7 +1153,6 @@ def to_other_language(
         language: Language,
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> QuantumCircuit | myQLM_Circuit | braket_Circuit | cirq_Circuit | str: ...
 
@@ -1167,7 +1161,6 @@ def to_other_language(
         language: Language = Language.QISKIT,
         skip_pre_measure: bool = False,
         skip_measurements: bool = False,
-        authorized_gates: Optional[set[type[NativeGate]]] = None,
         printing: bool = False,
     ) -> QuantumCircuit | myQLM_Circuit | braket_Circuit | cirq_Circuit | str:
         """Transforms this circuit into the corresponding circuit in the language
@@ -1241,26 +1234,17 @@ def to_other_language(
             circuits.
 
         """
-        if authorized_gates is None:
-            authorized_gates = set()
         self._generated_g_phase = 0
         if language == Language.QISKIT:
             from mpqp.translation.qiskit import mpqp_to_qiskit
 
-            return mpqp_to_qiskit(
-                self,
-                skip_pre_measure,
-                skip_measurements,
-                printing,
-                authorized_gates=authorized_gates,
-            )
+            return mpqp_to_qiskit(self, skip_pre_measure, skip_measurements, printing)
 
         elif language == Language.MY_QLM:
             qasm2_code = self.to_other_language(
                 Language.QASM2,
                 skip_pre_measure=skip_pre_measure,
                 skip_measurements=True,
-                authorized_gates=authorized_gates,
             )
             from mpqp.translation.qasm.qasm_to_myqlm import qasm2_to_myqlm_Circuit
 
@@ -1270,16 +1254,12 @@ def to_other_language(
         elif language == Language.BRAKET:
             from mpqp.translation.braket import mpqp_to_braket
 
-            return mpqp_to_braket(
-                self, skip_pre_measure, authorized_gates=authorized_gates
-            )
+            return mpqp_to_braket(self, skip_pre_measure)
 
         elif language == Language.CIRQ:
-            from mpqp.translation import mpqp_to_cirq
+            from mpqp.translation.cirq import mpqp_to_cirq
 
-            return mpqp_to_cirq(
-                self, skip_pre_measure, skip_measurements, authorized_gates
-            )
+            return mpqp_to_cirq(self, skip_pre_measure, skip_measurements)
 
         elif language == Language.QASM2:
             from mpqp.translation.qasm.mpqp_to_qasm import mpqp_to_qasm2
@@ -1415,16 +1395,32 @@ def to_other_device(
 
         skip_measurements = False
 
+        # Checks if all the gates or its direct decomposition are available on the device.
+        from copy import deepcopy
+
+        from mpqp.core.instruction.gates.gate_decomposition import (
+            resolve_instructions,
+        )
+
+        translated_circuit = deepcopy(self)
+        native_gates = device.compatible_gates()
+
+        if native_gates:
+            translated_circuit.instructions = resolve_instructions(
+                translated_circuit.instructions,
+                native_gates,
+            )
+            unsupported_gates = [
+                gate
+                for gate in translated_circuit.gates
+                if type(gate) not in native_gates
+            ]
+            if unsupported_gates:
+                raise UnsupportedGateError(unsupported_gates[0], native_gates)
+
         if isinstance(device, (IBMDevice, StaticIBMSimulatedDevice)):
             if job_type == JobType.STATE_VECTOR:
                 skip_measurements = True
-            compatible_gates = list(device.compatible_gates())
-            if len(compatible_gates) != 0:
-                if any(type(i) not in compatible_gates for i in self.gates):
-                    raise ValueError(
-                        f"Gates {', '.join(map(str, compatible_gates))} "
-                        f"are the only ones available on {device}."
-                    )
             if (
                 isinstance(device, StaticIBMSimulatedDevice)
                 and device.value().num_qubits < self.nb_qubits
@@ -1433,10 +1429,10 @@ def to_other_device(
                     f"Number of qubits of the circuit ({self.nb_qubits}) is higher "
                     f"than the one of the IBMSimulatedDevice ({device.value().num_qubits})."
                 )
-            qiskit_circuit = self.to_other_language(
-                Language.QISKIT,
-                skip_pre_measure,
-                skip_measurements,
+            from mpqp.translation.qiskit import mpqp_to_qiskit
+
+            qiskit_circuit = mpqp_to_qiskit(
+                translated_circuit, skip_pre_measure, skip_measurements
             )
             if TYPE_CHECKING:
                 assert isinstance(qiskit_circuit, QuantumCircuit)
@@ -1612,11 +1608,12 @@ def to_other_device(
             if job_type == JobType.STATE_VECTOR:
                 skip_measurements = True
 
-            aws_circuit = self.to_other_language(
+            aws_circuit = translated_circuit.to_other_language(
                 Language.BRAKET,
                 skip_pre_measure,
                 skip_measurements,
             )
+
             return aws_circuit
         elif isinstance(device, ATOSDevice):
             circuit = self.to_other_language(
@@ -1736,23 +1733,26 @@ def from_other_language(
         )
 
         if InstalledProviders.QISKIT in _INSTALLED_MPQP_PROVIDERS:
-            from mpqp.translation.qiskit import qiskit_to_mpqp
             from qiskit import QuantumCircuit
 
+            from mpqp.translation.qiskit import qiskit_to_mpqp
+
             if isinstance(qcircuit, QuantumCircuit):
                 return qiskit_to_mpqp(qcircuit)
         if InstalledProviders.CIRQ in _INSTALLED_MPQP_PROVIDERS:
-            from mpqp.translation import cirq_to_mpqp
             from cirq.circuits.circuit import Circuit as cirq_Circuit
             from cirq.circuits.moment import Moment
 
+            from mpqp.translation import cirq_to_mpqp
+
             if isinstance(qcircuit, Moment | cirq_Circuit):
                 return cirq_to_mpqp(qcircuit)
 
         if InstalledProviders.BRAKET in _INSTALLED_MPQP_PROVIDERS:
-            from mpqp.translation.braket import braket_to_mpqp
             from braket.circuits import Circuit as braket_Circuit
 
+            from mpqp.translation.braket import braket_to_mpqp
+
             if isinstance(qcircuit, braket_Circuit):
                 return braket_to_mpqp(qcircuit)
 

mpqp/core/instruction/__init__.py

@@ -1,15 +1,15 @@
 # pyright: reportUnusedImport=false
-from .instruction import Instruction
 from .barrier import Barrier
-from .gates import *
 from .breakpoint import Breakpoint
+from .gates import *
+from .instruction import Instruction
 from .measurement import (
     Basis,
-    ComputationalBasis,
-    HadamardBasis,
-    VariableSizeBasis,
     BasisMeasure,
+    ComputationalBasis,
     ExpectationMeasure,
-    Observable,
+    HadamardBasis,
     Measure,
+    Observable,
+    VariableSizeBasis,
 )

mpqp/core/instruction/breakpoint.py

@@ -6,9 +6,10 @@
 truncated up to the breakpoint."""
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING, Optional
 
-from mpqp.core.instruction import Instruction
+from mpqp.core.instruction.instruction import Instruction
 from mpqp.core.languages import Language
 
 if TYPE_CHECKING:

mpqp/core/instruction/gates/__init__.py

@@ -1,25 +1,30 @@
 # pyright: reportUnusedImport=false
 from .controlled_gate import ControlledGate
-from .custom_gate import CustomGate, UnitaryMatrix
 from .custom_controlled_gate import CustomControlledGate
+from .custom_gate import CustomGate, UnitaryMatrix
 from .gate import Gate
 from .gate_definition import GateDefinition
 from .native_gates import (
     CNOT,
+    CP,
     CZ,
+    PRX,
     SWAP,
     TOF,
+    ComposedGate,
     CRk,
     CRk_dagger,
     H,
     Id,
     P,
-    CP,
     Rk,
     Rk_dagger,
     Rx,
+    Rxx,
     Ry,
+    Ryy,
     Rz,
+    Rzz,
     S,
     S_dagger,
     T,