Skip to content
Merged
Show file tree
Hide file tree
Changes from 79 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
612947c
feat(hseries): add RuntimeBarrier op
ss2165 Apr 24, 2025
d5e0e0b
refactors
ss2165 Apr 24, 2025
2ab66a2
make room for barrier
ss2165 Apr 24, 2025
df60d7d
add test skeleton
ss2165 Apr 24, 2025
5f8bd10
add barrier -> runtime barrier lowering
ss2165 Apr 24, 2025
726d390
some comments
ss2165 Apr 25, 2025
1916b07
parametrise test
ss2165 Apr 25, 2025
5d28bcf
move to separate module
ss2165 Apr 25, 2025
979470e
rewrite with pack/unpack system
ss2165 Apr 25, 2025
a069a6f
handle arrays
ss2165 Apr 25, 2025
24cfd0b
support tuples
ss2165 Apr 25, 2025
d0bd3a2
handle option<qubit>
ss2165 Apr 26, 2025
fa79046
refactor in to functions
ss2165 Apr 26, 2025
692ae19
include shortcut for qubit arrays
ss2165 Apr 26, 2025
6524442
comments and error message about issues with None
ss2165 Apr 27, 2025
59c8e31
impl things for RuntimeBarrierDef
ss2165 Apr 27, 2025
ca5d163
only accept option qubit inside array
ss2165 Apr 28, 2025
163e497
add insertcut rewrite
ss2165 Apr 28, 2025
62ec181
use new rewrite for single insert
ss2165 Apr 28, 2025
c883b27
use hugr building for rewriting
ss2165 Apr 28, 2025
7b5a417
refactor lower func
ss2165 Apr 28, 2025
703328d
add temporary extension based op lowering
ss2165 Apr 28, 2025
41aad73
clippy fixes
ss2165 Apr 28, 2025
487720c
clippy cleanups
ss2165 Apr 28, 2025
f48179e
use function definition for barrier unwrapping
ss2165 Apr 29, 2025
23bb56e
function for array unpacking
ss2165 Apr 29, 2025
aefa3c6
make unpack a barrierfuncs method
ss2165 Apr 29, 2025
3f6ba66
count qubits in type
ss2165 Apr 29, 2025
1e9cb02
record qubit number
ss2165 Apr 29, 2025
ecba562
refactor container usage
ss2165 Apr 30, 2025
df2d1ab
start work on full unpack functions
ss2165 Apr 30, 2025
a836f12
chore!: BUmp to hugr-0.20
doug-q May 1, 2025
8dee0ad
fmt
doug-q May 1, 2025
764152a
update extensions
doug-q May 1, 2025
f7c7737
how do you deal with Infallible?
doug-q May 1, 2025
d7178ba
fix
doug-q May 1, 2025
028e3af
cache functions for lowering types
ss2165 May 2, 2025
e485b4c
Merge remote-tracking branch 'origin/update-hugr-202505' into ss/barr
ss2165 May 6, 2025
2ebb396
use ReplaceTypes for lowering
ss2165 May 6, 2025
36ba773
Bump to latest rev
mark-koch May 6, 2025
7880723
Regenerate json extensions
mark-koch May 6, 2025
c2b53c3
bump to latest rev
ss2165 May 6, 2025
83280a8
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 6, 2025
18dcfdc
use upstream mangle
ss2165 May 6, 2025
6741db8
use upstream InsertCut
ss2165 May 6, 2025
2fac8ce
Add linearize arrays pass to qsystem pass
mark-koch May 6, 2025
69c1570
fix unpack names
ss2165 May 6, 2025
f2ee88d
add docstrings and comments
ss2165 May 6, 2025
af8af95
refactor out common functionality
ss2165 May 7, 2025
1dda29b
Bump to latest rev
mark-koch May 7, 2025
00205b4
reorder methods
ss2165 May 7, 2025
9d2e1b5
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 7, 2025
e2282b6
use upstream `as_unary_option`
ss2165 May 7, 2025
c8d437d
more break-up
ss2165 May 7, 2025
3b57d5d
further cleanups
ss2165 May 7, 2025
a5d0987
simplifications
ss2165 May 7, 2025
7b4a922
split in to multiple files
ss2165 May 7, 2025
0e4da50
add type unit tests
ss2165 May 7, 2025
ddcb63b
ops unit tests
ss2165 May 7, 2025
f06e289
add inserter tests
ss2165 May 7, 2025
a6f6f5f
cleanups
ss2165 May 7, 2025
bf4c50b
gen extensions
ss2165 May 7, 2025
46639ad
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 7, 2025
e5c442a
pin to hugr main commit
ss2165 May 8, 2025
3eee1b5
bump commit
ss2165 May 8, 2025
94b93dc
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 8, 2025
0bf8515
bump rev
ss2165 May 8, 2025
e0f2553
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 8, 2025
d77c0cf
avoid extra tuple pack
ss2165 May 8, 2025
97435eb
update extension
ss2165 May 8, 2025
733e772
feat!: bump msrv to 1.85
ss2165 May 8, 2025
22ce914
Merge branch 'ss/msrv' into update-hugr-202505
ss2165 May 8, 2025
beb408a
Merge branch 'main' into update-hugr-202505
ss2165 May 8, 2025
ec5090e
regenerate eccs
ss2165 May 8, 2025
6e082c2
expect deprecations
ss2165 May 8, 2025
2c8ac4f
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 8, 2025
ee6cc09
pin to hugr-py commit
ss2165 May 8, 2025
b217781
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 8, 2025
1ba13b4
simplify with option
ss2165 May 9, 2025
7fa2030
remove unused dep
ss2165 May 9, 2025
47376b2
review comments
ss2165 May 9, 2025
d6fa53f
wip bump to rc.1
aborgna-q May 13, 2025
d9097a5
fix infinite type recursion in CircuitHash
aborgna-q May 13, 2025
120b290
more test fixes
aborgna-q May 13, 2025
40209c7
recompile eccs
aborgna-q May 13, 2025
5560e5d
squash remaining rust-side errors
aborgna-q May 13, 2025
a3a0817
aborgna-q May 13, 2025
b67c92e
Merge branch 'update-hugr-202505' into ss/barr
ss2165 May 14, 2025
6763ab6
Merge branch 'main' into ss/barr
ss2165 May 16, 2025
97d75cf
fixups
ss2165 May 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 92 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ missing_docs = "warn"
[patch.crates-io]

# Uncomment to use unreleased versions of hugr
# hugr = { git = "https://github.com/CQCL/hugr", rev = "167c687" }
# hugr-core = { git = "https://github.com/CQCL/hugr", rev = "167c687" }
# hugr-passes = { git = "https://github.com/CQCL/hugr", rev = "4e6b6d8" }
# hugr-cli = { git = "https://github.com/CQCL/hugr", rev = "4e6b6d8" }
hugr = { git = "https://github.com/CQCL/hugr", rev = "63c317b" }
hugr-core = { git = "https://github.com/CQCL/hugr", rev = "63c317b" }
hugr-passes = { git = "https://github.com/CQCL/hugr", rev = "63c317b" }
hugr-cli = { git = "https://github.com/CQCL/hugr", rev = "63c317b" }
# portgraph = { git = "https://github.com/CQCL/portgraph", rev = "68b96ac737e0c285d8c543b2d74a7aa80a18202c" }

[workspace.dependencies]
Expand Down
Binary file modified test_files/eccs/nam_4_2.rwr
Binary file not shown.
Binary file modified test_files/eccs/nam_6_3.rwr
Binary file not shown.
Binary file modified test_files/eccs/small_eccs.rwr
Binary file not shown.
Binary file modified tket2-eccs/src/tket2_eccs/data/nam_6_3.rwr
Binary file not shown.
5 changes: 4 additions & 1 deletion tket2-exts/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
"Topic :: Scientific/Engineering",
]

dependencies = ['hugr ~= 0.11.1']
dependencies = ['hugr ~= 0.11.5']

[project.urls]
homepage = "https://github.com/CQCL/tket2/tree/main/tket2-exts"
Expand All @@ -35,3 +35,6 @@ repository = "https://github.com/CQCL/tket2/tree/main/tket2-exts"
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.uv.sources]
hugr = { git = "https://github.com/cqcl/hugr.git", subdirectory = "hugr-py", rev = "719723b" }
23 changes: 7 additions & 16 deletions tket2-exts/src/tket2_exts/data/tket2/bool.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"version": "0.1.0",
"name": "tket2.bool",
"runtime_reqs": [],
"types": {
"bool": {
"extension": "tket2.bool",
Expand All @@ -14,7 +13,6 @@
}
}
},
"values": {},
"operations": {
"and": {
"extension": "tket2.bool",
Expand Down Expand Up @@ -47,8 +45,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand All @@ -75,8 +72,7 @@
"s": "Unit",
"size": 2
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down Expand Up @@ -112,8 +108,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down Expand Up @@ -142,8 +137,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down Expand Up @@ -179,8 +173,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand All @@ -207,8 +200,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down Expand Up @@ -244,8 +236,7 @@
"args": [],
"bound": "C"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down
5 changes: 1 addition & 4 deletions tket2-exts/src/tket2_exts/data/tket2/debug.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"version": "0.1.0",
"name": "tket2.debug",
"runtime_reqs": [],
"types": {},
"values": {},
"operations": {
"StateResult": {
"extension": "tket2.debug",
Expand Down Expand Up @@ -67,8 +65,7 @@
],
"bound": "A"
}
],
"runtime_reqs": []
]
}
},
"binary": false
Expand Down
Loading
Loading