Merge branch 'main' into 2026-01/deps

Author: mpharrigan

.github/workflows/nightly.yaml

@@ -30,7 +30,7 @@ permissions: read-all
 jobs:
   pytest:
     runs-on: ubuntu-22.04
-    timeout-minutes: 60
+    timeout-minutes: 120
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9 # v1
@@ -43,4 +43,4 @@ jobs:
           pip install -r dev_tools/requirements/envs/pytest.env.txt
           pip install --no-deps -e .
       - run: |
-          check/pytest --durations=10
+          check/pytest --durations=10 -v -n=0

qualtran/bloqs/basic_gates/identity.py

@@ -32,6 +32,7 @@
     Signature,
     SoquetT,
 )
+from qualtran.bloqs.bookkeeping import Partition
 from qualtran.drawing import Text, TextBox, WireSymbol
 from qualtran.symbolics import is_symbolic, SymbolicInt
 
@@ -116,11 +117,17 @@ def ctrl_adder(
             bb: 'BloqBuilder', ctrl_soqs: Sequence['SoquetT'], in_soqs: Dict[str, 'SoquetT']
         ) -> Tuple[Iterable['SoquetT'], Iterable['SoquetT']]:
             parts = [
-                (Register(f'ctrl_{i}', dtype=dtype, shape=shape), 'q')
+                Register(f"ctrl_{i}", dtype=dtype, shape=shape)
                 for i, (dtype, shape) in enumerate(ctrl_spec.activation_function_dtypes())
-            ] + [(reg, 'q') for reg in self.signature]
-            all_soqs = in_soqs | {f'ctrl_{i}': ctrl_soq for i, ctrl_soq in enumerate(ctrl_soqs)}
-            out_soqs = bb.add_and_partition(ctrl_I, partitions=parts, left_only=False, **all_soqs)
+            ] + [reg for reg in self.signature]
+
+            all_soqs = in_soqs | {f"ctrl_{i}": ctrl_soq for i, ctrl_soq in enumerate(ctrl_soqs)}
+
+            pratition = Partition(ctrl_I.signature.n_qubits(), regs=parts)
+            q = bb.add(pratition.adjoint(), **all_soqs)
+            q = bb.add(ctrl_I, q=q)
+            out_soqs = bb.add(pratition, x=q)
+
             return out_soqs[:-1], out_soqs[-1:]
 
         return ctrl_I, ctrl_adder

qualtran/bloqs/basic_gates/identity_test.py

@@ -16,7 +16,7 @@
 import pytest
 import sympy
 
-from qualtran import BloqBuilder
+from qualtran import BloqBuilder, CtrlSpec, QBit, Register
 from qualtran.bloqs.basic_gates import OneState
 from qualtran.bloqs.basic_gates.identity import _identity, _identity_n, _identity_symb, Identity
 from qualtran.simulation.classical_sim import (
@@ -106,6 +106,19 @@ def test_identity_controlled():
     assert Identity(n).controlled() == Identity(n + 1)
 
 
+def test_identity_ctrl_adder():
+
+    ctrl_I, ctrl_adder = Identity(1).get_ctrl_system(CtrlSpec())
+
+    bb = BloqBuilder()
+    ctrl0 = bb.add_register(Register("ctrl_0", QBit()))
+    q = bb.add_register(Register("q", QBit()))
+    assert ctrl0 is not None and q is not None
+    [ctrl_out], (out_reg,) = ctrl_adder(bb, ctrl_soqs=[ctrl0], in_soqs={"q": q})
+    composite = bb.finalize(ctrl_0=ctrl_out, q=out_reg)
+    composite.flatten()
+
+
 @pytest.mark.notebook
 def test_notebook():
     execute_notebook('identity')

qualtran/bloqs/block_encoding/linear_combination.py

@@ -108,10 +108,15 @@ def __attrs_post_init__(self):
                 "If given, prepare and select oracles must have same selection registers."
             )
         if self._select is not None and self._select.target_registers != (
-            self.signature.get_left("system"),
+            Register(
+                "system",
+                QAny(self.system_bitsize + self.be_ancilla_bitsize + self.be_resource_bitsize),
+            ),
         ):
             raise ValueError(
-                "If given, select oracle must have block encoding `system` register as target."
+                "Invalid select oracle target registers. "
+                "The `system` register must include the block encoding's system, ancilla, "
+                "and resource registers."
             )
         if not all(
             isinstance(u.signal_state.prepare, PrepareIdentity) for u in self._block_encodings
@@ -367,8 +372,13 @@ def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> tuple['Bloq', 'AddControlled
             ctrl_reg_name='ctrl',
         )
 
-    def adjoint(self) -> 'LinearCombination':
-        return self
+    def adjoint(self) -> 'Bloq':
+        from qualtran.bloqs.mcmt.specialized_ctrl import (
+            AdjointWithSpecializedCtrl,
+            SpecializeOnCtrlBit,
+        )
+
+        return AdjointWithSpecializedCtrl(self, SpecializeOnCtrlBit.ONE)
 
 
 @bloq_example

qualtran/bloqs/block_encoding/linear_combination_test.py

@@ -164,6 +164,23 @@ def test_linear_combination5(lambd):
     run_gate_test([TGate(), Hadamard(), XGate(), ZGate(), Ry(angle=np.pi / 4.0)], lambd)
 
 
+@pytest.mark.parametrize('lambd', exact3)
+def test_linear_combinaison_hermician_when_bloqs_hermician(lambd):
+    gates = [Hadamard().controlled(), CNOT(), Swap(1)]
+    bloq = LinearCombination(tuple(Unitary(g) for g in gates), lambd, lambd_bits=1)
+    np.testing.assert_allclose(bloq.tensor_contract(), bloq.adjoint().tensor_contract(), atol=1e-16)
+
+
+@pytest.mark.parametrize('lambd', exact3)
+def test_linear_combinaison_not_hermician_when_bloqs_not_hermician(lambd):
+    gates = [TGate().controlled(), CNOT(), Swap(1)]
+    bloq = LinearCombination(tuple(Unitary(g) for g in gates), lambd, lambd_bits=1)
+    with pytest.raises(AssertionError):
+        np.testing.assert_allclose(
+            bloq.tensor_contract(), bloq.adjoint().tensor_contract(), atol=1e-16
+        )
+
+
 # coefficients are not multiples of small negative powers of 2 after normalization
 approx2 = [
     [1 / 3, 2 / 3],

qualtran/bloqs/multiplexers/apply_lth_bloq.py

@@ -127,6 +127,14 @@ def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlled
             get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (evolve(self, control_val=cv), 'control'),
         )
 
+    def adjoint(self) -> 'Bloq':
+        from qualtran.bloqs.mcmt.specialized_ctrl import (
+            AdjointWithSpecializedCtrl,
+            SpecializeOnCtrlBit,
+        )
+
+        return AdjointWithSpecializedCtrl(self, SpecializeOnCtrlBit.BOTH)
+
 
 @bloq_example
 def _apply_lth_bloq() -> ApplyLthBloq: