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

feat!: Update rust hugr dependency to 0.12.0, and python hugr to 0.8.0 #568

Merged
merged 5 commits into from
Sep 2, 2024

Conversation

aborgna-q
Copy link
Collaborator

The main change is the drop of CustomOps, requiring opaque ops to always be resolved.

This is a bit of a problem with the current code, as we used OpaqueOps not backed by a definition to declare operations from python.
For the moment, we leave PyExtensionOp unimplemented and disable the pauli prop tests that depended on it.

tket2/tket2-py/src/ops.rs

Lines 247 to 251 in 473c9f5

// FIXME: Broken during the update to hugr 0.12
// Operations must now always be backed by an opDef, so the old way
// of creating `PyOpaqueOp`s on the fly is no longer possible.
unimplemented!("Python Extension Ops need an operation definition")
//let opdef = todo!();

# TODO: This broke with the update to hugr 0.8.0.
# Custom ops in hugrs must be resolved into `ExtOp`s before they can be used.
# In this case, we need to define an extension for PauliOps, and make sure the
# `Rule`s use them, otherwise `RuleMatcher` will complain about finding opaque ops.
return RuleMatcher([*merge_rules, *propagate_rules, *measure_rules])

I'll raise an issue to get them fixed them.

BREAKING CHANGE: Updated to latest hugr version (hugr-rs 0.12 / hugr-py 0.8). ECCs need to be recompiled.

@aborgna-q aborgna-q requested a review from a team as a code owner September 2, 2024 13:44
@aborgna-q aborgna-q removed the request for review from ss2165 September 2, 2024 13:45
@aborgna-q aborgna-q marked this pull request as draft September 2, 2024 13:46
@aborgna-q aborgna-q marked this pull request as ready for review September 2, 2024 13:46
Copy link

codecov bot commented Sep 2, 2024

Codecov Report

Attention: Patch coverage is 64.61538% with 23 lines in your changes missing coverage. Please review.

Project coverage is 83.01%. Comparing base (7c83ba8) to head (3094ad2).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
tket2/src/circuit/hash.rs 0.00% 6 Missing and 1 partial ⚠️
tket2/src/serialize/pytket/op/serialised.rs 40.00% 5 Missing and 1 partial ⚠️
tket2/src/portmatching/matcher.rs 40.00% 0 Missing and 3 partials ⚠️
tket2/src/ops.rs 75.00% 2 Missing ⚠️
tket2/src/rewrite/ecc_rewriter.rs 75.00% 0 Missing and 2 partials ⚠️
tket2-hseries/src/extension/futures.rs 50.00% 1 Missing ⚠️
tket2-hseries/src/extension/result.rs 80.00% 1 Missing ⚠️
tket2/src/serialize/pytket/op.rs 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #568      +/-   ##
==========================================
- Coverage   83.09%   83.01%   -0.08%     
==========================================
  Files          45       45              
  Lines        6206     6213       +7     
  Branches     6206     6213       +7     
==========================================
+ Hits         5157     5158       +1     
- Misses        768      773       +5     
- Partials      281      282       +1     
Flag Coverage Δ
rust 83.01% <64.61%> (-0.08%) ⬇️

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.

Copy link
Contributor

@doug-q doug-q left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, Just a couple of nits

tket2/src/circuit.rs Outdated Show resolved Hide resolved
///
/// We have to insert the extension id manually due to
/// https://github.com/CQCL/hugr/issues/1496
static ref IGNORED_EXTENSION_OPS: HashSet<OpName> = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gross. I think you should include Lift also.

aborgna-q and others added 2 commits September 2, 2024 16:04
Co-authored-by: Douglas Wilson <141026920+doug-q@users.noreply.github.com>
@aborgna-q aborgna-q added this pull request to the merge queue Sep 2, 2024
Merged via the queue into main with commit 258a7c5 Sep 2, 2024
14 of 15 checks passed
@aborgna-q aborgna-q deleted the ab/hugr-0.12 branch September 2, 2024 15:17
github-merge-queue bot pushed a commit that referenced this pull request Sep 4, 2024
🤖 I have created a release *beep* *boop*
---


##
[0.3.0](tket2-py-v0.2.1...tket2-py-v0.3.0)
(2024-09-04)


### ⚠ BREAKING CHANGES

* quantum extension renamed from "quantum.tket2" to "tket2.quantum"
* Parametric Tk2Ops take angle type rather than float.
* Rename lazy extension to "hseries" and add hseries ops.
* `Tk2Op::AngleAdd` removed, use `fadd` from the hugr float ops standard
extension
* Updated to latest hugr version (`hugr-rs 0.12` / `hugr-py 0.8`). ECCs
need to be recompiled.

### Features

* HSeries ops ([#573](#573))
([e6acc88](e6acc88))
* remove Tk2Op::AngleAdd
([#567](#567))
([42cc82f](42cc82f))
* replace f64 with angle type for tk2 ops
([#578](#578))
([d14631f](d14631f))
* Update rust hugr dependency to `0.12.0`, and python hugr to `0.8.0`
([#568](#568))
([258a7c5](258a7c5))


### Bug Fixes

* quantum extension name wrong way round
([#582](#582))
([06a6838](06a6838))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
github-merge-queue bot pushed a commit that referenced this pull request Sep 4, 2024
## 🤖 New release
* `tket2`: 0.1.1 -> 0.2.0
* `tket2-hseries`: 0.1.1 -> 0.2.0

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

## `tket2`
<blockquote>

##
[0.2.0](tket2-v0.1.1...tket2-v0.2.0)
- 2024-09-04

### Bug Fixes
- [**breaking**] quantum extension name wrong way round
([#582](#582))

### New Features
- Extend Command::optype lifetime
([#562](#562))
- [**breaking**] Update rust hugr dependency to `0.12.0`, and python
hugr to `0.8.0` ([#568](#568))
- [**breaking**] remove Tk2Op::AngleAdd
([#567](#567))
- [**breaking**] angle type no longer parametric.
([#577](#577))
- [**breaking**] HSeries ops
([#573](#573))
- [**breaking**] replace f64 with angle type for tk2 ops
([#578](#578))
- more angle ops (construct, deconstruct, radians, equality)
([#581](#581))
</blockquote>

## `tket2-hseries`
<blockquote>

##
[0.2.0](tket2-hseries-v0.1.1...tket2-hseries-v0.2.0)
- 2024-09-04

### New Features
- [**breaking**] Update rust hugr dependency to `0.12.0`, and python
hugr to `0.8.0` ([#568](#568))
- [**breaking**] HSeries ops
([#573](#573))
- [**breaking**] replace f64 with angle type for tk2 ops
([#578](#578))
</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.

2 participants