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

Jump to bottom

fix: induced cycles in depth optimisation #264

Merged
merged 4 commits into from
Dec 15, 2023
Merged

fix: induced cycles in depth optimisation #264

merged 4 commits into from
Dec 15, 2023

Conversation

ss2165
Copy link
Member

@ss2165 ss2165 commented Dec 8, 2023 •
edited
Loading

Closes #253

@ss2165 ss2165 changed the title Fix induced cycles in depth optimisation fix: induced cycles in depth optimisation Dec 8, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 8, 2023 •
edited
Loading

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (35eab74) 83.72% compared to head (33188bc) 83.80%.

Files Patch % Lines
tket2/src/passes/commutation.rs 72.72% 1 Missing and 5 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #264      +/-   ##
==========================================
+ Coverage   83.72%   83.80%   +0.08%     
==========================================
  Files          35       35              
  Lines        4313     4353      +40     
  Branches     4197     4206       +9     
==========================================
+ Hits         3611     3648      +37     
+ Misses        517      516       -1     
- Partials      185      189       +4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ss2165 ss2165 force-pushed the fix/253 branch 3 times, most recently from 3d409e0 to 4f1496f Compare December 15, 2023 14:58
@ss2165 ss2165 marked this pull request as ready for review December 15, 2023 14:58
@ss2165
Copy link
Member Author

ss2165 commented Dec 15, 2023

Confirmed all circuits referenced in invalid.py succeed now

tket2/invalid.py

Lines 21 to 25 in 9ef975e

"fails/01e360c0-d669-11ea-8a28-38f9d36dfbf2-pre.json",
"fails/3b9bab70-d668-11ea-a4be-38f9d36dfbf2-pre.json",
"fails/3b6260d6-d668-11ea-a4be-38f9d36dfbf2-pre.json",
"fails/3d13dc5c-d668-11ea-a4be-38f9d36dfbf2-pre.json",
"fails/3d7242ec-d668-11ea-a4be-38f9d36dfbf2-pre.json",

@ss2165
add hypothesis test and smallest failing example
4fa22d2
@ss2165
refactor: cleanup code a bit
f462aba
@ss2165
move test to rust and appply fix
285a2c2 
prev_nodes shouldn't have command itself in it

probably a leftover of a historic approach
aborgna-q
aborgna-q approved these changes Dec 15, 2023
View reviewed changes
Copy link
Collaborator

@aborgna-q aborgna-q left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@ss2165 ss2165 added this pull request to the merge queue Dec 15, 2023
Merged via the queue into main with commit 68c9ff2 Dec 15, 2023
11 checks passed
@ss2165 ss2165 deleted the fix/253 branch December 15, 2023 16:41
@github-actions github-actions bot mentioned this pull request May 23, 2024
Merged
@hugrbot hugrbot mentioned this pull request May 24, 2024
Closed
github-merge-queue bot pushed a commit that referenced this pull request May 24, 2024
@github-actions @aborgna-q
chore(tket2): release v0.1.0-alpha.1 (#357)
9b7abff 
## 🤖 New release
* `tket2`: 0.1.0-alpha.1

<details><summary><i><b>Changelog</b></i></summary><p>

## `tket2`
<blockquote>

##
[0.0.0-alpha.1](https://github.com/CQCL/tket2/releases/tag/tket2-v0.0.0-alpha.1)
- 2024-05-24

### Bug Fixes
- Check for rewrite composition in badger
([#255](#255))
- induced cycles in depth optimisation
([#264](#264))
- Encode opaque symbolic constants
([#273](#273))
- Correctly detect custom ops by name
([#281](#281))
- Track input linear units in `Command`
([#310](#310))
- Don't convert tket2 measurements into tket1 ops
([#331](#331))

### Documentation
- Expand the main module and README docs
([#298](#298))

### New Features
- add angle type to tket2 extension
([#231](#231))
- bindings for circuit cost and hash
([#252](#252))
- Implement `PyErr` conversion locally in `tket2-py`
([#258](#258))
- Add a "progress timeout" to badger
([#259](#259))
- [**breaking**] Add lexicographic cost
([#270](#270))
- rewrite tracing ([#267](#267))
- Move pre/post rewrite cost to the RewriteStrategy API
([#276](#276))
- [**breaking**] Lexicographic cost fn
([#277](#277))
- Return rewrite strategies as a generator
([#275](#275))
- add qalloc, qfree, reset ops
([#284](#284))
- [**breaking**] Support any ops in portmatching
([#293](#293))
- Add `PatternMatch::nodes` and `subcircuit` + matching example
([#299](#299))
- Use `IncomingPort` and `OutgoingPort` instead of `Port` where
possible. ([#296](#296))
- expose Tk2Op name ([#307](#307))

### Refactor
- Move tket2 code to a workspace member
([#210](#210))
- Restructure the python code
([#211](#211))
- s/taso/badger/ ([#228](#228))
- Move python bindings from `tket2` to `tket2-py`
([#235](#235))
- rename t2op ([#256](#256))

### Testing
- Add small parallel badger test
([#237](#237))
- fix non-deterministic badger test
([#245](#245))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Agustin Borgna <agustin.borgna@quantinuum.com>
@hugrbot hugrbot mentioned this pull request Jun 26, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jun 28, 2024
@hugrbot @aborgna-q
chore(main): release tket2-py 0.1.0a1 (#435)
ea48d16 
🤖 I have created a release *beep* *boop*
---


## 0.1.0 (2024-06-28)


### ⚠ BREAKING CHANGES

* require `hugr-0.5.0`
* Replaced `tket2.circuit.OpConvertError` with
`tket2.circuit.TK1ConvertError` in the python lib.
* Moved `tket2::json` to `tket2::serialize::pytket`
* Replaced the `Circuit` trait with a wrapper struct.
* This is a breaking change to the compiled rewriter serialisation
format.

### Features

* Add a "progress timeout" to badger
([#259](#259))
([556cf64](556cf64))
* Add missing typing hints
([#352](#352))
([4990613](4990613))
* bindings for circuit cost and hash
([#252](#252))
([85ce5f9](85ce5f9))
* drop pyo3 core dep ([#355](#355))
([9f7d415](9f7d415))
* EccRewriter bindings
([#251](#251))
([97e2e0a](97e2e0a))
* guppy → pytket conversion
([#407](#407))
([8c5a487](8c5a487))
* Implement `PyErr` conversion locally in `tket2-py`
([#258](#258))
([3e1a68d](3e1a68d))
* init tket2-hseries ([#368](#368))
([61e7535](61e7535))
* pauli propagation use case example
([#333](#333))
([f46973c](f46973c))
* **py:** Allow using `Tk2Op`s in the builder
([#436](#436))
([aed8651](aed8651))
* Support any ops in portmatching
([#293](#293))
([6b05a05](6b05a05))
* **tket2-py:** Bind the `lower_to_pytket` pass in python
([#439](#439))
([8208324](8208324))
* Use tket1 and tket2 circuits interchangeably everywhere
([#243](#243))
([eac7acf](eac7acf))
* Utilities for loading compiled guppy circuits
([#393](#393))
([028779a](028779a))


### Bug Fixes

* failed importlib import
([#254](#254))
([b077660](b077660))
* induced cycles in depth optimisation
([#264](#264))
([68c9ff2](68c9ff2)),
closes [#253](#253)
* Make native py modules behave like python's
([#212](#212))
([4220038](4220038)),
closes [#209](#209)
* pytest failing to find `tket2` in CI
([#367](#367))
([a9df8e6](a9df8e6))
* **tket2-py:** Replace `with_hugr` helpers with `with_circ`, keeping
the circuit parent. ([#438](#438))
([b77b3cb](b77b3cb))


### Documentation

* Add some example notebooks for the python package.
([#443](#443))
([4ed276c](4ed276c)),
closes [#434](#434)
* Update tket2-py readme
([6c8f18a](6c8f18a))


### Code Refactoring

* Rename `tket2::json` into `tket2::serialize::pytket`
([#392](#392))
([93e611c](93e611c))
* Replace Circuit trait with a struct
([#370](#370))
([ec5dd22](ec5dd22))
* Simplify tket1 conversion errors
([#408](#408))
([b0b8aff](b0b8aff))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: Agustin Borgna <agustin.borgna@quantinuum.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aborgna-q aborgna-q aborgna-q approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

greedy_depth_reduce produces invalid circuits
2 participants
@ss2165 @aborgna-q