Merge branch 'main' into 2024/SR/planted-noisy-kxor-algorithm

Author: anurudhp

.gemini/config.yaml

@@ -0,0 +1,28 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Summary: configure Gemini Code Assist (https://codeassist.google/).
+# See https://github.com/marketplace/gemini-code-assist for more info.
+
+have_fun: false
+code_review:
+  disable: false
+  comment_severity_threshold: HIGH
+  max_review_comments: -1
+  pull_request_opened:
+    help: false
+    summary: false
+    code_review: true
+    include_drafts: false
+ignore_patterns: []

dev_tools/dump-bloq-manifest.py

@@ -0,0 +1,173 @@
+#  Copyright 2025 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""
+Script to dump a manifest of all bloq classes and bloq examples.
+
+This script finds all Bloq classes and examples in the library, serializes the examples
+to their objectstring representation, and writes the list of class names and
+example objectstrings to `qualtran/bloqs/manifest.py`.
+
+See `qualtran.l1.load_objectstring()` to load bloq objects from these strings.
+"""
+
+from functools import cached_property
+from typing import List, Tuple
+
+from attrs import frozen
+from qualtran_dev_tools.bloq_finder import get_bloq_classes, get_bloq_examples
+from qualtran_dev_tools.git_tools import get_git_root
+
+from qualtran import Bloq
+from qualtran.l1 import eval_cvalue_node, parse_objectstring, to_cobject_node
+from qualtran.l1.nodes import CArgNode, CObjectNode, LiteralNode
+
+MAXLEN = 300
+"""If the objectstring is too long, we make the executive decision to truncate it."""
+
+COPYRIGHT_NOTICE = """#  Copyright 2026 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License."""
+
+
+@frozen
+class BloqExampleListItem:
+    """Formatting a bloq example and its serialized form.
+
+    Attributes:
+        bloq: The bloq instance from the example.
+        bloq_example_name: The name of the bloq example.
+        cobject_node: The CObjectNode representing the serialized bloq.
+    """
+
+    bloq: Bloq
+    bloq_example_name: str
+    cobject_node: CObjectNode
+
+    @cached_property
+    def objectstring(self) -> str:
+        """Returns the canonical string representation of the CObjectNode."""
+        return self.cobject_node.canonical_str()
+
+    def maybe_commented_out(self, be_column_width: int = 30) -> Tuple[str, str, str]:
+        """Generates a string representation for the manifest, potentially commented out.
+
+        This method checks if the object string is too long, unparsable, unloadable, or
+        if the re-loaded bloq is unequal to the original. If any of these conditions are met,
+        it returns a commented-out string with a reason. Otherwise, it returns the
+        executable string representation.
+
+        Args:
+            be_column_width: The width of the column for the bloq example name for nicer formatting.
+
+        Returns:
+            manifest_entry_str: The string to be written to the manifest (possibly commented out).
+            reason: A reason string if it was commented out (empty otherwise).
+            reason_details: Detailed error message if applicable (empty otherwise).
+        """
+        quoted_be = f"'{self.bloq_example_name}',"
+        be = f'{quoted_be:{be_column_width}}'
+        be2 = f'{quoted_be:{be_column_width+2}}'
+
+        if len(self.objectstring) > MAXLEN:
+            trunc = repr(self.objectstring)[:120] + '...'
+            return f'# ({be}{trunc}', 'too long', ''
+
+        try:
+            node = parse_objectstring(self.objectstring)
+        except Exception as e:  # pylint: disable=broad-except
+            return f'# ({be}{self.objectstring!r}),', 'unparsable', str(e)
+
+        try:
+            bloq = eval_cvalue_node(node, safe=False)
+        except Exception as e:  # pylint: disable=broad-except
+            return f'# ({be}{self.objectstring!r}),', 'unloadable', str(e)
+
+        if bloq != self.bloq:
+            return f'# ({be}{self.objectstring!r}),', 'unequal', ''
+
+        return f'({be2}{self.objectstring!r}),', '', ''
+
+
+def main():
+    """Main entry point for the script.
+
+    Finds all bloq classes and examples, processes them, and writes the
+    `BLOQ_CLASS_NAMES` and `BLOQ_EXAMPLE_OBJECTSTRINGS` lists to
+    `qualtran/bloqs/manifest.py`.
+    """
+    bcs = get_bloq_classes()
+    names = sorted(bc._class_name_in_pkg_() for bc in bcs)
+
+    bes = get_bloq_examples()
+    items: List[BloqExampleListItem] = []
+    for be in bes:
+        bloq = be.make()
+        try:
+            cobject_node = to_cobject_node(bloq)
+            assert isinstance(cobject_node, CObjectNode)
+        except Exception as e:  # pylint: disable=broad-except
+            cobject_node = CObjectNode(
+                name=bloq._class_name_in_pkg_(), cargs=[CArgNode(None, LiteralNode(str(e)))]
+            )
+        items.append(
+            BloqExampleListItem(bloq=bloq, bloq_example_name=be.name, cobject_node=cobject_node)
+        )
+
+    items = sorted(items, key=lambda x: x.objectstring)
+    include_commented_out = True
+    be_objectstrings = []
+    for item in items:
+        serstr, reason, details = item.maybe_commented_out()
+
+        if (not reason) or include_commented_out:
+            be_objectstrings.append(serstr)
+
+        if reason:
+            reason = f'({reason})'
+            print(f"Skipping {reason:20s} {serstr}")
+
+        if details:
+            print(f'         {"":20s} ->', details)
+
+    reporoot = get_git_root()
+    with (reporoot / 'qualtran/bloqs/manifest.py').open('w') as f:
+        f.write(COPYRIGHT_NOTICE)
+        f.write('\n\n')
+        f.write('# This file is autogenerated\n')
+        f.write('# See dev_tools/dump-bloq-manifest.py\n')
+        f.write('# fmt: off\n\n')
+        f.write('BLOQ_CLASS_NAMES = [\n')
+        f.write('\n'.join([f'    "{name}",' for name in names]))
+        f.write('\n]\n')
+
+        f.write('\n')
+
+        f.write('BLOQ_EXAMPLE_OBJECTSTRINGS = [\n')
+        f.write('\n'.join([f'    {objstr}' for objstr in be_objectstrings]))
+        f.write('\n]\n')
+
+
+if __name__ == '__main__':
+    main()

dev_tools/qualtran_dev_tools/make_reference_docs/_make.py

@@ -78,7 +78,12 @@
 ]
 MINIMAL = True
 
-DEFINED_IN_CONTAINER_EXCEPTIONS = ['qualtran.dtype', 'qualtran.exception', 'qualtran.cirq_interop']
+DEFINED_IN_CONTAINER_EXCEPTIONS = [
+    'qualtran.dtype',
+    'qualtran.exception',
+    'qualtran.cirq_interop',
+    'qualtran.l1.nodes',
+]
 
 
 def _get_all_aliases(obj: Union[griffe.Object, griffe.Alias]) -> Set[str]:

docs/bloq_infra.rst

@@ -55,4 +55,5 @@ types (``Register``), and algorithms (``CompositeBloq``).
    drawing/musical_score.ipynb
    drawing/drawing_call_graph.ipynb
    simulation/xcheck_classical_quimb.ipynb
+   l1/L1-Objectstring.ipynb
    Autodoc.ipynb

qualtran/__init__.py

@@ -46,8 +46,11 @@
     CompositeBloq,
     BloqBuilder,
     DidNotFlattenAnythingError,
+    Soquet,
     SoquetT,
     ConnectionT,
+    QVar,
+    QVarT,
 )
 
 from ._infra.data_types import (
@@ -84,14 +87,7 @@
 
 # Internal imports: none
 # External imports: none
-from ._infra.quantum_graph import (
-    BloqInstance,
-    Connection,
-    DanglingT,
-    LeftDangle,
-    RightDangle,
-    Soquet,
-)
+from ._infra.quantum_graph import BloqInstance, Connection, DanglingT, LeftDangle, RightDangle
 
 from ._infra.gate_with_registers import GateWithRegisters
 

qualtran/_infra/adjoint.py

@@ -18,20 +18,28 @@
 
 from attrs import frozen
 
-from .composite_bloq import _binst_to_cxns, _cxns_to_soq_dict, _map_soqs, _reg_to_soq, BloqBuilder
+from .composite_bloq import (
+    _binst_to_cxns,
+    _cxns_to_soq_dict,
+    _map_soqs,
+    _reg_to_soq,
+    _SoquetT,
+    BloqBuilder,
+    QVarT,
+)
 from .gate_with_registers import GateWithRegisters
 from .quantum_graph import LeftDangle, RightDangle
 from .registers import Signature
 
 if TYPE_CHECKING:
     import cirq
 
-    from qualtran import Bloq, CompositeBloq, Register, Signature, SoquetT
+    from qualtran import Bloq, CompositeBloq, Register, Signature
     from qualtran.drawing import WireSymbol
     from qualtran.resource_counting import BloqCountDictT, SympySymbolAllocator
 
 
-def _adjoint_final_soqs(cbloq: 'CompositeBloq', new_signature: Signature) -> Dict[str, 'SoquetT']:
+def _adjoint_final_soqs(cbloq: 'CompositeBloq', new_signature: Signature) -> Dict[str, '_SoquetT']:
     """`CompositeBloq.final_soqs()` but backwards."""
     if LeftDangle not in cbloq._binst_graph:
         return {}
@@ -57,15 +65,15 @@ def _adjoint_cbloq(cbloq: 'CompositeBloq') -> 'CompositeBloq':
     # First, we reverse the registers to initialize the BloqBuilder.
     old_signature = cbloq.signature
     new_signature = cbloq.signature.adjoint()
-    old_i_soqs = [_reg_to_soq(RightDangle, reg) for reg in old_signature.rights()]
-    new_i_soqs = [_reg_to_soq(LeftDangle, reg) for reg in new_signature.lefts()]
-    soq_map: List[Tuple[SoquetT, SoquetT]] = list(zip(old_i_soqs, new_i_soqs))
 
     # Then we reverse the order of subbloqs
     bloqnections = reversed(list(cbloq.iter_bloqnections()))
 
     # And add subbloq.adjoint() back in for each subbloq.
     bb, _ = BloqBuilder.from_signature(new_signature)
+    old_i_soqs = [_reg_to_soq(RightDangle, reg) for reg in old_signature.rights()]
+    new_i_soqs = [bb._reg_to_qvar(LeftDangle, reg) for reg in new_signature.lefts()]
+    soq_map: List[Tuple[_SoquetT, QVarT]] = list(zip(old_i_soqs, new_i_soqs))
     for binst, preds, succs in bloqnections:
         # Instead of get_me returning the right element of a predecessor connection,
         # it's the left element of a successor connection.
@@ -174,6 +182,10 @@ def __str__(self) -> str:
         """Delegate to subbloq's `__str__` method."""
         return f'{str(self.subbloq)}†'
 
+    @classmethod
+    def _pkg_(cls) -> str:
+        return 'qualtran'
+
     def wire_symbol(
         self, reg: Optional['Register'], idx: Tuple[int, ...] = tuple()
     ) -> 'WireSymbol':

qualtran/_infra/bloq.py

@@ -695,6 +695,10 @@ def wire_symbol(
     def __str__(self):
         return self.__class__.__name__
 
+    @classmethod
+    def _pkg_(cls) -> str:
+        return '.'.join(cls.__module__.split('.')[:-1])
+
     @classmethod
     def _class_name_in_pkg_(cls) -> str:
         """The bloq class's name with its package.
@@ -703,5 +707,4 @@ def _class_name_in_pkg_(cls) -> str:
         `qualtran.bloqs.*`. Each bloq class is defined in a module (i.e. the
         "*.py" file) and re-exported one level up.
         """
-        pkg = '.'.join(cls.__module__.split('.')[:-1])
-        return f'{pkg}.{cls.__name__}'
+        return f'{cls._pkg_()}.{cls.__name__}'

qualtran/_infra/composite_bloq.ipynb

@@ -343,7 +343,7 @@
     "bb, _ = BloqBuilder.from_signature(cbloq.signature)\n",
     "\n",
     "# We'll have to \"map\" the soquets from our template cbloq to our new one\n",
-    "soq_map: List[Tuple[SoquetT, SoquetT]] = []\n",
+    "soq_map = bb.initial_soq_map(cbloq.signature.lefts())\n",
     "    \n",
     "# Iteration yields each bloq instance as well as its input and output soquets.\n",
     "for binst, in_soqs, old_out_soqs in cbloq.iter_bloqsoqs():\n",
@@ -512,8 +512,8 @@
     "# Go through and decompose each subbloq\n",
     "# We'll manually code this up in this notebook since this isn't a useful operation.\n",
     "bb, _ = BloqBuilder.from_signature(flat_three_p.signature)\n",
-    "soq_map: List[Tuple[SoquetT, SoquetT]] = []\n",
-    "    \n",
+    "soq_map: List[Tuple[SoquetT, SoquetT]] = bb.initial_soq_map(flat_three_p.signature.lefts())\n",
+    "\n",
     "for binst, in_soqs, old_out_soqs in flat_three_p.iter_bloqsoqs():\n",
     "    in_soqs = bb.map_soqs(in_soqs, soq_map)\n",
     "    \n",