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.

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

fix: Insert DFG directly as a funcdefn in Package::from_hugr #1621

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

aborgna-q
Copy link
Collaborator

Closes #1620

@aborgna-q aborgna-q requested a review from a team as a code owner October 31, 2024 10:21
@aborgna-q aborgna-q requested a review from zrho October 31, 2024 10:21
@aborgna-q aborgna-q changed the title Insert DFG directly as a funcdefn in Package::from_hugr fix: Insert DFG directly as a funcdefn in Package::from_hugr Oct 31, 2024
Copy link

codecov bot commented Oct 31, 2024

Codecov Report

Attention: Patch coverage is 95.83333% with 1 line in your changes missing coverage. Please review.

Project coverage is 85.64%. Comparing base (e4a7965) to head (975ac80).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
hugr-core/src/package.rs 95.83% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1621   +/-   ##
=======================================
  Coverage   85.63%   85.64%           
=======================================
  Files         136      136           
  Lines       24950    24973   +23     
  Branches    21876    21899   +23     
=======================================
+ Hits        21366    21388   +22     
  Misses       2476     2476           
- Partials     1108     1109    +1     
Flag Coverage Δ
python 92.45% <ø> (ø)
rust 84.68% <95.83%> (+0.01%) ⬆️

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 aborgna-q added this pull request to the merge queue Nov 5, 2024
Merged via the queue into main with commit c987d2f Nov 5, 2024
22 of 23 checks passed
@aborgna-q aborgna-q deleted the ab/package-from-hugr branch November 5, 2024 11:01
@hugrbot hugrbot mentioned this pull request Oct 31, 2024
github-merge-queue bot pushed a commit that referenced this pull request Nov 6, 2024
## 🤖 New release
* `hugr`: 0.13.2 -> 0.13.3 (✓ API compatible changes)
* `hugr-core`: 0.13.2 -> 0.13.3 (✓ API compatible changes)
* `hugr-model`: 0.13.2 -> 0.14.0 (⚠️ API breaking changes)
* `hugr-passes`: 0.13.2 -> 0.13.3
* `hugr-cli`: 0.13.2 -> 0.13.3

### ⚠️ `hugr-model` breaking changes

```
--- failure enum_variant_added: enum variant added on exhaustive enum ---

Description:
A publicly-visible enum without #[non_exhaustive] has a new variant.
        ref: https://doc.rust-lang.org/cargo/reference/semver.html#enum-variant-new
       impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.36.0/src/lints/enum_variant_added.ron

Failed in:
  variant RegionKind:Module in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:390
  variant Operation:DeclareConstructor in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:349
  variant Operation:DeclareOperation in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:357
```

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

## `hugr`
<blockquote>

##
[0.13.3](hugr-v0.13.2...hugr-v0.13.3)
- 2024-11-06

### Bug Fixes

- Insert DFG directly as a funcdefn in `Package::from_hugr`
([#1621](#1621))

### New Features

- `HugrMut::remove_metadata`
([#1619](#1619))
- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
- Add TailLoop::BREAK_TAG and CONTINUE_TAG
([#1626](#1626))
</blockquote>

## `hugr-core`
<blockquote>

##
[0.13.3](hugr-core-v0.13.2...hugr-core-v0.13.3)
- 2024-11-06

### Bug Fixes

- Insert DFG directly as a funcdefn in `Package::from_hugr`
([#1621](#1621))

### New Features

- `HugrMut::remove_metadata`
([#1619](#1619))
- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
- Add TailLoop::BREAK_TAG and CONTINUE_TAG
([#1626](#1626))
</blockquote>

## `hugr-model`
<blockquote>

##
[0.14.0](hugr-model-v0.13.2...hugr-model-v0.14.0)
- 2024-11-06

### New Features

- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
</blockquote>

## `hugr-passes`
<blockquote>

##
[0.13.2](hugr-passes-v0.13.1...hugr-passes-v0.13.2)
- 2024-10-22

### New Features

- make errors more readable with Display impls
([#1597](#1597))
</blockquote>

## `hugr-cli`
<blockquote>

##
[0.13.2](hugr-cli-v0.13.1...hugr-cli-v0.13.2)
- 2024-10-22

### New Features

- Add `Package` definition on `hugr-core`
([#1587](#1587))
- Ensure packages always have modules at the root
([#1589](#1589))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).
github-merge-queue bot pushed a commit to CQCL/tket2 that referenced this pull request Nov 7, 2024
Removes the guppy-specific and adds supports for loading functions
packages and standalone hugrs.

Temporarily keeps track of the required extensions for the hugr in an
optional `Circuit::required_extensions` field until
CQCL/hugr#1613 gets implemented. Fallbacks to
a default set when loading bare hugrs.

Note that storing a circuit with a non-root parent is currently an
error. We'll need to store some pointer to the entrypoint on the hugr's
metadata, and that'll require some serialization-stable path encoding.
I'll open an issue for that .

blocked-by: CQCL/hugr#1621. I'll remove the
patch in cargo.toml once that gets released.

drive-by: Use `circuit_hash` for the `PartialEq` implementation of
circuits. The derived equality failed on graphs with different node
indices.

BREAKING CHANGE: Removed `load_guppy_*` methods. Use
`Circuit::load_function_reader` instead.
@hugrbot hugrbot mentioned this pull request Nov 8, 2024
ss2165 pushed a commit that referenced this pull request Nov 22, 2024
## 🤖 New release
* `hugr`: 0.13.2 -> 0.13.3 (✓ API compatible changes)
* `hugr-core`: 0.13.2 -> 0.13.3 (✓ API compatible changes)
* `hugr-model`: 0.13.2 -> 0.14.0 (⚠️ API breaking changes)
* `hugr-passes`: 0.13.2 -> 0.13.3
* `hugr-cli`: 0.13.2 -> 0.13.3

### ⚠️ `hugr-model` breaking changes

```
--- failure enum_variant_added: enum variant added on exhaustive enum ---

Description:
A publicly-visible enum without #[non_exhaustive] has a new variant.
        ref: https://doc.rust-lang.org/cargo/reference/semver.html#enum-variant-new
       impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.36.0/src/lints/enum_variant_added.ron

Failed in:
  variant RegionKind:Module in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:390
  variant Operation:DeclareConstructor in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:349
  variant Operation:DeclareOperation in /tmp/.tmpL1Ich1/hugr/hugr-model/src/v0/mod.rs:357
```

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

## `hugr`
<blockquote>

##
[0.13.3](hugr-v0.13.2...hugr-v0.13.3)
- 2024-11-06

### Bug Fixes

- Insert DFG directly as a funcdefn in `Package::from_hugr`
([#1621](#1621))

### New Features

- `HugrMut::remove_metadata`
([#1619](#1619))
- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
- Add TailLoop::BREAK_TAG and CONTINUE_TAG
([#1626](#1626))
</blockquote>

## `hugr-core`
<blockquote>

##
[0.13.3](hugr-core-v0.13.2...hugr-core-v0.13.3)
- 2024-11-06

### Bug Fixes

- Insert DFG directly as a funcdefn in `Package::from_hugr`
([#1621](#1621))

### New Features

- `HugrMut::remove_metadata`
([#1619](#1619))
- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
- Add TailLoop::BREAK_TAG and CONTINUE_TAG
([#1626](#1626))
</blockquote>

## `hugr-model`
<blockquote>

##
[0.14.0](hugr-model-v0.13.2...hugr-model-v0.14.0)
- 2024-11-06

### New Features

- Operation and constructor declarations in `hugr-model`
([#1605](#1605))
</blockquote>

## `hugr-passes`
<blockquote>

##
[0.13.2](hugr-passes-v0.13.1...hugr-passes-v0.13.2)
- 2024-10-22

### New Features

- make errors more readable with Display impls
([#1597](#1597))
</blockquote>

## `hugr-cli`
<blockquote>

##
[0.13.2](hugr-cli-v0.13.1...hugr-cli-v0.13.2)
- 2024-10-22

### New Features

- Add `Package` definition on `hugr-core`
([#1587](#1587))
- Ensure packages always have modules at the root
([#1589](#1589))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package::from_hugr shouldn't wrap twice
2 participants