Skip to content

Modify some numpy types to be compatible with numpy>=1.20 #5668

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

Merged
CirqBot merged 19 commits into from
Jul 7, 2022
Merged

Modify some numpy types to be compatible with numpy>=1.20 #5668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4067fba
Some numpy types
vtomole Jul 6, 2022
4939e91
park
vtomole Jul 6, 2022
db798c8
Merge branch 'master' into numpy
vtomole Jul 6, 2022
fdaf25b
Merge branch 'numpy' of github.com:vtomole/Cirq into numpy
vtomole Jul 6, 2022
9dec22c
Bring back type alias
vtomole Jul 6, 2022
48335ae
Optional types
vtomole Jul 6, 2022
3f6a4e0
Assert
vtomole Jul 6, 2022
413b304
Remove otpional
vtomole Jul 6, 2022
3aee1fd
Merge branch 'master' into numpy
vtomole Jul 6, 2022
bda1fd4
Remove unused optional
vtomole Jul 6, 2022
5d90874
Merge branch 'numpy' of github.com:vtomole/Cirq into numpy
vtomole Jul 6, 2022
1115be5
Revert
vtomole Jul 6, 2022
4a65ac2
Merge branch 'master' into numpy
vtomole Jul 7, 2022
d314d11
Review comments
vtomole Jul 7, 2022
8aa737f
Remove assert
vtomole Jul 7, 2022
d7608f4
Revert type
vtomole Jul 7, 2022
7e831ca
Default param
vtomole Jul 7, 2022
ae99740
Alphabet
vtomole Jul 7, 2022
73c3833
Merge branch 'master' into numpy
CirqBot Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cirq-core/cirq/experiments/qubit_characterizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def _measurement(two_qubit_circuit: circuits.Circuit) -> np.ndarray:

# Stores all 27 measured probabilities (P_00, P_01, P_10 after 9
# different basis rotations).
probs = np.array([])
probs: np.ndarray = np.array([])

rots = [ops.X**0, ops.X**0.5, ops.Y**0.5]

Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/linalg/combinators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def kron(*factors: Union[np.ndarray, complex, float], shape_len: int = 2) -> np.
Returns:
The kronecker product of all the inputs.
"""
product = np.ones(shape=(1,) * shape_len)
product: np.ndarray = np.ones(shape=(1,) * shape_len)
for m in factors:
product = np.kron(product, m)
return np.array(product)
Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/protocols/kraus_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# Sequence[np.ndarray] to ensure the method has the correct type signature in
# that case. It is checked for using `is`, so it won't have a false positive
# if the user provides a different (np.array([]),) value.
RaiseTypeErrorIfNotProvided = (np.array([]),)
RaiseTypeErrorIfNotProvided: Tuple[np.ndarray] = (np.array([]),)


TDefault = TypeVar('TDefault')
Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/protocols/kraus_protocol_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

"""Tests for kraus_protocol.py."""

from typing import Iterable, Sequence, Tuple
from typing import Iterable, List, Sequence, Tuple

import numpy as np
import pytest

import cirq


LOCAL_DEFAULT = [np.array([])]
LOCAL_DEFAULT: List[np.ndarray] = [np.array([])]


def test_kraus_no_methods():
Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/protocols/unitary_protocol_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import cirq

m0 = np.array([])
m0: np.ndarray = np.array([])
# yapf: disable
# X on one qubit
m1 = np.array([[0, 1],
Expand Down
6 changes: 3 additions & 3 deletions cirq-core/cirq/qis/clifford_tableau.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import abc
from typing import Any, Dict, List, Sequence, TYPE_CHECKING
from typing import Any, Dict, List, Optional, Sequence, TYPE_CHECKING
import numpy as np

from cirq import protocols
Expand Down Expand Up @@ -441,7 +441,7 @@ def destabilizers(self) -> List['cirq.DensePauliString']:
generators above generate the full Pauli group on n qubits."""
return [self._row_to_dense_pauli(i) for i in range(self.n)]

def _measure(self, q, prng: np.random.RandomState) -> int:
def _measure(self, q, prng: np.random.RandomState = np.random) -> int:
"""Performs a projective measurement on the q'th qubit.

Returns: the result (0 or 1) of the measurement.
Expand Down Expand Up @@ -583,6 +583,6 @@ def apply_global_phase(self, coefficient: linear_dict.Scalar):
pass

def measure(
self, axes: Sequence[int], seed: 'cirq.RANDOM_STATE_OR_SEED_LIKE' = None
self, axes: Sequence[int], seed: Optional['cirq.RANDOM_STATE_OR_SEED_LIKE'] = None
) -> List[int]:

@dabacon dabacon Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think I would keep this None and then do a seed or np.random in the parameter in self._measure. That way we don't have to change the default here (though I don't think it will matter much). np.random might be considered mutable(?) since it changes when different people use it, so best to not put mutables as defaults.

@vtomole vtomole Jul 7, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Do we want it as a parameter or like:

    def _measure(self, q, prng: Optional[np.random.RandomState]) -> int:
        if prng is None:
            prng = np.random

@dabacon dabacon Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

that could also work, though this also does something I try to avoid which is re-assign a parameter. Mostly this doesn't ever hurt you, but there are cases where it does (mostly having to do with pytest, btw). It also sort of makes sense that the private method has a random state, but the public one has the default of None.

@dabacon dabacon Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

whichever way you want 👍

@vtomole vtomole Jul 7, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ah, makes sense. Switched to param.

return [self._measure(axis, seed) for axis in axes]
2 changes: 1 addition & 1 deletion cirq-core/cirq/testing/lin_alg_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def assert_allclose_up_to_global_phase(
rtol: float = 1e-7,
atol: float, # Require atol to be specified
equal_nan: bool = True,
err_msg: Optional[str] = '',
err_msg: str = '',
verbose: bool = True,
) -> None:
"""Checks if a ~= b * exp(i t) for some t.
Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/vis/histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def integrated_histogram(

if not show_zero:
bin_values = np.linspace(0, 1, n + 1)
parameter_values = sorted(np.concatenate(([0], float_data)))
parameter_values = sorted(np.concatenate((np.array([0]), np.array(float_data))))
else:
bin_values = np.linspace(0, 1, n)
parameter_values = sorted(float_data)
Expand Down