Deprecate ciruit.device everywhere.
#4845
Conversation
MichaelBroughton
requested review from
cduck,
vtomole,
wcourtney and
a team
as code owners
| if self._device == cirq.UNCONSTRAINED_DEVICE: | ||
| return FrozenCircuit(self, strategy=InsertStrategy.EARLIEST) | ||
| return FrozenCircuit(self, strategy=InsertStrategy.EARLIEST, device=self._device) |
There was a problem hiding this comment.
The reason I opted for this patter instead of something like:
ret_device = FrozenCircuit(self, strategy=....)
ret_device._device = self._device
return ret_deviceIs because the constructor with the device argument makes non trivial behavior changes to the constructor and so that's why I opted to use this pattern in places with deprecations. Removing them once the cycle is over should be relatively easy to do since all we need to do is keep the snippet inside the if statement and delete the else block.
cirq-core/cirq/circuits/circuit.py
Outdated
| @@ -70,6 +73,17 @@ | |||
| _DEVICE_DEP_MESSAGE = 'Attaching devices to circuits will no longer be supported.' | |||
|
|
|||
|
|
|||
| @contextlib.contextmanager | |||
| def _block_overlapping_dep(): | |||
There was a problem hiding this comment.
What's up with this? Perhaps a line comment explaining what this is.
Also I would change dep to deprecation, since abbreviations should be avoided, especially ambiguous ones (could be dependencies)
There was a problem hiding this comment.
This is to catch overlapping deprecation warnings. If a user calls with_device they should only see the warning for with_device and not the internal message of with_device using the constructor with the device argument as well.
cirq-core/cirq/circuits/circuit.py
Outdated
| @@ -1323,11 +1343,11 @@ def save_qasm( | |||
| self._to_qasm_output(header, precision, qubit_order).save(file_path) | |||
|
|
|||
| def _json_dict_(self): | |||
| return protocols.obj_to_dict_helper(self, ['moments', 'device']) | |||
| return protocols.obj_to_dict_helper(self, ['moments']) | |||
There was a problem hiding this comment.
This confuses me a bit: we still support device everywhere, except for JSON? It seems like this and _from_json_dict_ should continue supporting device until it's removed everywhere else as well.
There was a problem hiding this comment.
Good point, got a little ahead of myself there. Went ahead and put device back in json. We can cut it and add the {repr,json}_inward once things are officially cut when the deprecation cycle is over.
MichaelBroughton
added
the
automerge
CirqBot
added
the
front_of_queue_automerge
CirqBot
removed
automerge
Last item in step 1 of quantumlib#4744 .
Last item in step 1 of quantumlib#4744 .
Last item in step 1 of quantumlib#4744 .
Last item in step 1 of #4744 .