Release/0.13.1

Author: ericbrts

perceval/components/abstract_processor.py

@@ -340,7 +340,8 @@ def check_input(self, input_state: BasicState):
 
     def check_min_detected_photons_filter(self):
         if self._min_detected_photons_filter is None:
-            if not self.is_remote and self._source is not None and self._source.is_perfect():
+            if (not self.is_remote and self._source is not None and self._source.is_perfect()
+                    and isinstance(self.input_state, BasicState)):
                 # Automatically set the min_detected_photons_filter for perfect sources of local processors if not set
                 self.min_detected_photons_filter(self.input_state.n)
             else:

perceval/components/component_catalog.py

@@ -30,7 +30,7 @@
 from abc import ABC, abstractmethod
 
 from perceval.utils import Parameter
-from perceval.components import Processor, Circuit
+from perceval.components import Processor, Circuit, Experiment
 from perceval.utils.logging import get_logger, channel
 
 
@@ -80,10 +80,6 @@ def _handle_param(value):
             return Parameter(value)
         return value
 
-    def _init_processor(self, **kwargs):
-        return Processor(kwargs.get("backend", self._default_backend), self.build_circuit(**kwargs),
-                         name=kwargs.get("name") or self._name.upper())
-
     @abstractmethod
     def build_circuit(self, **kwargs) -> Circuit:
         """Build the component as circuit
@@ -93,6 +89,13 @@ def build_circuit(self, **kwargs) -> Circuit:
         pass
 
     @abstractmethod
+    def build_experiment(self, **kwargs) -> Experiment:
+        """Build the component as experiment
+
+        :return: A Perceval experiment
+        """
+        pass
+
     def build_processor(self, **kwargs) -> Processor:
         """Build the component as processor
 
@@ -101,7 +104,8 @@ def build_processor(self, **kwargs) -> Processor:
 
         :return: A Perceval processor
         """
-        pass
+        return Processor(kwargs.get("backend", self._default_backend), self.build_experiment(**kwargs),
+                         name=kwargs.get("name") or self._name.upper())
 
 
 class Catalog:

perceval/components/core_catalog/controlled_rotation_gates.py

@@ -34,7 +34,7 @@
 import cmath as cm
 from scipy.linalg import block_diag
 
-from perceval.components import Circuit, Port, Unitary
+from perceval.components import Circuit, Port, Unitary, Processor, Experiment
 from perceval.components.component_catalog import CatalogItem
 from perceval.utils import Encoding, PostSelect, Matrix
 
@@ -93,7 +93,7 @@ class PostProcessedControlledRotationsItem(CatalogItem):
     def __init__(self):
         super().__init__("postprocessed controlled gate")
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         """
         kwargs:
             - n : int, number of qubit of the gate.
@@ -116,17 +116,17 @@ def build_circuit(self, **kwargs):
         m = build_control_gate_unitary(n, alpha)
         return Circuit(4*n, name="postprocessed controlled gate").add(0, Unitary(m))
 
-    def build_processor(self, **kwargs):
-        p = self._init_processor(**kwargs)
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
         n = kwargs["n"]
 
-        p.set_postselection(PostSelect('&'.join([f"[{2*n},{2*n+1}]==1" for n in range(n)])))
+        e.set_postselection(PostSelect('&'.join([f"[{2*n},{2*n+1}]==1" for n in range(n)])))
 
         for i in range(n - 1):
-            p.add_port(2 * i, Port(Encoding.DUAL_RAIL, f"ctrl{i}"))
-        p.add_port(2 * (n - 1), Port(Encoding.DUAL_RAIL, "data"))
+            e.add_port(2 * i, Port(Encoding.DUAL_RAIL, f"ctrl{i}"))
+        e.add_port(2 * (n - 1), Port(Encoding.DUAL_RAIL, "data"))
 
         for i in range(2 * n, 4 * n):
-            p.add_herald(i, 0)
+            e.add_herald(i, 0)
 
-        return p
+        return e

perceval/components/core_catalog/gates_1qubit.py

@@ -31,7 +31,7 @@
 from abc import ABC, abstractmethod
 from numbers import Number
 
-from perceval.components import Processor, Circuit, BS, PS, PERM, Port
+from perceval.components import Processor, Circuit, BS, PS, PERM, Port, Experiment
 from perceval.utils import Encoding, P
 from perceval.components.component_catalog import CatalogItem
 
@@ -73,9 +73,10 @@ def description(self):
     def str_repr(self):
         return _get_component_str_repr(self.repr_name)
 
-    def build_processor(self, **kwargs) -> Processor:
-        p = self._init_processor(**kwargs)
-        return p.add_port(0, Port(Encoding.DUAL_RAIL, 'data'))
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
+        return e.add_port(0, Port(Encoding.DUAL_RAIL, 'data'))
+
 
 
 class AFixedItem(ASingleQubitGate, ABC):
@@ -158,7 +159,7 @@ class AParamItem(ASingleQubitGate, ABC):
     def get_circuit(self, param) -> Circuit:
         pass
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         param = kwargs.get(self.param_key, 0.0)
         param = self._handle_param(param)
         name = self.repr_name

perceval/components/core_catalog/generic_2mode.py

@@ -27,7 +27,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from perceval.components import Circuit, BS
+from perceval.components import Circuit, BS, Processor, Experiment
 from perceval.components.component_catalog import CatalogItem
 
 
@@ -49,12 +49,12 @@ class Generic2ModeItem(CatalogItem):
     def __init__(self):
         super().__init__("generic 2 mode circuit")
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         return Circuit(2, name=kwargs.get("name", "U2")) \
             // BS.H(theta=self._handle_param(kwargs.get("theta", "theta")),
                     phi_tl=self._handle_param(kwargs.get("phi_tl", "phi_tl")),
                     phi_bl=self._handle_param(kwargs.get("phi_bl", "phi_bl")),
                     phi_tr=self._handle_param(kwargs.get("phi_tr", "phi_tr")))
 
-    def build_processor(self, **kwargs):
-        return self._init_processor(**kwargs)
+    def build_experiment(self, **kwargs) -> Experiment:
+        return Experiment(self.build_circuit(**kwargs))

perceval/components/core_catalog/heralded_cnot.py

@@ -30,6 +30,8 @@
 from perceval.components import Circuit, BS, Port
 from perceval.components.component_catalog import CatalogItem
 from perceval.components.core_catalog.heralded_cz import HeraldedCzItem
+from perceval.components.experiment import Experiment
+from perceval.components.processor import Processor
 from perceval.utils import Encoding
 
 
@@ -48,17 +50,17 @@ class HeraldedCnotItem(CatalogItem):
     def __init__(self):
         super().__init__("heralded cnot")
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         c = Circuit(6, name="Heralded CNOT")
         c.add(2, BS.H())
         heralded_cz = HeraldedCzItem()
         c.add(0, heralded_cz.build_circuit(), merge=True)
         c.add(2, BS.H())
         return c
 
-    def build_processor(self, **kwargs):
-        p = self._init_processor(**kwargs)
-        return p.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl'))\
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
+        return e.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl'))\
             .add_port(2, Port(Encoding.DUAL_RAIL, 'data'))\
             .add_herald(4, 1)\
             .add_herald(5, 1)

perceval/components/core_catalog/heralded_cz.py

@@ -29,7 +29,7 @@
 
 import math
 
-from perceval.components import Processor, Circuit, PERM, BS, PS, Barrier
+from perceval.components import Processor, Circuit, PERM, BS, PS, Barrier, Experiment
 from perceval.components.component_catalog import CatalogItem
 from perceval.components.port import Port, Encoding
 
@@ -71,9 +71,9 @@ def build_circuit(self, **kwargs) -> Circuit:
                 .add(2, last_modes_cz, merge=True)
                 .add(1, PERM([1, 0])))
 
-    def build_processor(self, **kwargs) -> Processor:
-        p = self._init_processor(**kwargs)
-        return p.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl')) \
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
+        return e.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl')) \
             .add_port(2, Port(Encoding.DUAL_RAIL, 'data')) \
             .add_herald(4, 1) \
             .add_herald(5, 1)

perceval/components/core_catalog/klm_cnot.py

@@ -29,7 +29,7 @@
 
 from math import sqrt
 
-from perceval.components import Circuit, BS, PERM, Port
+from perceval.components import Circuit, BS, PERM, Port, Processor, Experiment
 from perceval.components.component_catalog import CatalogItem
 from perceval.utils import Encoding
 
@@ -58,7 +58,7 @@ class KLMCnotItem(CatalogItem):
     def __init__(self):
         super().__init__("klm cnot")
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         return (Circuit(8, name=_GATE_NAME)
                 .add(1, PERM([2, 4, 3, 0, 1]))
                 .add(4, BS.H())
@@ -77,9 +77,9 @@ def build_circuit(self, **kwargs):
                 .add(4, BS.H())
                 .add(1, PERM([4, 3, 0, 2, 1])))
 
-    def build_processor(self, **kwargs):
-        p = self._init_processor(**kwargs)
-        return p.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl')) \
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
+        return e.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl')) \
             .add_port(2, Port(Encoding.DUAL_RAIL, 'data')) \
             .add_herald(4, 0) \
             .add_herald(5, 1) \

perceval/components/core_catalog/mzi.py

@@ -31,7 +31,7 @@
 from abc import ABC
 
 
-from perceval.components import Processor, Circuit, BS, PS
+from perceval.components import Processor, Circuit, BS, PS, Experiment
 from perceval.components.component_catalog import CatalogItem
 
 
@@ -54,8 +54,8 @@ def _handle_params(**kwargs):
             CatalogItem._handle_param(kwargs.get("theta_a", math.pi/2)), \
             CatalogItem._handle_param(kwargs.get("theta_b", math.pi/2))
 
-    def build_processor(self, **kwargs) -> Processor:
-        return self._init_processor(**kwargs)
+    def build_experiment(self, **kwargs) -> Experiment:
+        return Experiment(self.build_circuit(**kwargs))
 
     def generate(self, i: int):
         return self.build_circuit(i=i)

perceval/components/core_catalog/postprocessed_ccz.py

@@ -29,7 +29,7 @@
 
 from math import pi
 
-from perceval.components import Circuit, Port, Unitary
+from perceval.components import Circuit, Port, Unitary, Processor, Experiment
 from perceval.components.component_catalog import CatalogItem
 from perceval.components.core_catalog import controlled_rotation_gates
 from perceval.utils import Encoding, PostSelect, Matrix
@@ -52,14 +52,14 @@ class PostProcessedCCZItem(CatalogItem):
     def __init__(self):
         super().__init__("postprocessed ccz")
 
-    def build_circuit(self, **kwargs):
+    def build_circuit(self, **kwargs) -> Circuit:
         m = Matrix(controlled_rotation_gates.build_control_gate_unitary(3, pi))
         return Circuit(12, name="PostProcessed CCZ").add(0, Unitary(m))
 
-    def build_processor(self, **kwargs):
-        p = self._init_processor(**kwargs)
-        p.set_postselection(PostSelect("[0,1]==1 & [2,3]==1 & [4,5]==1"))
-        return p.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl0')) \
+    def build_experiment(self, **kwargs) -> Experiment:
+        e = Experiment(self.build_circuit(**kwargs))
+        e.set_postselection(PostSelect("[0,1]==1 & [2,3]==1 & [4,5]==1"))
+        return e.add_port(0, Port(Encoding.DUAL_RAIL, 'ctrl0')) \
             .add_port(2, Port(Encoding.DUAL_RAIL, 'ctrl1')) \
             .add_port(4, Port(Encoding.DUAL_RAIL, 'data')) \
             .add_herald(6, 0) \