Symbolic build call graph works + type test + linter

Author: petim0

qualtran/bloqs/block_encoding/product.py

@@ -25,26 +25,24 @@
     bloq_example,
     BloqBuilder,
     BloqDocSpec,
+    CtrlSpec,
     DecomposeTypeError,
     QAny,
     QBit,
     Register,
     Signature,
     Soquet,
     SoquetT,
-    CtrlSpec,
-    AddControlledT,
 )
 from qualtran.bloqs.basic_gates.x_basis import XGate
 from qualtran.bloqs.block_encoding import BlockEncoding
 from qualtran.bloqs.bookkeeping.auto_partition import AutoPartition, Unused
 from qualtran.bloqs.bookkeeping.partition import Partition
-from qualtran.bloqs.mcmt import MultiControlX
 from qualtran.bloqs.reflections.prepare_identity import PrepareIdentity
 from qualtran.bloqs.state_preparation.black_box_prepare import BlackBoxPrepare
 from qualtran.resource_counting import BloqCountDictT, SympySymbolAllocator
 from qualtran.resource_counting.generalizers import ignore_split_join
-from qualtran.symbolics import HasLength, is_symbolic, prod, smax, ssum, SymbolicFloat, SymbolicInt
+from qualtran.symbolics import is_symbolic, prod, smax, ssum, SymbolicFloat, SymbolicInt
 from qualtran.symbolics.math_funcs import is_zero
 
 
@@ -201,14 +199,12 @@ def build_call_graph(self, ssa: SympySymbolAllocator) -> BloqCountDictT:
         for i, u in enumerate(reversed(self.block_encodings)):
             if not is_zero(u.ancilla_bitsize) and n - 1 > 0 and i != n - 1:
                 anc_bits = self.ancilla_bitsize - (n - 1)
-                if not is_symbolic(self.ancilla_bitsize):
+                if not is_symbolic(u.ancilla_bitsize):
                     counts[
                         self._multCX_autopart(used_bits=u.ancilla_bitsize, total_bits=anc_bits)
                     ] += 1
                 else:
-                    counts[
-                        self._multCX(u.ancilla_bitsize)
-                    ]  # Right ? A TESTER ENCORE, REGARDER LE RéSULTATS
+                    counts[self._multCX(u.ancilla_bitsize)] += 1
                 counts[XGate()] += 1
 
         if not is_symbolic(self.ancilla_bitsize):

qualtran/bloqs/block_encoding/product_test.py

@@ -34,9 +34,9 @@
 from qualtran.bloqs.block_encoding.block_encoding_base import BlockEncoding
 from qualtran.bloqs.block_encoding.product import (
     _product_block_encoding,
-    _product_block_encoding_with_ancillas,
     _product_block_encoding_properties,
     _product_block_encoding_symb,
+    _product_block_encoding_with_ancillas,
     Product,
 )
 from qualtran.bloqs.block_encoding.unitary import Unitary
@@ -230,6 +230,18 @@ def test_product_counts():
     assert_equivalent_bloq_example_counts(_product_block_encoding_with_ancillas)
 
 
+def test_product_symbolic_call_graph_decomposes():
+    from qualtran.bloqs.basic_gates import Hadamard, TGate
+    from qualtran.bloqs.block_encoding.unitary import Unitary
+
+    product_block_encoding = Product(
+        (
+            Unitary(TGate(), ancilla_bitsize=sympy.symbols("anc")),
+            Unitary(Hadamard(), ancilla_bitsize=sympy.symbols("anc")),
+        )
+    )
+
+
 @pytest.mark.notebook
 def test_notebook():
     execute_notebook('product')