Move Coupler to cirq_gooogle.ops #6697
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
dstrain115
commented
Aug 1, 2024
dstrain115
commented
- Noticed when adding code that there were circular imports due to Couplers api codes needing code from devices.
- Moved this to ops directory instead, which avoids the circular import.
- Note that, although GridQubit is in cirq.devices, LineQubit and NamedQubit are in cirq.ops, so this also seems to be a good place to put this class.
- Noticed when adding code that there were circular imports due to Couplers api codes needing code from devices. - Moved this to ops directory instead, which avoids the circular import. - Note that, although GridQubit is in cirq.devices, LineQubit and NamedQubit are in cirq.ops, so this also seems to be a good place to put this class.
dstrain115
requested review from
wcourtney,
vtomole,
verult and
a team
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6697 +/- ##
=======================================
Coverage 97.82% 97.82%
=======================================
Files 1074 1074
Lines 92191 92187 -4
=======================================
- Hits 90189 90186 -3
+ Misses 2002 2001 -1 ☔ View full report in Codecov by Sentry. |
pavoljuhas
approved these changes
Aug 1, 2024
| @@ -77,7 +72,6 @@ def qubit_from_proto_id(proto_id: str) -> cirq.Qid: | |||
| A `cirq.Qid` corresponding to the proto id. | |||
| """ | |||
| # Avoid circular import | |||
There was a problem hiding this comment.
NIT - remove outdated comment
| from cirq_google.experimental import ops as experimental_ops | ||
| from cirq_google.ops.coupler import Coupler |
There was a problem hiding this comment.
For the sake of consistency with ops.Stuff syntax at 49-52, can we drop this import and use ops.Coupler below?
There was a problem hiding this comment.
Added as cg_ops (it's cirq_google.ops)
pavoljuhas
reviewed
Aug 1, 2024
| @@ -38,7 +38,7 @@ | |||
| from cirq_google.api import v2 | |||
| from cirq_google.devices import known_devices | |||
| from cirq_google.experimental import ops as experimental_ops | |||
| from cirq_google.ops.coupler import Coupler | |||
| from cirq_google import ops as cg_ops | |||
There was a problem hiding this comment.
Let's then delete line 36 and only use cg_ops for that module.
There was a problem hiding this comment.
Ah, missed that this was cirq_google.ops (thought it was cirq.ops). Reverted this and changed to ops.Coupler for brevity.
pavoljuhas
requested changes
Aug 1, 2024
pavoljuhas
approved these changes
Aug 2, 2024
BichengYing
pushed a commit
to BichengYing/Cirq
that referenced
this pull request
Jun 20, 2025
* Move Coupler to cirq_gooogle.ops - Noticed when adding code that there were circular imports due to Couplers api codes needing code from devices. - Moved this to ops directory instead, which avoids the circular import. - Note that, although GridQubit is in cirq.devices, LineQubit and NamedQubit are in cirq.ops, so this also seems to be a good place to put this class.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.