feat: tuple unpack rewrite #406

aborgna-q · 2024-06-12T11:14:36Z

Adds a pass for removing tuple packs immediately followed by tuple unpacks.

Currently this only removes one-to-one connections.
The code should work for one-to-many, but there's a bug in hugr's SimpleRewrite that prevents us from having replacements where multiple outputs are connected to a single input.
See CQCL/hugr#1190.

Closes #380

aborgna-q · 2024-06-17T14:49:50Z

tket2/src/passes/tuple_unpack.rs

+    // TODO: SimpleReplacement currently fails when replacements have multiports.
+    // We only support matching a single unpack for now.
+    if unpack_nodes.len() > 1 {
+        return None;
+    }


We can remove this once CQCL/hugr#1191 gets released.

Add reference to hugr issue in comment?

codecov · 2024-06-17T14:51:23Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.00%. Comparing base (39057d2) to head (47fe506).

Additional details and impacted files

@@             Coverage Diff             @@
##             main     #406       +/-   ##
===========================================
+ Coverage   80.77%   96.00%   +15.23%     
===========================================
  Files          54       15       -39     
  Lines        5280      476     -4804     
  Branches     4804        0     -4804     
===========================================
- Hits         4265      457     -3808     
+ Misses        811       19      -792     
+ Partials      204        0      -204

Flag	Coverage Δ
python	`96.00% <ø> (ø)`
rust	`?`

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.

cqc-alec

Looks good!

cqc-alec · 2024-06-17T14:53:45Z

tket2/src/passes/tuple_unpack.rs

+    // TODO: SimpleReplacement currently fails when replacements have multiports.
+    // We only support matching a single unpack for now.
+    if unpack_nodes.len() > 1 {
+        return None;
+    }


Add reference to hugr issue in comment?

cqc-alec · 2024-06-17T15:01:31Z

tket2/src/passes/tuple_unpack.rs

+            unpack_nodes,
+        )),
+        false => {
+            // TODO: Add a rewrite to remove some of the unpack operations.


Should we capture this in an issue?

Adds support for converting **flat** **pure** functions defined in guppy into pytket circuits. See the example in `test_guppy.py`. This PR just adds a `lower_to_pytket` pass that currently only runs the tuple erasure from #406.

## 🤖 New release * `tket2`: 0.1.0-alpha.2 -> 0.1.0 * `tket2-hseries`: 0.1.0 <details><summary>Changelog</summary> ## `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> </details> --- This PR was generated with [release-plz](https://github.com/MarcoIeni/release-plz/). --------- Co-authored-by: Douglas Wilson <douglas.wilson@quantinuum.com>

## 🤖 New release * `tket2`: 0.1.0 -> 0.1.1 * `tket2-hseries`: 0.1.0 -> 0.1.1 <details><summary>Changelog</summary> ## `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> </details> --- This PR was generated with [release-plz](https://github.com/MarcoIeni/release-plz/). --------- Co-authored-by: Seyon Sivarajah <seyon.sivarajah@cambridgequantum.com>

aborgna-q force-pushed the ab/tuple-rewrite branch from dd5f32e to 99fab1b Compare June 17, 2024 12:26

aborgna-q force-pushed the ab/funcdefn-circuits branch from 1823489 to 741e264 Compare June 17, 2024 12:26

aborgna-q force-pushed the ab/tuple-rewrite branch from 99fab1b to b0a5dfd Compare June 17, 2024 12:51

Base automatically changed from ab/funcdefn-circuits to main June 17, 2024 14:45

aborgna-q mentioned this pull request Jun 17, 2024

feat: guppy → pytket conversion #407

Merged

feat: tuple unpack rewrite

75dba2f

aborgna-q force-pushed the ab/tuple-rewrite branch from b0a5dfd to 75dba2f Compare June 17, 2024 14:46

aborgna-q requested a review from cqc-alec June 17, 2024 14:46

aborgna-q commented Jun 17, 2024

View reviewed changes

cqc-alec approved these changes Jun 17, 2024

View reviewed changes

Link bugfix PR in TODO comment

47fe506

aborgna-q enabled auto-merge June 17, 2024 15:10

aborgna-q added this pull request to the merge queue Jun 17, 2024

Merged via the queue into main with commit 425d6b4 Jun 17, 2024
16 checks passed

aborgna-q deleted the ab/tuple-rewrite branch June 17, 2024 15:14

aborgna-q mentioned this pull request Jun 17, 2024

Partial tuple pack-unpack rewrite. #416

Closed

hugrbot mentioned this pull request Jun 17, 2024

chore: release #409

Closed

hugrbot mentioned this pull request Aug 1, 2024

chore: release #519

Merged

hugrbot mentioned this pull request Aug 5, 2024

chore: release #521

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: tuple unpack rewrite #406

feat: tuple unpack rewrite #406

aborgna-q commented Jun 12, 2024 •

edited

Loading

aborgna-q Jun 17, 2024

cqc-alec Jun 17, 2024

codecov bot commented Jun 17, 2024 •

edited

Loading

cqc-alec left a comment

cqc-alec Jun 17, 2024

cqc-alec Jun 17, 2024

aborgna-q Jun 17, 2024

feat: tuple unpack rewrite #406

feat: tuple unpack rewrite #406

Conversation

aborgna-q commented Jun 12, 2024 • edited Loading

aborgna-q Jun 17, 2024

Choose a reason for hiding this comment

cqc-alec Jun 17, 2024

Choose a reason for hiding this comment

codecov bot commented Jun 17, 2024 • edited Loading

Codecov Report

cqc-alec left a comment

Choose a reason for hiding this comment

cqc-alec Jun 17, 2024

Choose a reason for hiding this comment

cqc-alec Jun 17, 2024

Choose a reason for hiding this comment

aborgna-q Jun 17, 2024

Choose a reason for hiding this comment

aborgna-q commented Jun 12, 2024 •

edited

Loading

codecov bot commented Jun 17, 2024 •

edited

Loading