refactor!: flatten `CustomOp` in to `OpType` #1429

ss2165 · 2024-08-14T14:27:23Z

In new workflow most of the time we just want to work with extension ops, and opaque are just used for serialisation. To that end flatten CustomOp out. If there are OpaqueOps in the HUGR it means the extension was not available to resolve in to. Will be disallowed in follow up PR.

Relates to #1362

BREAKING CHANGE: CustomOp removed, OpType now contains ExtensionOp and OpaqueOp directly. CustomOpError renamed toOpaqueOpError.

and CustomOpError -> OpaqueOpError

codecov · 2024-08-14T14:34:49Z

Codecov Report

Attention: Patch coverage is 83.33333% with 14 lines in your changes missing coverage. Please review.

Project coverage is 87.47%. Comparing base (b89c08f) to head (937dc5e).
Report is 3 commits behind head on main.

Files	Patch %	Lines
hugr-core/src/hugr/validate.rs	53.33%	3 Missing and 4 partials ⚠️
hugr-core/src/ops/custom.rs	73.33%	3 Missing and 1 partial ⚠️
hugr-core/src/extension.rs	0.00%	1 Missing ⚠️
hugr-core/src/extension/simple_op.rs	80.00%	0 Missing and 1 partial ⚠️
hugr-core/src/hugr/serialize/test.rs	93.33%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1429      +/-   ##
==========================================
- Coverage   87.58%   87.47%   -0.12%     
==========================================
  Files         119      119              
  Lines       20755    20676      -79     
  Branches    18045    17950      -95     
==========================================
- Hits        18179    18086      -93     
- Misses       1788     1804      +16     
+ Partials      788      786       -2

Flag	Coverage Δ
python	`90.27% <100.00%> (-0.24%)`	⬇️
rust	`87.04% <82.05%> (-0.11%)`	⬇️

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

Nice!

aborgna-q · 2024-08-14T15:30:26Z

hugr-core/src/hugr/validate.rs

@@ -567,36 +567,26 @@ impl<'a, 'b> ValidationContext<'a, 'b> {
        let op_type = self.hugr.get_optype(node);
        // The op_type must be defined only in terms of type variables defined outside the node
        // TODO consider turning this match into a trait method?


Can we drop the TODO?

## 🤖 New release * `hugr`: 0.11.0 -> 0.12.0 * `hugr-core`: 0.8.0 -> 0.9.0 * `hugr-passes`: 0.7.0 -> 0.8.0 * `hugr-cli`: 0.4.0 -> 0.5.0 <details><summary>Changelog</summary> ## `hugr` <blockquote> ## 0.12.0 (2024-08-30) ### Features - [**breaking**] Disallow opaque ops during validation ([#1431](#1431)) - [**breaking**] Add collections to serialized standard extensions ([#1452](#1452)) - [**breaking**] Variadic logic ops now binary ([#1451](#1451)) - [**breaking**] Int operations other than widen/narrow have only one width arg ([#1455](#1455)) - Add a `FuncTypeBase::io` method ([#1458](#1458)) - Add missing ops ([#1463](#1463)) - [**breaking**] Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude ([#1475](#1475)) - `Option` / `Result` helpers ([#1481](#1481)) - [**breaking**] Add more list operations ([#1474](#1474)) - [**breaking**] Move int conversions to `conversions` ext, add to/from usize ([#1490](#1490)) - Fill out array ops ([#1491](#1491)) ### Refactor - [**breaking**] Bring the collections ext in line with other extension defs ([#1469](#1469)) - [**breaking**] Make Either::Right the "success" case ([#1489](#1489)) - [**breaking**] Flatten `CustomOp` in to `OpType` ([#1429](#1429)) ### Testing - Add serialization benchmarks ([#1439](#1439)) </blockquote> ## `hugr-core` <blockquote> ## 0.9.0 (2024-08-30) ### Features - [**breaking**] Disallow opaque ops during validation ([#1431](#1431)) - [**breaking**] Add collections to serialized standard extensions ([#1452](#1452)) - [**breaking**] Variadic logic ops now binary ([#1451](#1451)) - [**breaking**] Int operations other than widen/narrow have only one width arg ([#1455](#1455)) - Add a `FuncTypeBase::io` method ([#1458](#1458)) - Add missing ops ([#1463](#1463)) - [**breaking**] Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude ([#1475](#1475)) - `Option` / `Result` helpers ([#1481](#1481)) - [**breaking**] Add more list operations ([#1474](#1474)) - [**breaking**] Move int conversions to `conversions` ext, add to/from usize ([#1490](#1490)) - Fill out array ops ([#1491](#1491)) ### Refactor - [**breaking**] Flatten `CustomOp` in to `OpType` ([#1429](#1429)) - [**breaking**] Bring the collections ext in line with other extension defs ([#1469](#1469)) - [**breaking**] Make Either::Right the "success" case ([#1489](#1489)) </blockquote> ## `hugr-passes` <blockquote> ## 0.8.0 (2024-08-30) ### Features - [**breaking**] Variadic logic ops now binary ([#1451](#1451)) - [**breaking**] Int operations other than widen/narrow have only one width arg ([#1455](#1455)) - [**breaking**] Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude ([#1475](#1475)) - [**breaking**] Add more list operations ([#1474](#1474)) - [**breaking**] Move int conversions to `conversions` ext, add to/from usize ([#1490](#1490)) ### Refactor - [**breaking**] Flatten `CustomOp` in to `OpType` ([#1429](#1429)) - [**breaking**] Bring the collections ext in line with other extension defs ([#1469](#1469)) - [**breaking**] Make Either::Right the "success" case ([#1489](#1489)) </blockquote> ## `hugr-cli` <blockquote> ## 0.5.0 (2024-08-30) ### Features - [**breaking**] Add collections to serialized standard extensions ([#1452](#1452)) </blockquote> </details> --- This PR was generated with [release-plz](https://github.com/MarcoIeni/release-plz/).

🤖 I have created a release *beep* *boop* --- ## [0.8.0](hugr-py-v0.7.0...hugr-py-v0.8.0) (2024-08-30) ### ⚠ BREAKING CHANGES * Moved `itobool`/`ifrombool`/`itostring_{u,s}` to the conversions extension. * Binary sums representing fallible values now use tag `1` for the successful variant * **hugr-py:** rename `Custom.name` to `Custom.op_name` and `Func(Defn/Decl).name` to `f_name` to allow for new `name` method * `ListOp::pop` now returns an option. * Moved all builder definitions into the `hugr.build` module. Moved `node_port` and `render` into the `hugr.hugr` module. * Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` from core operations to prelude. Rename `ops::leaf` module to `ops::sum`. * **hugr-py:** `hugr.serialization` module and `to_serial` methods are now internal only. * Renamed `_DfBase` to `DfBase` and `_DefinitionBuilder` to `DefinitionBuilder` * `idivmod_checked`, `idivmod`, `idiv`, `idiv_checked`, `imod`, `ishl`, `ishr`, `irotl`, `irotr` operations now only have one width argument for all inputs and outputs rather than two. * HUGRs containing opaque operations that don't point to an extension in the registry will fail to validate. Use `Package` to pack extensions with HUGRs for serialisation. * `CustomOp` removed, `OpType` now contains `ExtensionOp` and `OpaqueOp` directly. `CustomOpError` renamed to`OpaqueOpError`. ### Features * `Option` / `Result` helpers ([#1481](#1481)) ([9698420](9698420)) * Add missing ops ([#1463](#1463)) ([841f450](841f450)) * Add more list operations ([#1474](#1474)) ([037005f](037005f)) * Bring in the pure-python renderer from guppy ([#1462](#1462)) ([001e66a](001e66a)) * disallow opaque ops during validation ([#1431](#1431)) ([fbbb805](fbbb805)) * fill out array ops ([#1491](#1491)) ([26ec57a](26ec57a)) * **hugr-py:** pretty printing for ops and types ([#1482](#1482)) ([aca403a](aca403a)) * **hugr-py:** use serialized extensions in python ([#1459](#1459)) ([a61f4df](a61f4df)), closes [#1450](#1450) * int operations other than widen/narrow have only one width arg ([#1455](#1455)) ([c39ed15](c39ed15)) * Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude ([#1475](#1475)) ([b387505](b387505)) * Move int conversions to `conversions` ext, add to/from usize ([#1490](#1490)) ([88913f2](88913f2)) ### Bug Fixes * **hugr-py:** record node children correctly when deserializing ([#1480](#1480)) ([331125a](331125a)), closes [#1479](#1479) * **py:** Invalid node indexing ([#1457](#1457)) ([d6edcd7](d6edcd7)) * schema for array inner types ([#1494](#1494)) ([d43cbb2](d43cbb2)), closes [#1471](#1471) * Sum value equality. Add unit tests ([#1484](#1484)) ([a7b2718](a7b2718)) ### Code Refactoring * flatten `CustomOp` in to `OpType` ([#1429](#1429)) ([8e8bba5](8e8bba5)) * **hugr-py:** make serialization (module/methods) private ([#1477](#1477)) ([49a5bad](49a5bad)) * Make `_DfBase` and `_DefinitionBuilder` public ([#1461](#1461)) ([ea9cca0](ea9cca0)) * Make Either::Right the "success" case ([#1489](#1489)) ([8caa572](8caa572)) * Organise the hugr-py modules ([#1460](#1460)) ([3ca56f4](3ca56f4)) --- 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: Agustín Borgna <121866228+aborgna-q@users.noreply.github.com> Co-authored-by: Agustin Borgna <agustin.borgna@quantinuum.com>

ss2165 added 2 commits August 14, 2024 15:17

refactor(rust)!: flatten CustomOp in to OpType

71cc2e2

refactor!: rename CustomOp -> ExtensionOp

b3ea2ac

and CustomOpError -> OpaqueOpError

ss2165 requested a review from a team as a code owner August 14, 2024 14:27

ss2165 requested a review from aborgna-q August 14, 2024 14:27

fix: typo in comment

bf4a2eb

ss2165 force-pushed the ss/no-opaque branch from 704a9f8 to bf4a2eb Compare August 14, 2024 14:30

fixup test json

de59484

aborgna-q approved these changes Aug 14, 2024

View reviewed changes

ss2165 added 2 commits August 14, 2024 17:18

update serialization schema

01c2336

remove TODO

937dc5e

ss2165 enabled auto-merge August 14, 2024 16:21

ss2165 added this pull request to the merge queue Aug 14, 2024

Merged via the queue into main with commit 8e8bba5 Aug 14, 2024
20 checks passed

ss2165 deleted the ss/no-opaque branch August 14, 2024 16:25

This was referenced Aug 14, 2024

chore(main): release hugr-py 0.8.0 #1430

Merged

chore: release #1420

Closed

This was referenced Aug 30, 2024

chore: release #1492

Closed

chore: release #1495

Merged

hugrbot mentioned this pull request Sep 3, 2024

chore: release #1504

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor!: flatten `CustomOp` in to `OpType` #1429

refactor!: flatten `CustomOp` in to `OpType` #1429

ss2165 commented Aug 14, 2024 •

edited

Loading

codecov bot commented Aug 14, 2024 •

edited

Loading

aborgna-q left a comment

aborgna-q Aug 14, 2024

refactor!: flatten CustomOp in to OpType #1429

refactor!: flatten CustomOp in to OpType #1429

Conversation

ss2165 commented Aug 14, 2024 • edited Loading

codecov bot commented Aug 14, 2024 • edited Loading

Codecov Report

aborgna-q left a comment

Choose a reason for hiding this comment

aborgna-q Aug 14, 2024

Choose a reason for hiding this comment

refactor!: flatten `CustomOp` in to `OpType` #1429

refactor!: flatten `CustomOp` in to `OpType` #1429

ss2165 commented Aug 14, 2024 •

edited

Loading

codecov bot commented Aug 14, 2024 •

edited

Loading