feat!: Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude #1475

ss2165 · 2024-08-27T16:07:02Z

Much of the noise is adding PRELUDE to extension inference tests. Add a convenience with_prelude() method to Signature.

Tag left as a core operation as it is paramaterized by a variable number of type rows.

Also drive-by get rid of custom signature use for print.

Closes #816
Closes #1373

BREAKING CHANGE: Move Lift, MakeTuple, UnpackTuple and Lift from core operations to prelude. Rename ops::leaf module to ops::sum.

codecov · 2024-08-27T16:22:06Z

Codecov Report

Attention: Patch coverage is 86.33257% with 60 lines in your changes missing coverage. Please review.

Project coverage is 87.88%. Comparing base (49a5bad) to head (caeffc5).
Report is 1 commits behind head on main.

Files	Patch %	Lines
hugr-core/src/extension/prelude.rs	88.37%	27 Missing and 8 partials ⚠️
hugr-core/src/builder/dataflow.rs	50.00%	0 Missing and 8 partials ⚠️
hugr-core/src/ops/sum.rs	73.91%	6 Missing ⚠️
hugr-core/src/hugr/serialize/test.rs	57.14%	0 Missing and 3 partials ⚠️
hugr-core/src/hugr/rewrite/consts.rs	60.00%	0 Missing and 2 partials ⚠️
hugr-core/src/hugr/validate/test.rs	88.88%	0 Missing and 2 partials ⚠️
hugr-core/src/builder/build_traits.rs	0.00%	0 Missing and 1 partial ⚠️
hugr-core/src/builder/tail_loop.rs	66.66%	0 Missing and 1 partial ⚠️
hugr-core/src/hugr/rewrite/simple_replace.rs	0.00%	0 Missing and 1 partial ⚠️
hugr-passes/src/const_fold.rs	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1475      +/-   ##
==========================================
+ Coverage   87.78%   87.88%   +0.10%     
==========================================
  Files         122      122              
  Lines       20847    20970     +123     
  Branches    18043    18200     +157     
==========================================
+ Hits        18300    18429     +129     
+ Misses       1769     1757      -12     
- Partials      778      784       +6

Flag	Coverage Δ
python	`92.41% <100.00%> (+0.40%)`	⬆️
rust	`87.19% <85.54%> (+0.06%)`	⬆️

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.

add `with_prelude` helper to function type

Closes #1373

remove from python - not needed

croyzor · 2024-08-28T08:17:25Z

hugr-core/src/hugr.rs

            },
        );
        add_inliftout(&mut h, p, ty.clone());
        assert!(h.validate_extensions().is_err());
        let backup = h.clone();
        let inf_res = h.infer_extensions(true);
        if success {
-            assert!(inf_res.is_ok());
+            assert!(dbg!(inf_res).is_ok());


I don't think this was left in on purpose

croyzor · 2024-08-28T08:45:53Z

hugr-core/src/extension/prelude.rs

+        let param = TypeParam::new_list(TypeBound::Any);
+        match self {
+            TupleOpDef::MakeTuple => {
+                PolyFuncTypeRV::new([param], FuncValueType::new(rv, tuple_type))


## 🤖 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 <[email protected]> Co-authored-by: Agustin Borgna <[email protected]>

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

ss2165 requested a review from croyzor August 27, 2024 16:07

ss2165 added 8 commits August 27, 2024 17:39

feat!: move MakeTuple to prelude from core

113ef29

feat!: move unpacktuple to prelude

d59e626

feat!: move noop to prelude

9ab5a9f

add `with_prelude` helper to function type

refactor: use row variables for panic op

b743ccf

Closes #1373

feat!: move lift to prelude

bae8c01

remove from python - not needed

refactor!: rename ops::leaf to ops::sum

46486ec

flatten leaf module and simplify some ops in to tuple structs

1f38fc7

update schema

e564dee

ss2165 force-pushed the ss/more-prelude branch from 6338e91 to e564dee Compare August 27, 2024 16:39

some more testing

b90bed8

croyzor reviewed Aug 28, 2024

View reviewed changes

remove dbg

8f3ac33

ss2165 requested a review from croyzor August 28, 2024 11:13

croyzor approved these changes Aug 28, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into ss/more-prelude

caeffc5

ss2165 enabled auto-merge August 28, 2024 14:29

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

Merged via the queue into main with commit b387505 Aug 28, 2024
21 checks passed

ss2165 deleted the ss/more-prelude branch August 28, 2024 14:36

This was referenced Aug 28, 2024

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

Merged

chore: release #1420

Closed

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

feat!: Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude #1475

feat!: Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude #1475

ss2165 commented Aug 27, 2024 •

edited

Loading

codecov bot commented Aug 27, 2024 •

edited

Loading

croyzor Aug 28, 2024

croyzor Aug 28, 2024

feat!: Move Lift, MakeTuple, UnpackTuple and Lift to prelude #1475

feat!: Move Lift, MakeTuple, UnpackTuple and Lift to prelude #1475

Conversation

ss2165 commented Aug 27, 2024 • edited Loading

codecov bot commented Aug 27, 2024 • edited Loading

Codecov Report

croyzor Aug 28, 2024

Choose a reason for hiding this comment

croyzor Aug 28, 2024

Choose a reason for hiding this comment

feat!: Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude #1475

feat!: Move `Lift`, `MakeTuple`, `UnpackTuple` and `Lift` to prelude #1475

ss2165 commented Aug 27, 2024 •

edited

Loading

codecov bot commented Aug 27, 2024 •

edited

Loading