feat: add results extensions #494

ss2165 · 2024-07-17T14:33:45Z

Closes #452

Closes #452 I'm not very pleased with this, but it does the job and all the "better" things I thought of didn't seem worth the extra code. Very open to suggestions.

codecov · 2024-07-17T15:44:03Z

Codecov Report

Attention: Patch coverage is 90.18868% with 26 lines in your changes missing coverage. Please review.

Project coverage is 81.53%. Comparing base (d247ffe) to head (a9ecaeb).
Report is 1 commits behind head on main.

Files	Patch %	Lines
tket2-hseries/src/extension/result.rs	90.18%	17 Missing and 9 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #494      +/-   ##
==========================================
- Coverage   82.50%   81.53%   -0.97%     
==========================================
  Files          63       47      -16     
  Lines        6299     6040     -259     
  Branches     5778     6040     +262     
==========================================
- Hits         5197     4925     -272     
- Misses        834      837       +3     
- Partials      268      278      +10

Flag	Coverage Δ
python	`?`
rust	`81.53% <90.18%> (+0.31%)`	⬆️

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.

doug-q

I've not looked carefully beyond the shape of the types, I agree they are not great but I don't have concrete(lol) ideas for improvement.

What happens when you merge BasicResultOp and ArrayResultOp into a single enum (say ResultOp, and then make struct ConcreteResultOp{ tag: string, def: ResultOp, typ: Type }.

doug-q · 2024-07-18T06:23:50Z

tket2-hseries/src/extension/result.rs

+lazy_static! {
+    /// The "tket2.result" extension.
+    pub static ref EXTENSION: Extension = {
+        let mut ext = Extension::new(EXTENSION_ID);


you should use new_with_reqs

doug-q · 2024-07-18T06:28:03Z

tket2-hseries/src/extension/result.rs

+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Hash, PartialEq, Eq)]
+enum ResultOpDef {


I don't like OpDef in the name here. OpDef is an op before type args are applied, but this is used to capture the array length arg.

tket2-hseries/src/extension/result.rs

ss2165 · 2024-07-18T12:45:44Z

Thanks for your ideas @doug-q, I've implemented many of them. But I kept the single concrete op.

doug-q

Nice.

I think you can construct your types more simply as noted inline.

You should probably implement MakeOpDef::description

tket2-hseries/src/extension/result.rs

doug-q · 2024-07-19T08:37:00Z

tket2-hseries/src/extension/result.rs

+}
+
+fn int_tv(int_tv_idx: usize) -> Type {
+    INT_EXTENSION


you can use int_types::int_type(TypeArg::new_var_use(int_tv_idx, LOG_WIDTH_TYPE_PARAM)) here I think

doug-q · 2024-07-19T08:38:28Z

tket2-hseries/src/extension/result.rs

+}
+
+fn array_type(inner_t: Type) -> Type {
+    let size_var = TypeArg::new_var_use(1, TypeParam::max_nat());


You can use prelude::array_type(TypeArg::new_var_use(1, TypeParam::max_nat(), inner_t) here.

## 🤖 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 <[email protected]>

Fixes #369 and fixes #365. Make Guppy conform with the latest results spec introduced in CQCL/tket2#494 BREAKING CHANGE: * Result tags are now strings instead of ints * Only numeric values and arrays thereof are allowed as results

ss2165 added 2 commits July 16, 2024 15:47

drive-by: fix typo

67d4bad

feat: add results extensions

f826109

Closes #452 I'm not very pleased with this, but it does the job and all the "better" things I thought of didn't seem worth the extra code. Very open to suggestions.

ss2165 requested a review from a team as a code owner July 17, 2024 14:33

ss2165 requested review from aborgna-q and doug-q and removed request for aborgna-q July 17, 2024 14:33

test more conversion

f35caab

doug-q reviewed Jul 18, 2024

View reviewed changes

ss2165 added 2 commits July 18, 2024 13:25

combine opdef in to one enum

62141f7

use new_with_reqs

38c4619

ss2165 requested a review from doug-q July 18, 2024 12:45

doug-q reviewed Jul 19, 2024

View reviewed changes

ss2165 added 2 commits July 19, 2024 10:02

use existing typer construction utilities

f835d8d

add descriptions

a9ecaeb

ss2165 requested a review from doug-q July 19, 2024 09:29

doug-q approved these changes Jul 19, 2024

View reviewed changes

ss2165 added this pull request to the merge queue Jul 19, 2024

Merged via the queue into main with commit 034ab9c Jul 19, 2024
17 checks passed

ss2165 deleted the ss/results branch July 19, 2024 09:34

hugrbot mentioned this pull request Jul 18, 2024

chore: release #409

Closed

hugrbot mentioned this pull request Aug 1, 2024

chore: release #519

Merged

hugrbot mentioned this pull request Aug 1, 2024

chore: release #521

Merged

qartik mentioned this pull request Aug 7, 2024

result extension not exposed as ExtensionOp #529

Closed

This was referenced Aug 9, 2024

Use latest results extension spec CQCL/guppylang#369

Closed

result feature doesn't seem to generate correct HUGR for classical programs CQCL/guppylang#365

Closed

fix!: Use latest results extension spec CQCL/guppylang#370

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add results extensions #494

feat: add results extensions #494

ss2165 commented Jul 17, 2024 •

edited

Loading

codecov bot commented Jul 17, 2024 •

edited

Loading

doug-q left a comment

doug-q Jul 18, 2024

doug-q Jul 18, 2024

ss2165 commented Jul 18, 2024

doug-q left a comment

doug-q Jul 19, 2024

doug-q Jul 19, 2024

feat: add results extensions #494

feat: add results extensions #494

Conversation

ss2165 commented Jul 17, 2024 • edited Loading

codecov bot commented Jul 17, 2024 • edited Loading

Codecov Report

doug-q left a comment

Choose a reason for hiding this comment

doug-q Jul 18, 2024

Choose a reason for hiding this comment

doug-q Jul 18, 2024

Choose a reason for hiding this comment

ss2165 commented Jul 18, 2024

doug-q left a comment

Choose a reason for hiding this comment

doug-q Jul 19, 2024

Choose a reason for hiding this comment

doug-q Jul 19, 2024

Choose a reason for hiding this comment

ss2165 commented Jul 17, 2024 •

edited

Loading

codecov bot commented Jul 17, 2024 •

edited

Loading