Merge remote-tracking branch 'mine/2025-11/cirqnumpy' into 2025-11/cirqnumpy

Author: mpharrigan

qualtran/bloqs/mcmt/and_bloq.py

@@ -361,7 +361,7 @@ def build_call_graph(self, ssa: 'SympySymbolAllocator') -> 'BloqCountDictT':
             or is_symbolic(*self.concrete_cvs)
             or (self.n_ctrls == sum(self.concrete_cvs))
         ):
-            cost[XGate()] = 2 * (self.n_ctrls - sum(self.concrete_cvs))
+            cost[XGate()] = 2 * (self.n_ctrls - sum(int(cv) for cv in self.concrete_cvs))
 
         return cost
 

qualtran/bloqs/phase_estimation/qubitization_qpe_test.py

@@ -152,7 +152,7 @@ def should_decompose(binst):
 
 
 @pytest.mark.notebook
-def test_phase_estimation_of_qubitized_hubbard_model():
+def test_phase_estimation_of_qubitized_hubbard_model_notebook():
     execute_notebook('phase_estimation_of_quantum_walk')