Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: Update to next version of hugr #720

Merged
merged 11 commits into from
Dec 16, 2024
Merged

chore!: Update to next version of hugr #720

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3767ce
chore!: Update to next version of hugr
doug-q Dec 12, 2024
74f606e
fmt
doug-q Dec 12, 2024
b3cc483
allow unused
doug-q Dec 12, 2024
3c82a26
Update to hugr 0.14 pre-release
aborgna-q Dec 16, 2024
2495502
Update ecc sets
aborgna-q Dec 16, 2024
244a359
Update hugr rs and py to latest release
aborgna-q Dec 16, 2024
e46c325
Merge remote-tracking branch 'origin/main' into doug/hugr-next
aborgna-q Dec 16, 2024
eb7cc63
Fix `todo!`s
aborgna-q Dec 16, 2024
72c04af
fix doclink
aborgna-q Dec 16, 2024
347e449
review comments
aborgna-q Dec 16, 2024
ca105a8
s//////////g
aborgna-q Dec 16, 2024
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
290 changes: 241 additions & 49 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,18 @@ missing_docs = "warn"
[patch.crates-io]

# Uncomment to use unreleased versions of hugr
hugr-core = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
hugr = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
hugr-cli = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
#hugr = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
#hugr-core = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
#hugr-passes = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
#hugr-cli = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
#hugr-model = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }

[workspace.dependencies]

# Make sure to run `just recompile-eccs` if the hugr serialisation format changes.
hugr = "0.13.3"
hugr-core = "0.13.3"
hugr-cli = "0.13.3"
hugr = "0.14.0"
hugr-core = "0.14.0"
hugr-cli = "0.14.0"
portgraph = "0.12"
pyo3 = "0.23.3"
itertools = "0.13.0"
Expand Down
59 changes: 31 additions & 28 deletions devenv.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"lastModified": 1733328505,
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
Expand All @@ -51,10 +51,32 @@
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1733665616,
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"pre-commit-hooks",
"git-hooks",
"nixpkgs"
]
},
Expand Down Expand Up @@ -103,10 +125,10 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1728328465,
"lastModified": 1733730953,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
"rev": "7109b680d161993918b0a126f38bc39763e5a709",
"type": "github"
},
"original": {
Expand All @@ -116,35 +138,16 @@
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1728092656,
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"fenix": "fenix",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs",
"nixpkgs-2305": "nixpkgs-2305",
"pre-commit-hooks": "pre-commit-hooks"
"pre-commit-hooks": [
"git-hooks"
]
}
},
"rust-analyzer-src": {
Expand Down
Binary file modified test_files/eccs/nam_4_2.rwr
View file
Open in desktop
Binary file not shown.
Binary file modified test_files/eccs/nam_6_3.rwr
View file
Open in desktop
Binary file not shown.
Binary file modified test_files/eccs/small_eccs.rwr
View file
Open in desktop
Binary file not shown.
Binary file modified tket2-eccs/src/tket2_eccs/data/nam_6_3.rwr
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions tket2-exts/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ classifiers = [
"Topic :: Scientific/Engineering",
]

dependencies = [
"hugr>=0.9.0",
]
dependencies = ['hugr >= 0.10.0, < 0.11']

[project.urls]
homepage = "https://github.com/CQCL/tket2/tree/main/tket2-exts"
Expand Down
8 changes: 4 additions & 4 deletions tket2-exts/src/tket2_exts/data/tket2/futures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "0.1.0",
"name": "tket2.futures",
"extension_reqs": [],
"runtime_reqs": [],
"types": {
"Future": {
"extension": "tket2.futures",
Expand Down Expand Up @@ -85,7 +85,7 @@
"bound": "A"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -121,7 +121,7 @@
}
],
"output": [],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -163,7 +163,7 @@
"b": "A"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down
22 changes: 11 additions & 11 deletions tket2-exts/src/tket2_exts/data/tket2/qsystem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "0.2.0",
"name": "tket2.qsystem",
"extension_reqs": [
"runtime_reqs": [
"arithmetic.float.types",
"prelude",
"tket2.futures"
Expand Down Expand Up @@ -42,7 +42,7 @@
"bound": "A"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand All @@ -66,7 +66,7 @@
"size": 2
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand All @@ -93,7 +93,7 @@
"size": 2
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -129,7 +129,7 @@
"t": "Q"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand All @@ -147,7 +147,7 @@
}
],
"output": [],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand All @@ -169,7 +169,7 @@
"t": "Q"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -198,7 +198,7 @@
"t": "Q"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand All @@ -225,7 +225,7 @@
]
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -253,7 +253,7 @@
"t": "Q"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down Expand Up @@ -288,7 +288,7 @@
"t": "Q"
}
],
"extension_reqs": []
"runtime_reqs": []
}
},
"binary": false
Expand Down
Loading
Loading