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

Remove cirq.google reference from contrib.quantum_volume and contrib.routing #3888

Merged
merged 21 commits into from
Mar 11, 2021
Merged

Remove cirq.google reference from contrib.quantum_volume and contrib.routing #3888

merged 21 commits into from
Mar 11, 2021

Conversation

balopat
Copy link
Contributor

@balopat balopat commented Mar 8, 2021

Deprecates cirq.contrib.routing.xmon_device_to_graph and removes references to cirq.google in quantum_volume and routing packages.

Related to #3737.

cc @mpharrigan

@balopat balopat requested review from cduck, vtomole and a team as code owners March 8, 2021 22:49
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@google-cla google-cla bot added the cla: yes Makes googlebot stop complaining. label Mar 8, 2021
@balopat balopat mentioned this pull request Mar 9, 2021
Merged
95-martin-orion
95-martin-orion requested changes Mar 10, 2021
View reviewed changes
Copy link
Collaborator

@95-martin-orion 95-martin-orion left a comment

Choose a reason for hiding this comment

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

Only one item catches my eye here, otherwise looks good to go.

cirq/contrib/quantum_volume/quantum_volume.py Outdated Show resolved Hide resolved
@balopat balopat added BREAKING CHANGE For pull requests that are important to mention in release notes. and removed BREAKING CHANGE For pull requests that are important to mention in release notes. labels Mar 11, 2021
mpharrigan
mpharrigan reviewed Mar 11, 2021
View reviewed changes
Copy link
Collaborator

@mpharrigan mpharrigan left a comment

Choose a reason for hiding this comment

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

suggest using graphs instead of topology implicit in gridqubits. I think this should be an easy change.

cirq/contrib/quantum_volume/quantum_volume.py Outdated Show resolved Hide resolved
dev_tools/notebooks/isolated_notebook_test.py Show resolved Hide resolved
@balopat @mpharrigan
Update cirq/contrib/quantum_volume/quantum_volume.py
71fbe57 
Co-authored-by: Matthew Harrigan <matthew.harrigan@outlook.com>
@google-cla
Copy link

google-cla bot commented Mar 11, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added cla: no and removed cla: yes Makes googlebot stop complaining. labels Mar 11, 2021
@balopat balopat added cla: yes Makes googlebot stop complaining. and removed cla: no labels Mar 11, 2021
@mpharrigan
Copy link
Collaborator

I signed a CLA for my personal email, which apparently is how the suggested changes get attributed

@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Mar 11, 2021
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Mar 11, 2021
@CirqBot CirqBot merged commit 745790e into quantumlib:master Mar 11, 2021
@CirqBot CirqBot removed automerge Tells CirqBot to sync and merge this PR. (If it's running.) front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. labels Mar 11, 2021
CirqBot pushed a commit that referenced this pull request Mar 19, 2021
@balopat
Pytest without cirq.google (#3894)
06e0f1c 
Enables testing without the existence of cirq.google. 

Namely: 
- check/pytest gets a `--cirq-only` arg, that deletes the cirq/google directory and runs pytest  - also adds a new CI job just for this reason
- this forced the removal of some remaining cirq.google references from cirq core and some was made optional (see next point)
- cirq.google references can still be made from tests but they will be skipped using `@cirq.testing.skip_if_module_not_exists(module="cirq.google")` - the examples folder, performance benchmarking are places where this is okay. In other places this is considered technical debt and we'll need to figure out how to remove those instances cleanly (probably by creating the test infra for those features that the modules can call into)

Note: this should be merged after #3888 (it is merged into this branch).

Closes #3737.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpharrigan mpharrigan mpharrigan approved these changes

@95-martin-orion 95-martin-orion 95-martin-orion approved these changes

@cduck cduck Awaiting requested review from cduck

@vtomole vtomole Awaiting requested review from vtomole

Assignees
No one assigned
Labels
cla: yes Makes googlebot stop complaining. kind/deprecation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@balopat @mpharrigan @95-martin-orion @CirqBot