Merge remote-tracking branch 'origin/main' into 2024-08/sim-report-card

Author: mpharrigan

dev_tools/requirements/envs/dev.env.txt

@@ -288,7 +288,7 @@ jupyter-server==2.14.2
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via notebook
 jupyterlab-pygments==0.3.0
     # via nbconvert

dev_tools/requirements/envs/docs.env.txt

@@ -340,7 +340,7 @@ jupyter-server-terminals==0.5.3
     # via
     #   -c envs/dev.env.txt
     #   jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via
     #   -c envs/dev.env.txt
     #   notebook

dev_tools/requirements/envs/format.env.txt

@@ -310,7 +310,7 @@ jupyter-server-terminals==0.5.3
     # via
     #   -c envs/dev.env.txt
     #   jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via
     #   -c envs/dev.env.txt
     #   notebook

dev_tools/requirements/envs/pylint.env.txt

@@ -360,7 +360,7 @@ jupyter-server-terminals==0.5.3
     # via
     #   -c envs/dev.env.txt
     #   jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via
     #   -c envs/dev.env.txt
     #   notebook

dev_tools/requirements/envs/pytest.env.txt

@@ -334,7 +334,7 @@ jupyter-server-terminals==0.5.3
     # via
     #   -c envs/dev.env.txt
     #   jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via
     #   -c envs/dev.env.txt
     #   notebook

dev_tools/requirements/envs/runtime.env.txt

@@ -293,7 +293,7 @@ jupyter-server-terminals==0.5.3
     # via
     #   -c envs/dev.env.txt
     #   jupyter-server
-jupyterlab==4.2.4
+jupyterlab==4.2.5
     # via
     #   -c envs/dev.env.txt
     #   notebook

docs/bloq_infra.rst

@@ -24,7 +24,8 @@ types (``Register``), and algorithms (``CompositeBloq``).
    :maxdepth: 1
    :caption: Quantum Computer Architectures:
 
-   surface_code/azure_cost_model.ipynb
+   surface_code/physical_cost_model.ipynb
+   surface_code/beverland_et_al_model.ipynb
    surface_code/thc_compilation.ipynb
    surface_code/msft_resource_estimator_interop.ipynb
 
@@ -35,6 +36,7 @@ types (``Register``), and algorithms (``CompositeBloq``).
    _infra/composite_bloq.ipynb
    cirq_interop/cirq_interop.ipynb
    cirq_interop/t_complexity.ipynb
+   qref_interop/bartiq_demo.ipynb
    _infra/gate_with_registers.ipynb
    drawing/graphviz.ipynb
    drawing/musical_score.ipynb

qualtran/Protocols.ipynb

@@ -33,7 +33,7 @@
     "\n",
     "### Call Graph\n",
     "\n",
-    "You can get a directed-acyclic graph representing the hierarchical decomposition of bloqs by calling `bloq.call_graph()` or direct callees with `bloq.bloq_counts()`. Additional functionality is contained in the `qualtran.resource_counting` module. To implement this protocol, bloq authors can override `Bloq.build_call_graph(...)`. The default fallback uses the decomposition protocol and `build_cbloq_call_graph(...)`. See the full [call graph protocol documentation](./resource_counting/bloq_counts.ipynb) for details.\n",
+    "You can get a directed-acyclic graph representing the hierarchical decomposition of bloqs by calling `bloq.call_graph()` or direct callees with `bloq.bloq_counts()`. Additional functionality is contained in the `qualtran.resource_counting` module. To implement this protocol, bloq authors can override `Bloq.build_call_graph(...)`. The default fallback uses the decomposition protocol and `build_cbloq_call_graph(...)`. See the full [call graph protocol documentation](./resource_counting/call_graph.ipynb) for details.\n",
     "\n",
     "### Tensor\n",
     "\n",
@@ -65,7 +65,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.8"
   }
  },
  "nbformat": 4,

qualtran/__init__.py

@@ -51,7 +51,7 @@
     QFxp,
     QIntOnesComp,
     QUInt,
-    BoundedQUInt,
+    BQUInt,
     QMontgomeryUInt,
 )
 

qualtran/_infra/adjoint.py

@@ -12,8 +12,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from collections import Counter
 from functools import cached_property
-from typing import Dict, List, Optional, Set, Tuple, TYPE_CHECKING
+from typing import Dict, List, Optional, Tuple, TYPE_CHECKING
 
 import cirq
 from attrs import frozen
@@ -26,7 +27,7 @@
 if TYPE_CHECKING:
     from qualtran import Bloq, CompositeBloq, Register, Signature, SoquetT
     from qualtran.drawing import WireSymbol
-    from qualtran.resource_counting import BloqCountT, SympySymbolAllocator
+    from qualtran.resource_counting import BloqCountDictT, SympySymbolAllocator
 
 
 def _adjoint_final_soqs(cbloq: 'CompositeBloq', new_signature: Signature) -> Dict[str, 'SoquetT']:
@@ -150,17 +151,21 @@ def _circuit_diagram_info_(
         sub_info.exponent *= -1
         return sub_info
 
-    def supports_decompose_bloq(self) -> bool:
-        """Delegate to `subbloq.supports_decompose_bloq()`"""
-        return self.subbloq.supports_decompose_bloq()
-
     def adjoint(self) -> 'Bloq':
         """The 'double adjoint' brings you back to the original bloq."""
         return self.subbloq
 
-    def build_call_graph(self, ssa: 'SympySymbolAllocator') -> Set['BloqCountT']:
+    def build_call_graph(self, ssa: 'SympySymbolAllocator') -> 'BloqCountDictT':
         """The call graph takes the adjoint of each of the bloqs in `subbloq`'s call graph."""
-        return {(bloq.adjoint(), n) for bloq, n in self.subbloq.build_call_graph(ssa=ssa)}
+        sub_cg = self.subbloq.build_call_graph(ssa=ssa)
+        counts = Counter['Bloq']()
+        if isinstance(sub_cg, set):
+            for bloq, n in sub_cg:
+                counts[bloq.adjoint()] += n
+        else:
+            for bloq, n in sub_cg.items():
+                counts[bloq.adjoint()] += n
+        return counts
 
     def pretty_name(self) -> str:
         """The subbloq's pretty_name with a dagger."""