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

Client change google api #2530

Merged
merged 7 commits into from
Nov 13, 2019

Conversation

dstrain115
Copy link
Collaborator

We should be good to switch the client side to the newest type URL (cirq.google.api). All downstream processes should now be able to support both type URLs.

This PR switches cirq to use cirq.google.api protos rather than cirq.api.google protos.

@googlebot googlebot added the cla: yes Makes googlebot stop complaining. label Nov 12, 2019
Copy link
Contributor

@maffoo maffoo left a comment

Choose a reason for hiding this comment

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

Minor comments. Otherwise LGTM

from cirq.google.api import v2
from cirq.google.api.v2 import result_pb2
Copy link
Contributor

Choose a reason for hiding this comment

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

Alternately, remove this and change to v2.result_pb2 in the code.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done.

@@ -18,7 +18,7 @@
import sympy

import cirq
from cirq.api.google.v2 import run_context_pb2
from cirq.google.api.v2 import run_context_pb2
Copy link
Contributor

Choose a reason for hiding this comment

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

Could remove this and refer to v2.run_context_pb2 below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done.

cirq/google/engine/engine.py Outdated Show resolved Hide resolved
cirq/google/op_serializer.py Outdated Show resolved Hide resolved
@dstrain115 dstrain115 merged commit a167b64 into quantumlib:master Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Makes googlebot stop complaining.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants