Skip to content

Commit 1def2e4

Browse files
mpharriganmpharrigan
committed
Merge remote-tracking branch 'origin/main' into 2025-09/soquett-with-bloqlib
2 parents b8ff0f0 + 5bb1c4a commit 1def2e4

52 files changed

Lines changed: 2159 additions & 1516 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dev_tools/qualtran_dev_tools/notebook_specs.py‎

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,6 @@
251251
module=qualtran.bloqs.basic_gates.identity,
252252
bloq_specs=[qualtran.bloqs.basic_gates.identity._IDENTITY_DOC],
253253
),
254-
NotebookSpecV2(
255-
title='Bookkeeping Bloqs',
256-
module=qualtran.bloqs.bookkeeping,
257-
bloq_specs=[
258-
qualtran.bloqs.bookkeeping.allocate._ALLOC_DOC,
259-
qualtran.bloqs.bookkeeping.free._FREE_DOC,
260-
qualtran.bloqs.bookkeeping.split._SPLIT_DOC,
261-
qualtran.bloqs.bookkeeping.join._JOIN_DOC,
262-
qualtran.bloqs.bookkeeping.partition._PARTITION_DOC,
263-
qualtran.bloqs.bookkeeping.auto_partition._AUTO_PARTITION_DOC,
264-
qualtran.bloqs.bookkeeping.cast._CAST_DOC,
265-
qualtran.bloqs.bookkeeping.always._ALWAYS_DOC,
266-
],
267-
),
268254
NotebookSpecV2(
269255
title='Control Specification (And)',
270256
module=qualtran.bloqs.mcmt.ctrl_spec_and,
@@ -887,6 +873,52 @@
887873
),
888874
]
889875

876+
BOOKKEEPING: List[NotebookSpecV2] = [
877+
NotebookSpecV2(
878+
title='Split / Join',
879+
module=qualtran.bloqs.bookkeeping.split,
880+
bloq_specs=[
881+
qualtran.bloqs.bookkeeping.split._SPLIT_DOC,
882+
qualtran.bloqs.bookkeeping.join._JOIN_DOC,
883+
],
884+
),
885+
NotebookSpecV2(
886+
title='Split2 / Join2',
887+
module=qualtran.bloqs.bookkeeping.partition,
888+
path_stem='split2',
889+
bloq_specs=[
890+
qualtran.bloqs.bookkeeping.partition._SPLIT2_DOC,
891+
qualtran.bloqs.bookkeeping.partition._JOIN2_DOC,
892+
],
893+
),
894+
NotebookSpecV2(
895+
title='Alloc / Free',
896+
module=qualtran.bloqs.bookkeeping.allocate,
897+
bloq_specs=[
898+
qualtran.bloqs.bookkeeping.allocate._ALLOC_DOC,
899+
qualtran.bloqs.bookkeeping.free._FREE_DOC,
900+
],
901+
),
902+
NotebookSpecV2(
903+
title='Partition',
904+
module=qualtran.bloqs.bookkeeping.partition,
905+
bloq_specs=[
906+
qualtran.bloqs.bookkeeping.partition._PARTITION_DOC,
907+
qualtran.bloqs.bookkeeping.auto_partition._AUTO_PARTITION_DOC,
908+
],
909+
),
910+
NotebookSpecV2(
911+
title='Cast',
912+
module=qualtran.bloqs.bookkeeping.cast,
913+
bloq_specs=[qualtran.bloqs.bookkeeping.cast._CAST_DOC],
914+
),
915+
NotebookSpecV2(
916+
title='Always',
917+
module=qualtran.bloqs.bookkeeping.always,
918+
bloq_specs=[qualtran.bloqs.bookkeeping.always._ALWAYS_DOC],
919+
),
920+
]
921+
890922
# --------------------------------------------------------------------------
891923
# ----- Other ----------------------------------------------------------
892924
# --------------------------------------------------------------------------
@@ -1013,5 +1045,6 @@
10131045
('Rotations', ROT_QFT_PE),
10141046
('Block Encoding', BLOCK_ENCODING),
10151047
('Optimization', OPTIMIZATION),
1048+
('Bookkeeping', BOOKKEEPING),
10161049
('Other', OTHER),
10171050
]

‎dev_tools/qualtran_dev_tools/reference_docs.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class _CustomTemplateMixin:
8888
JINJA_ENV = jinja2.Environment(
8989
trim_blocks=True,
9090
lstrip_blocks=True,
91+
autoescape=True,
9192
loader=jinja2.FileSystemLoader(TEMPLATE_SEARCH_PATH),
9293
)
9394

‎dev_tools/requirements/deps/runtime.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
attrs>=23.2.0
33
cachetools>=5.3
44
networkx
5-
numpy
5+
numpy~=1.26
66
sympy
7-
cirq-core==1.4
7+
cirq-core>=1.4.0,<1.6
88
fxpmath
99
galois
1010

‎dev_tools/requirements/envs/dev.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ cffi==1.17.1
9494
# cryptography
9595
charset-normalizer==3.4.3
9696
# via requests
97-
cirq-core==1.4.0
97+
cirq-core==1.5.0
9898
# via
9999
# -r deps/runtime.txt
100100
# openfermion

‎dev_tools/requirements/envs/docs.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ charset-normalizer==3.4.3
123123
# via
124124
# -c envs/dev.env.txt
125125
# requests
126-
cirq-core==1.4.0
126+
cirq-core==1.5.0
127127
# via
128128
# -c envs/dev.env.txt
129129
# -r deps/runtime.txt

‎dev_tools/requirements/envs/format.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ charset-normalizer==3.4.3
109109
# via
110110
# -c envs/dev.env.txt
111111
# requests
112-
cirq-core==1.4.0
112+
cirq-core==1.5.0
113113
# via
114114
# -c envs/dev.env.txt
115115
# -r deps/runtime.txt

‎dev_tools/requirements/envs/mypy.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ charset-normalizer==3.4.3
101101
# via
102102
# -c envs/dev.env.txt
103103
# requests
104-
cirq-core==1.4.0
104+
cirq-core==1.5.0
105105
# via
106106
# -c envs/dev.env.txt
107107
# -r deps/runtime.txt

‎dev_tools/requirements/envs/pylint.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ charset-normalizer==3.4.3
122122
# via
123123
# -c envs/dev.env.txt
124124
# requests
125-
cirq-core==1.4.0
125+
cirq-core==1.5.0
126126
# via
127127
# -c envs/dev.env.txt
128128
# -r deps/runtime.txt

‎dev_tools/requirements/envs/pytest.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ charset-normalizer==3.4.3
109109
# via
110110
# -c envs/dev.env.txt
111111
# requests
112-
cirq-core==1.4.0
112+
cirq-core==1.5.0
113113
# via
114114
# -c envs/dev.env.txt
115115
# -r deps/runtime.txt

‎dev_tools/requirements/envs/runtime.env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ charset-normalizer==3.4.3
101101
# via
102102
# -c envs/dev.env.txt
103103
# requests
104-
cirq-core==1.4.0
104+
cirq-core==1.5.0
105105
# via
106106
# -c envs/dev.env.txt
107107
# -r deps/runtime.txt

0 commit comments

Comments
 (0)