Fixes run_batch requiring param list #3507
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
95-martin-orion
approved these changes
Nov 17, 2020
Collaborator
95-martin-orion
left a comment
95-martin-orion
left a comment
There was a problem hiding this comment.
Agreed that deprecation is unnecessary here. One nit and this is ready to merge.
cirq/google/engine/engine.py
Outdated
| if not params_list or len(programs) != len(params_list): | ||
| if params_list is None: | ||
| params_list = [dict()] * len(programs) | ||
| if len(programs) != len(params_list): |
Collaborator
There was a problem hiding this comment.
The line above ensures params_list and programs are of equal length, so this if can be an elif.
maffoo
reviewed
Nov 18, 2020
cirq/google/engine/engine.py
Outdated
| """ | ||
| if not params_list or len(programs) != len(params_list): | ||
| if params_list is None: | ||
| params_list = [dict()] * len(programs) |
Contributor
There was a problem hiding this comment.
Can do [None] * len(programs) since cirq.Sweepable includes None (via ParamResolverOrSimilarType).
cirq/google/engine/engine_program.py
Outdated
| if self.result_type != ResultType.Batch: | ||
| raise ValueError('Can only use run_batch() in batch mode.') | ||
| if params_list is None: | ||
| params_list = [dict()] * self.batch_size() |
Contributor
There was a problem hiding this comment.
Here, too, can do [None] * self.batch_size().
dabacon
commented
Nov 22, 2020
Collaborator
Author
dabacon
left a comment
dabacon
left a comment
There was a problem hiding this comment.
PTAL addressed comments
cirq/google/engine/engine_program.py
Outdated
| if self.result_type != ResultType.Batch: | ||
| raise ValueError('Can only use run_batch() in batch mode.') | ||
| if params_list is None: | ||
| params_list = [dict()] * self.batch_size() |
cirq/google/engine/engine.py
Outdated
| """ | ||
| if not params_list or len(programs) != len(params_list): | ||
| if params_list is None: | ||
| params_list = [dict()] * len(programs) |
cirq/google/engine/engine.py
Outdated
| if not params_list or len(programs) != len(params_list): | ||
| if params_list is None: | ||
| params_list = [dict()] * len(programs) | ||
| if len(programs) != len(params_list): |
maffoo
added
the
automerge
CirqBot
added
the
front_of_queue_automerge
CirqBot
removed
automerge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
In #3285 it points out that there is a requirement that there always be param lists specified for a batch program on
Engine.run_batch. This changes this to the sensible default, which is that if the params are None that empty param sweeps are sent to match the programs. This also required changes to the similar calls inEngineProgram. Here I've also addedbatch_sizefor batch programs, that uses the cached value of the program, or potentially fetches a new program.While this technically changes the api of this method, it only makes it possible to now use the default or specify None, so don't think this needs to got through deprecation.
Fixed #3285