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

feat: Initial support for TailLoop as circuit parent #417

Merged
merged 3 commits into from
Jul 10, 2024
Merged

feat: Initial support for TailLoop as circuit parent #417

merged 3 commits into from
Jul 10, 2024

Conversation

doug-q
Copy link
Contributor

@doug-q doug-q commented Jun 18, 2024

No description provided.

@doug-q doug-q requested a review from aborgna-q June 18, 2024 08:31
doug-q
doug-q commented Jun 18, 2024
View reviewed changes
tket2/src/circuit.rs
@@ -583,6 +587,9 @@ fn update_signature(
let out_types = out_types.unwrap_or_else(|| case.signature.output().clone());
case.signature = FunctionType::new(inp_types, out_types)
}
OpType::TailLoop(_) => {
unimplemented!("TailLoop signature update")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

obviously this is not great, although I do think it's an improvement. To do better one needs to rewrite the type of the "control" sum in the tail loop.

@codecov Codecov
Copy link

codecov bot commented Jun 18, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.

Project coverage is 82.17%. Comparing base (030b4ff) to head (4ee090c).

Files Patch % Lines
tket2/src/circuit.rs 71.42% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #417      +/-   ##
==========================================
+ Coverage   81.87%   82.17%   +0.29%     
==========================================
  Files          60       60              
  Lines        5920     5923       +3     
  Branches     5399     5402       +3     
==========================================
+ Hits         4847     4867      +20     
+ Misses        817      800      -17     
  Partials      256      256
Flag Coverage Δ
python 96.73% <ø> (ø)
rust 80.76% <71.42%> (+0.32%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@aborgna-q
Copy link
Collaborator

The problem with tail loops at the moment is that "iterating commands/operations" is not clearly defined.
Currently the command iterator only runs on flat regions with no control flow, and just emits TailLoop/Conditional/CFG commands.

This is rather in the edge between the circuit abstraction and full-fledged HUGRs. We should probably delineate what should a Circuit be before merging this.

@doug-q
Copy link
Contributor Author

doug-q commented Jun 19, 2024

The problem with tail loops at the moment is that "iterating commands/operations" is not clearly defined. Currently the command iterator only runs on flat regions with no control flow, and just emits TailLoop/Conditional/CFG commands.

This is rather in the edge between the circuit abstraction and full-fledged HUGRs. We should probably delineate what should a Circuit be before merging this.

The problem with tail loops at the moment is that "iterating commands/operations" is not clearly defined. Currently the command iterator only runs on flat regions with no control flow, and just emits TailLoop/Conditional/CFG commands.

This is rather in the edge between the circuit abstraction and full-fledged HUGRs. We should probably delineate what should a Circuit be before merging this.

Agree. I would argue that a Circuit with a TailLoop as a parent IS a flat region with no control flow (assuming no control flow in it's children).

aborgna-q
aborgna-q approved these changes Jun 19, 2024
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.

I would argue that a Circuit with a TailLoop as a parent IS a flat region with no control flow (assuming no control flow in it's children).

Fair enough 👍

tket2/src/circuit.rs Outdated Show resolved Hide resolved
doug-q and others added 2 commits July 10, 2024 15:38
@doug-q
feat: Initial support for TailLoop as circuit parent
0d1d03d
@doug-q @aborgna-q
Update tket2/src/circuit.rs
4c04a96 
Co-authored-by: Agustín Borgna <121866228+aborgna-q@users.noreply.github.com>
@doug-q doug-q force-pushed the doug/circuit-tailloop-init branch from 27da8cd to 4c04a96 Compare July 10, 2024 14:38
@doug-q doug-q requested a review from a team as a code owner July 10, 2024 14:38
@doug-q doug-q requested review from lmondada and removed request for lmondada July 10, 2024 14:38
@doug-q doug-q added this pull request to the merge queue Jul 10, 2024
Merged via the queue into main with commit 5f6750b Jul 10, 2024
15 of 16 checks passed
@doug-q doug-q deleted the doug/circuit-tailloop-init branch July 10, 2024 14:56
@hugrbot hugrbot mentioned this pull request Jul 10, 2024
Closed
@hugrbot hugrbot mentioned this pull request Aug 1, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 1, 2024
@hugrbot @doug-q
chore: release (#519)
248591b 
## 🤖 New release
* `tket2`: 0.1.0-alpha.2 -> 0.1.0
* `tket2-hseries`: 0.1.0

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

## `tket2`
<blockquote>

##
[0.1.0](tket2-v0.1.0-alpha.2...tket2-v0.1.0)
- 2024-08-01

### Bug Fixes
- Single source of truth for circuit names, and better circuit errors
([#390](#390))
- Support non-DFG circuits
([#391](#391))
- Portmatching not matching const edges
([#444](#444))
- Pattern matcher discriminating on opaqueOp description
([#441](#441))
- `extract_dfg` inserting the output node with an invalid child order
([#442](#442))
- Recompile ecc sets after
[#441](#441)
([#484](#484))

### Documentation
- Update tket2-py readme
([#431](#431))
- Better error reporting in portmatching
([#437](#437))
- Improved multi-threading docs for Badger
([#495](#495))

### New Features
- `Circuit::operations` ([#395](#395))
- tuple unpack rewrite ([#406](#406))
- guppy → pytket conversion
([#407](#407))
- Drop linear bits, improve pytket encoding/decoding
([#420](#420))
- *(py)* Allow using `Tk2Op`s in the builder
([#436](#436))
- Initial support for `TailLoop` as circuit parent
([#417](#417))
- Support tuple unpacking with multiple unpacks
([#470](#470))
- Partial tuple unpack ([#475](#475))
- [**breaking**] Compress binary ECCs using zlib
([#498](#498))
- Add timeout options and stats to Badger
([#496](#496))
- Expose advanced Badger timeout options to tket2-py
([#506](#506))

### Refactor
- [**breaking**] Simplify tket1 conversion errors
([#408](#408))
- Cleanup tket1 serialized op structures
([#419](#419))

### Testing
- Add coverage for Badger split circuit multi-threading
([#505](#505))
</blockquote>

## `tket2-hseries`
<blockquote>

##
[0.1.0](https://github.com/CQCL/tket2/releases/tag/tket2-hseries-v0.1.0)
- 2024-08-01

### New Features
- [**breaking**] init tket2-hseries
([#368](#368))
- *(tket2-hseries)* Add `tket2.futures` Hugr extension
([#471](#471))
- Add lazify-measure pass
([#482](#482))
- add results extensions
([#494](#494))
- *(tket2-hseries)* [**breaking**] Add `HSeriesPass`
([#487](#487))
</blockquote>


</p></details>

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

---------

Co-authored-by: Douglas Wilson <douglas.wilson@quantinuum.com>
@hugrbot hugrbot mentioned this pull request Aug 5, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 15, 2024
@hugrbot @ss2165
chore: release (#521)
2a547c8 
## 🤖 New release
* `tket2`: 0.1.0 -> 0.1.1
* `tket2-hseries`: 0.1.0 -> 0.1.1

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

## `tket2`
<blockquote>

##
[0.1.0](tket2-v0.1.0-alpha.2...tket2-v0.1.0)
- 2024-08-01

### Bug Fixes
- Single source of truth for circuit names, and better circuit errors
([#390](#390))
- Support non-DFG circuits
([#391](#391))
- Portmatching not matching const edges
([#444](#444))
- Pattern matcher discriminating on opaqueOp description
([#441](#441))
- `extract_dfg` inserting the output node with an invalid child order
([#442](#442))
- Recompile ecc sets after
[#441](#441)
([#484](#484))

### Documentation
- Update tket2-py readme
([#431](#431))
- Better error reporting in portmatching
([#437](#437))
- Improved multi-threading docs for Badger
([#495](#495))

### New Features
- `Circuit::operations` ([#395](#395))
- tuple unpack rewrite ([#406](#406))
- guppy → pytket conversion
([#407](#407))
- Drop linear bits, improve pytket encoding/decoding
([#420](#420))
- *(py)* Allow using `Tk2Op`s in the builder
([#436](#436))
- Initial support for `TailLoop` as circuit parent
([#417](#417))
- Support tuple unpacking with multiple unpacks
([#470](#470))
- Partial tuple unpack ([#475](#475))
- [**breaking**] Compress binary ECCs using zlib
([#498](#498))
- Add timeout options and stats to Badger
([#496](#496))
- Expose advanced Badger timeout options to tket2-py
([#506](#506))

### Refactor
- [**breaking**] Simplify tket1 conversion errors
([#408](#408))
- Cleanup tket1 serialized op structures
([#419](#419))

### Testing
- Add coverage for Badger split circuit multi-threading
([#505](#505))
</blockquote>

## `tket2-hseries`
<blockquote>

##
[0.1.1](tket2-hseries-v0.1.0...tket2-hseries-v0.1.1)
- 2024-08-15

### New Features
- *(tket2-hseries)* make result operation internals public
([#542](#542))
</blockquote>


</p></details>

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

---------

Co-authored-by: Seyon Sivarajah <seyon.sivarajah@cambridgequantum.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.
2 participants
@doug-q @aborgna-q