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.

Sign up for GitHub

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

Jump to bottom

fix: Allow borrowing inside comprehensions #723

Merged
merged 1 commit into from
Dec 16, 2024
Merged

fix: Allow borrowing inside comprehensions #723

merged 1 commit into from
Dec 16, 2024

Conversation

mark-koch
Copy link
Collaborator

Fixes #719

@mark-koch mark-koch requested a review from ss2165 December 16, 2024 15:15
@mark-koch mark-koch requested a review from a team as a code owner December 16, 2024 15:15
mark-koch
mark-koch commented Dec 16, 2024
View reviewed changes
guppylang/checker/linearity_checker.py
@@ -317,13 +317,13 @@ def _reassign_inout_args(self, func_ty: FunctionType, call: AnyCall) -> None:
if InputFlags.Inout in inp.flags:
match arg:
case PlaceNode(place=place):
self._reassign_single_inout_arg(place, arg)
self._reassign_single_inout_arg(place, place.defined_at or arg)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

drive-by: Improve leak errors by keeping track of the original place where a variable was defined if possible

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.62%. Comparing base (d52a00a) to head (81f6226).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #723   +/-   ##
=======================================
  Coverage   92.61%   92.62%           
=======================================
  Files          71       71           
  Lines        7882     7954   +72     
=======================================
+ Hits         7300     7367   +67     
- Misses        582      587    +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ss2165
ss2165 approved these changes Dec 16, 2024
View reviewed changes
Copy link
Member

@ss2165 ss2165 left a comment

Choose a reason for hiding this comment

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

thanks!

tests/error/comprehension_errors/borrow_leaked2.err
|
15 | @guppy(module)
16 | def foo(qs: list[qubit] @owned) -> list[int]:
17 | return [bar(q) for q in qs]
Copy link
Member

Choose a reason for hiding this comment

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

obvs not for this PR but it would be super sweet if a hint said "try removing owned"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Created #726

tests/integration/test_array_comprehension.py

@guppy(module)
def test(qs: array[qubit, n] @ owned) -> array[int, n]:
return array(foo(q) + bar(q) for q in qs)
Copy link
Member

Choose a reason for hiding this comment

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

flex

@mark-koch mark-koch mentioned this pull request Dec 16, 2024
Open
@mark-koch mark-koch added this pull request to the merge queue Dec 16, 2024
Merged via the queue into main with commit 02b6ab0 Dec 16, 2024
3 checks passed
@mark-koch mark-koch deleted the fix/compr-borrow branch December 16, 2024 16:47
@hugrbot hugrbot mentioned this pull request Dec 16, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Dec 19, 2024
@hugrbot @ss2165
chore(main): release 0.14.0 (#655)
db86f98 
🤖 I have created a release *beep* *boop*
---


## [0.14.0](v0.13.1...v0.14.0)
(2024-12-19)


### ⚠ BREAKING CHANGES

* Lists in `py(...)` expressions are now turned into Guppy arrays
instead of lists.
* `dirty_qubit` function removed
* measure_return renamed to `project_z`

### Features

* add `maybe_qubit` stdlib function
([#705](#705))
([a49f70e](a49f70e)),
closes [#627](#627)
* add measure_array and discard_array quantum function
([#710](#710))
([3ad49ff](3ad49ff))
* Add method to load pytket circuit without function stub
([#712](#712))
([ee1e3de](ee1e3de))
* Add Option type to standard library
([#696](#696))
([45ea6b7](45ea6b7))
* Allow generic nat args in statically sized ranges
([#706](#706))
([f441bb8](f441bb8)),
closes [#663](#663)
* Array comprehension
([#613](#613))
([fdc0526](fdc0526)),
closes [#614](#614)
[#616](#616)
[#612](#612)
* Implicit coercion of numeric types
([#702](#702))
([df4745b](df4745b)),
closes [#701](#701)
* Load `pytket` circuit as a function definition
([#672](#672))
([b21b7e1](b21b7e1))
* Make arrays iterable
([#632](#632))
([07b9871](07b9871))
* qsystem std functions with updated primitives
([#679](#679))
([b0f041f](b0f041f))
* remove dirty_qubit
([#698](#698))
([78e366b](78e366b))
* Turn py expression lists into arrays
([#697](#697))
([d52a00a](d52a00a))
* Unpacking assignment of iterable types with static size
([#688](#688))
([602e243](602e243))
* update to hugr 0.10 and tket2 0.6
([#725](#725))
([63ea7a7](63ea7a7))


### Bug Fixes

* Accept non-negative int literals and py expressions as nats
([#708](#708))
([a93d4fe](a93d4fe)),
closes [#704](#704)
* Allow borrowing inside comprehensions
([#723](#723))
([02b6ab0](02b6ab0)),
closes [#719](#719)
* Detect unsupported default arguments
([#659](#659))
([94ac7e3](94ac7e3)),
closes [#658](#658)
* docs build command
([#729](#729))
([471b74c](471b74c))
* Ensure `int`s can be treated as booleans
([#709](#709))
([6ef6d60](6ef6d60)),
closes [#681](#681)
* Fix array execution bugs
([#731](#731))
([0f6ceaa](0f6ceaa))
* Fix implicit modules in IPython shells
([#662](#662))
([4ecb5f2](4ecb5f2)),
closes [#661](#661)
* Properly report error for unsupported constants
([#724](#724))
([d0c2da4](d0c2da4)),
closes [#721](#721)
* Properly report errors for unsupported expressions
([#692](#692))
([7f24264](7f24264)),
closes [#691](#691)
* remove use of deprecated Ellipsis
([#699](#699))
([b819a84](b819a84))


### Documentation

* Fix docs build ([#700](#700))
([684f485](684f485)),
closes [#680](#680)
* fix README.md and quickstart.md
([#654](#654))
([abb0221](abb0221))

---
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: Seyon Sivarajah <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ss2165 ss2165 ss2165 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Borrowing comprehension bodies report linearity violation
3 participants
@mark-koch @codecov-commenter @ss2165