improve exporters

dakk · Dec 30, 2023 · c104813 · c104813
1 parent 62d50c6
commit c104813
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/qlasskit/qcircuit/exporter_pennylane.py b/qlasskit/qcircuit/exporter_pennylane.py
@@ -58,10 +58,7 @@ def export(self, _selfqc, mode: Literal["circuit", "gate"]):  # noqa: C901
             elif isinstance(g, gates.CP):
                 ops.append(qml.CPhase(p, wires=w))
 
-            elif isinstance(g, gates.Barrier):
-                pass
-
-            elif isinstance(g, gates.NopGate):
+            elif issubclass(g.__class__, gates.NopGate):
                 pass
 
             elif hasattr(qml, g_name):

diff --git a/qlasskit/qcircuit/exporter_qasm.py b/qlasskit/qcircuit/exporter_qasm.py
@@ -24,7 +24,7 @@ def export(self, _selfqc, mode: Literal["circuit", "gate"]):
         gate_qasm += " ".join(_selfqc.qubit_map.keys())
         gate_qasm += " {\n"
         for g, ws, p in _selfqc.gates:
-            if isinstance(g, gates.NopGate):
+            if issubclass(g.__class__, gates.NopGate):
                 continue
 
             qbs = list(map(lambda gq: _selfqc.get_key_by_index(gq), ws))

diff --git a/qlasskit/qcircuit/exporter_qiskit.py b/qlasskit/qcircuit/exporter_qiskit.py
@@ -39,7 +39,7 @@ def export(self, _selfqc, mode: Literal["circuit", "gate"]):  # noqa: C901
             elif isinstance(g, gates.Barrier) and mode != "gate":
                 qc.barrier(label=p)
 
-            elif isinstance(g, gates.NopGate):
+            elif issubclass(g.__class__, gates.NopGate):
                 pass
 
             elif hasattr(qc, g_name):

diff --git a/qlasskit/qcircuit/exporter_sympy.py b/qlasskit/qcircuit/exporter_sympy.py
@@ -53,7 +53,7 @@ def export(self, _selfqc, mode: Literal["circuit", "gate"]):  # noqa: C901
                 ga = mcx(w)
             elif isinstance(g, gates.Barrier) and mode != "gate":
                 pass
-            elif isinstance(g, gates.NopGate):
+            elif issubclass(g.__class__, gates.NopGate):
                 pass
             else:
                 raise Exception(f"Gate not handled for sympy exporter: {g_name}")

diff --git a/qlasskit/qcircuit/qcircuit.py b/qlasskit/qcircuit/qcircuit.py
@@ -169,7 +169,7 @@ def append(self, gate: QGate, qubits: List[int], param: Any = None):
         applied = gates.apply(gate, qubits, param)
         self.gates.append(applied)
 
-        if not isinstance(gate, gates.NopGate):
+        if not issubclass(gate.__class__, gates.NopGate):
             self.gates_computed.append(applied)
 
     def barrier(self, label=None):

diff --git a/test/test_qlassf_hybrid_quantum.py b/test/test_qlassf_hybrid_quantum.py
@@ -34,7 +34,7 @@ def test_h(self):
     #     print(qf.expressions)
     #     count = qiskit_measure_and_count(qf.circuit().export(), 128)
     #     [self.assertEqual(x in count, True) for x in ["00", "11", "01", "11"]]
-        
+
     def test_h_multi(self):
         f = "def test(a: Qint2) -> Qint2:\n\treturn Q.H(a)"
         qf = qlassf(f, to_compile=COMPILATION_ENABLED, uncompute=False)