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: Allow imports of function definitions and aliased imports #432

Merged
merged 4 commits into from
Sep 2, 2024

Conversation

mark-koch
Copy link
Collaborator

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

Closes #425 and closes #427 and closes #134

  • Allow importing of function definitions (before we could only import declarations)
  • Until we have Hugr linking, we just lower everything into the same Hugr. This requires some changes to the compilation logic:
    • Differentiate between checking (module.check()) and full Hugr compilation (module.compile()) of modules
    • Importing modules only checks them
    • Hugr lowering is done at the end in one step over all imported modules
  • Allow to import individual definitions instead of whole modules
  • Allow aliased imports using kwargs (see test examples)

@mark-koch mark-koch requested a review from a team as a code owner August 30, 2024 14:16
@mark-koch mark-koch requested a review from croyzor August 30, 2024 14:16
@codecov-commenter
Copy link

codecov-commenter commented Aug 30, 2024

Codecov Report

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

Project coverage is 92.53%. Comparing base (d5a1b6f) to head (d5236a1).
Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
guppylang/module.py 91.66% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #432      +/-   ##
==========================================
+ Coverage   92.48%   92.53%   +0.04%     
==========================================
  Files          48       48              
  Lines        5178     5249      +71     
==========================================
+ Hits         4789     4857      +68     
- Misses        389      392       +3     

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

@@ -11,7 +11,7 @@


@guppy.declare(module)
def foo(f: Callable[[], qubit @inout]) -> None: ...
def foo(f: "Callable[[], qubit @inout]") -> None: ...
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is a bit annyoing. The qubit type now needs to be a Definition so we can import it, however Pythons Callable checks that the generic args are types at runtime...

Fixing this with a string annotation for now, but should figure out something better. See #433

Copy link
Collaborator

@croyzor croyzor left a comment

Choose a reason for hiding this comment

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

Nice!

guppylang/module.py Outdated Show resolved Hide resolved
guppylang/module.py Outdated Show resolved Hide resolved
guppylang/module.py Show resolved Hide resolved
@mark-koch mark-koch added this pull request to the merge queue Sep 2, 2024
Merged via the queue into main with commit e23b666 Sep 2, 2024
3 checks passed
@mark-koch mark-koch deleted the feat/better-imports branch September 2, 2024 14:58
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.

Add aliased imports Implement imports w/o linking Rethink the import system
3 participants