notebook for deutsch jozsa and simon, fix internal compiler for certa…

…in cases
dakk · Dec 3, 2023 · bcee074 · bcee074
1 parent 0607b85
commit bcee074
Show file tree

Hide file tree

Showing 6 changed files with 266 additions and 15 deletions.
diff --git a/docs/source/example_deutsch_jozsa.ipynb b/docs/source/example_deutsch_jozsa.ipynb
diff --git a/docs/source/example_simon.ipynb b/docs/source/example_simon.ipynb
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -23,6 +23,8 @@ Python and translate them into unitary operators (gates) for use in quantum circ
    example_grover_hash.ipynb
    example_grover_sudoku.ipynb
    example_unitary_of_f.ipynb
+   example_simon.ipynb
+   example_deutsch_jozsa.ipynb
 
 
 Indices and tables

diff --git a/qlasskit/compiler/internalcompiler.py b/qlasskit/compiler/internalcompiler.py
@@ -56,6 +56,9 @@ def compile(
                     a_true = qc.add_qubit("TRUE")
                     qc.x(a_true)
                 iret = a_true
+            elif isinstance(symp_exp, Symbol):
+                iret = qc.add_qubit(sym.name)
+                qc.cx(qc[symp_exp.name], iret)
             else:
                 iret = self.compile_expr(qc, symp_exp)
 
@@ -67,7 +70,8 @@ def compile(
 
         qc.remove_identities()
         if uncompute:
-            qc.uncompute_all(keep=[qc[r] for r in returns.bitvec])
+            keep = [qc[r] for r in filter(lambda r: r in qc, returns.bitvec)]
+            qc.uncompute_all(keep=keep)
 
         return qc
 

diff --git a/test/test_algo_deutschjozsa.py b/test/test_algo_deutschjozsa.py
@@ -14,20 +14,23 @@
 
 import unittest
 
+from parameterized import parameterized_class
+
 from qlasskit import Qint2, Qint4, qlassf
 from qlasskit.algorithms import DeutschJozsa
 from qlasskit.compiler import SupportedCompilers
 
-from .utils import qiskit_measure_and_count
+from .utils import ENABLED_COMPILERS, qiskit_measure_and_count
 
 
+@parameterized_class(("compiler"), ENABLED_COMPILERS)
 class TestAlgoDeutschJozsa(unittest.TestCase):
     def test_deutschjozsa_balanced(self):
         f = """
 def hash(k: Qint2) -> bool:
     return k[0] ^ k[1]
 """
-        qf = qlassf(f)
+        qf = qlassf(f, compiler=self.compiler)
         algo = DeutschJozsa(qf)
 
         qc_algo = algo.circuit().export("circuit", "qiskit")
@@ -36,15 +39,11 @@ def hash(k: Qint2) -> bool:
         self.assertEqual(counts_readable["Balanced"], 1024)
 
     def test_deutschjozsa_balanced2(self):
-        # TODO: fix this in internalcompiler
-        if "tweedledum" not in SupportedCompilers:
-            return
-
         f = """
 def hash(k: bool) -> bool:
     return k
 """
-        qf = qlassf(f, compiler="tweedledum")
+        qf = qlassf(f, compiler=self.compiler)
         algo = DeutschJozsa(qf)
 
         qc_algo = algo.circuit().export("circuit", "qiskit")
@@ -57,7 +56,7 @@ def test_deutschjozsa_constant(self):
 def hash(k: Qint2) -> bool:
     return False
 """
-        qf = qlassf(f)
+        qf = qlassf(f, compiler=self.compiler)
         algo = DeutschJozsa(qf)
 
         qc_algo = algo.circuit().export("circuit", "qiskit")

diff --git a/test/test_algo_simon.py b/test/test_algo_simon.py
@@ -14,24 +14,23 @@
 
 import unittest
 
+from parameterized import parameterized_class
+
 from qlasskit import Qint2, Qint4, qlassf
 from qlasskit.algorithms import Simon
 from qlasskit.compiler import SupportedCompilers
 
-from .utils import qiskit_measure_and_count
+from .utils import ENABLED_COMPILERS, qiskit_measure_and_count
 
 
+@parameterized_class(("compiler"), ENABLED_COMPILERS)
 class TestAlgoSimon(unittest.TestCase):
     def test_simon(self):
-        # TODO: fix this in internalcompiler
-        if "tweedledum" not in SupportedCompilers:
-            return
-
         f = """
 def hash(k: Qint4) -> Qint4:
     return k >> 3
 """
-        qf = qlassf(f, compiler="tweedledum")
+        qf = qlassf(f, compiler=self.compiler)
         algo = Simon(qf)
 
         qc = algo.circuit().export("circuit", "qiskit")