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: Array indexing #415

Merged
merged 8 commits into from
Sep 4, 2024
Merged

feat: Array indexing #415

merged 8 commits into from
Sep 4, 2024

Conversation

mark-koch
Copy link
Collaborator

@mark-koch mark-koch commented Aug 28, 2024

This is the feature branch for array indexing. Tracked by #253.

The goal is to allow array indexing in @inout positions that ignores linearity constraints in the indices:

qs: array[qubit, 42]
cx(qs[0], qs[1])  # Ok
cx(qs[0], qs[0])  # Compiles, but will panic at runtime
q = qs[0]  # Error: Indexing only allowed in inout position

This is achieved by lowering array[qubit] to array[qubit | None] and making array.__getitem__ and array.__setitem__ swap in None whenever a qubit is taken out or put back in. The functions array.__getitem__ and array.__setitem__ take the array as @inout, so it suffices to apply the following desugaring:

cx(qs[expr1], qs[expr2])

# Desugars to
idx1 = expr1
idx2 = expr2
tmp1 = qs.__getitem__(idx1)
tmp2 = qs.__getitem__(idx2)
cx(tmp1, tmp2)
qs.__setitem__(tmp1, idx1)
qs.__setitem__(tmp2, idx2)

This also means that arrays containing structs might behave slightly unexpectedly:

@guppy.struct
class QubitPair:
    q1: qubit
    q2: qubit

ps: array[QubitPair, 42]
cx(ps[0].q1, ps[0].q2)  # Panics at runtime :(

# Since it desugars to
idx1 = 0
idx2 = 0
tmp1 = ps.__getitem__(idx1)
tmp2 = ps.__getitem__(idx2)  # Panic: Struct at index 0 has already been replaced with None
cx(tmp1.q1, tmp2.q2)
...

To solve this, we need to change the Hugr lowering of arrays to structually replace any occurrence of qubit with qubit | None, i.e. instead of doing array[QubitPair | None], we would need to do array[tuple[qubit | None, qubit | None]]. I'll leave this to a future PR in case we are interested in that.

The following feature PRs target this branch:

@codecov-commenter
Copy link

codecov-commenter commented Aug 28, 2024

Codecov Report

Attention: Patch coverage is 96.70330% with 6 lines in your changes missing coverage. Please review.

Project coverage is 92.70%. Comparing base (553ec51) to head (85dcceb).

Files with missing lines Patch % Lines
guppylang/checker/core.py 88.00% 3 Missing ⚠️
guppylang/prelude/_internal/compiler.py 95.31% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #415      +/-   ##
==========================================
+ Coverage   92.59%   92.70%   +0.10%     
==========================================
  Files          49       49              
  Lines        5363     5525     +162     
==========================================
+ Hits         4966     5122     +156     
- Misses        397      403       +6     

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

@qartik

This comment was marked as resolved.

mark-koch and others added 7 commits August 30, 2024 15:47
Closes #416. See #415 for context.

* Adds a new `SubscriptAccess` place that will be used to track array
subscripts during linearity checking
* This place is emitted when checking a subscript AST node
* Ensures that subscripts in inout positions also implement a
`__setitem__` method
Closes #418. See #415 for context.

Note that `array.__getitem__` and `array.__setitem__` are currently
lowered to dummy Hugr ops. The "swapping with `None`" logic explained in
#415 will follow in a future PR (see #419)
@mark-koch mark-koch requested a review from ss2165 September 4, 2024 11:14
@mark-koch mark-koch marked this pull request as ready for review September 4, 2024 11:14
@mark-koch mark-koch requested a review from a team as a code owner September 4, 2024 11:14
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.

🎉 🎉

@mark-koch mark-koch added this pull request to the merge queue Sep 4, 2024
Merged via the queue into main with commit 2199b48 Sep 4, 2024
4 checks passed
@mark-koch mark-koch deleted the feat/arrays branch September 4, 2024 11:20
github-merge-queue bot pushed a commit that referenced this pull request Sep 11, 2024
🤖 I have created a release *beep* *boop*
---


## [0.10.0](v0.9.0...v0.10.0)
(2024-09-11)


### ⚠ BREAKING CHANGES

* Bumped the `hugr` dependency to `0.8.0`
* `GuppyModule.load` no longer loads the content of modules but instead
just brings the name of the module into scope. Use
`GuppyModule.load_all` to get the old behaviour.
* Removed `guppylang.hugr_builder.hugr.Hugr`, compiling a module returns
a `hugr.Package` instead.

### Features

* Add `__version__` field to guppylang
([#473](#473))
([b996c62](b996c62))
* Add angle type ([#449](#449))
([12e41e0](12e41e0))
* Add array literals
([#446](#446))
([a255c02](a255c02))
* Add equality test for booleans
([#394](#394))
([dd702ce](dd702ce)),
closes [#363](#363)
* Add pi constant ([#451](#451))
([9d35a78](9d35a78))
* Add qualified imports and make them the default
([#443](#443))
([553ec51](553ec51))
* Allow calling of methods
([#440](#440))
([5a59da3](5a59da3))
* Allow imports of function definitions and aliased imports
([#432](#432))
([e23b666](e23b666))
* Array indexing ([#415](#415))
([2199b48](2199b48)),
closes [#421](#421)
[#422](#422)
[#447](#447)
* Inout arguments ([#311](#311))
([060649b](060649b)),
closes [#315](#315)
[#316](#316)
[#349](#349)
[#344](#344)
[#321](#321)
[#331](#331)
[#350](#350)
[#340](#340)
[#351](#351)
* range() with single-argument
([#452](#452))
([d05f369](d05f369))
* Skip checking of redefined functions
([#457](#457))
([7f9ad32](7f9ad32))
* Support `nat`/`int` ↔ `bool` cast operations
([#459](#459))
([3b778c3](3b778c3))
* Use `hugr-cli` for validation
([#455](#455))
([1d0667b](1d0667b))
* Use cell name instead of file for notebook errors
([#382](#382))
([d542601](d542601))
* Use the hugr builder
([536abf9](536abf9))


### Bug Fixes

* Fix and update demo notebook
([#376](#376))
([23b2a15](23b2a15))
* Fix linearity checking bug
([#441](#441))
([0b8ea21](0b8ea21))
* Fix struct definitions in notebooks
([#374](#374))
([b009465](b009465))


### Documentation

* Update readme, `cargo build` instead of `--extra validation`
([#471](#471))
([c2a4c86](c2a4c86))


### Miscellaneous Chores

* Update hugr to `0.8.0`
([#454](#454))
([b02e0d0](b02e0d0))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
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.

4 participants