More numpy types #5683

vtomole · 2022-07-08T05:45:14Z

12 errors left

Part of #3767

dabacon · 2022-07-08T15:35:52Z

cirq-core/cirq/circuits/circuit.py

@@ -1592,7 +1592,7 @@ def _control_keys_(self) -> FrozenSet['cirq.MeasurementKey']:


 def _overlap_collision_time(
-    c1: Sequence['cirq.Moment'], c2: Sequence['cirq.Moment'], align: 'cirq.Alignment'


very strange to be using a numpy array to store Moments. I think for this one one needs to go back to the source where the numpy array is created and use a sequence instead (and change signature of concat_ragged function as well)

I've changed buffer = np.zeros(shape=pad_len * 2 + n_acc, dtype=object) to buffer: MutableSequence['cirq.Moment'] = [cirq.Moment()] * (pad_len * 2 + n_acc). Please take another look.

dabacon · 2022-07-08T15:36:36Z

cirq-core/cirq/ops/eigen_gate.py

@@ -331,6 +331,7 @@ def _trace_distance_bound_(self) -> Optional[float]:
        if protocols.is_parameterized(self._exponent):
            return None
        angles = np.pi * (np.array(self._eigen_shifts()) * self._exponent % 2)


extra debug print?

https://en.wikipedia.org/wiki/D%27oh!

Removed.

dabacon · 2022-07-08T15:39:08Z

cirq-core/cirq/ops/pauli_string.py

@@ -644,7 +644,7 @@ def expectation_from_density_matrix(
        *,
        atol: float = 1e-7,
        check_preconditions: bool = True,
-    ) -> float:


I think this should remain float. The bug is that in numpy.trace below, which should just be unpacked into a float. line 746. Does that fix things?

I've returned float(result * self.coefficient) since np.trace returns a sum.

dabacon · 2022-07-08T15:40:09Z

cirq-core/cirq/qis/clifford_tableau.py

        """Performs a projective measurement on the q'th qubit.

        Returns: the result (0 or 1) of the measurement.
        """
+        real_prng: np.random.RandomState = (
+            random_state.parse_random_state(np.random) if prng is None else prng


think this can be simplied to prng or random_state.parse_random_state(np.random)

dabacon · 2022-07-08T15:40:26Z

cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py

        """Measures the q'th qubit.

        Reference: Section 4.1 "Simulating measurements"

        Returns: Computational basis measurement as 0 or 1.
        """
+        real_prng: np.random.RandomState = (
+            random_state.parse_random_state(np.random) if prng is None else prng


similar simplification as before

dabacon · 2022-07-08T15:42:54Z

cirq-core/cirq/sim/state_vector_simulation_state.py

@@ -226,7 +226,7 @@ def prepare_into_buffer(k: int):
        ]
        p = prng.random()
        weight = None
-        fallback_weight = 0
+        fallback_weight = np.float64(0)


does 0.0 work instead?

I get

cirq-core/cirq/sim/state_vector_simulation_state.py:228: error: Incompatible types in assignment (expression has type "float", variable has type "floating[Any]") [assignment] when we do this. I can either leave this as-is or do 0.0 here and weight = float(np.linalg.norm(self._buffer) ** 2) a little bit more down.

dabacon · 2022-07-08T15:43:03Z

cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py

@@ -58,7 +59,9 @@ def random_qubit_unitary(
        rng: Random number generator to be used in sampling. Default is
            numpy.random.
    """
-    real_rng: np.random.RandomState = np.random if rng is None else rng
+    real_rng: np.random.RandomState = (
+        random_state.parse_random_state(np.random) if rng is None else rng


pavoljuhas · 2022-07-08T15:38:41Z

cirq-core/cirq/ops/eigen_gate.py

@@ -331,6 +331,7 @@ def _trace_distance_bound_(self) -> Optional[float]:
        if protocols.is_parameterized(self._exponent):
            return None
        angles = np.pi * (np.array(self._eigen_shifts()) * self._exponent % 2)
+        print(type(angles))


please remove

pavoljuhas · 2022-07-08T15:55:47Z

cirq-core/cirq/ops/pauli_string.py

@@ -716,7 +716,7 @@ def expectation_from_density_matrix(

    def _expectation_from_density_matrix_no_validation(
        self, state: np.ndarray, qubit_map: Mapping[TKey, int]
-    ) -> float:
+    ) -> np.ndarray:


The return value of this function is scalar. After adding a debug printout the pauli_string_test.py shows it returns complex values with a zero imaginary part, but PauliString.coefficient is typed as complex.

Is the expectation value guaranteed to be a float?
Please convert the return value to a complex or float as suitable.

I've converted it to a float.

pavoljuhas · 2022-07-08T16:10:19Z

cirq-core/cirq/qis/clifford_tableau.py

        """Performs a projective measurement on the q'th qubit.

        Returns: the result (0 or 1) of the measurement.
        """
+        real_prng: np.random.RandomState = (
+            random_state.parse_random_state(np.random) if prng is None else prng


parse_random_state already returns np.random for None.

Suggested change

random_state.parse_random_state(np.random) if prng is None else prng

random_state.parse_random_state(prng)

Nice. Applied.

pavoljuhas · 2022-07-08T16:12:27Z

cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py

        """Measures the q'th qubit.

        Reference: Section 4.1 "Simulating measurements"

        Returns: Computational basis measurement as 0 or 1.
        """
+        real_prng: np.random.RandomState = (
+            random_state.parse_random_state(np.random) if prng is None else prng


Please revert this method. _measure() is only called from the measure() method which can receive an integer seed argument. Let's use parse_random_state() there.

Done for this and cliiford_tableau above since the concepts are similar.

pavoljuhas · 2022-07-08T16:18:37Z

cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py

@@ -386,7 +389,7 @@ def apply_global_phase(self, coefficient: value.Scalar):
        self.omega *= coefficient

    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


Please, keep the seed type as it was, RANDOM_STATE_OR_SEED_LIKE is typed as Any so None should be fine there. Add a parse_random_state() call so that self._measure() gets a correct type.

The seed type is assigned to None so it's still Optional. This is being explicit even though we haven't turned on no-implicit-optional.

I haven't confirmed that

VarType = Any def hi(var: VarType=None)

Fails with no-implicit-optional though.

Anyway, will apply your suggestion since Any is vague so mypy shouldn't have a problem with the previous type.

pavoljuhas · 2022-07-08T16:22:19Z

cirq-core/cirq/sim/density_matrix_utils.py

+    def _copy_density_matrix_to_out(density_matrix: np.ndarray, out: np.ndarray) -> np.ndarray:
+        np.copyto(dst=out, src=density_matrix)
+        return out
+
    arrout: np.ndarray = (
        np.copy(density_matrix)
        if out is None
        else density_matrix
        if out is density_matrix
-        else (np.copyto(dst=out, src=density_matrix), out)[-1]
+        else _copy_density_matrix_to_out(density_matrix, out)


Please consider replacing with hopefully more readable

arrout: np.ndarray if out is None: arrout = np.copy(density_matrix) elif out is density_matrix: arrout = density_matrix else: np.copyto(dst=out, src=density_matrix) arrout = out

pavoljuhas · 2022-07-08T16:22:41Z

cirq-core/cirq/sim/state_vector_simulation_state.py

@@ -226,7 +226,7 @@ def prepare_into_buffer(k: int):
        ]
        p = prng.random()
        weight = None
-        fallback_weight = 0
+        fallback_weight = np.float64(0)


Suggested change

fallback_weight = np.float64(0)

fallback_weight = 0.0

I get

cirq-core/cirq/sim/state_vector_simulation_state.py:228: error: Incompatible types in assignment (expression has type "float", variable has type "floating[Any]") [assignment] when we do this. I can either leave this as-is or do 0.0 here and weight = float(np.linalg.norm(self._buffer) ** 2) a little bit more down.

pavoljuhas · 2022-07-08T16:24:30Z

cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py

+    real_rng: np.random.RandomState = (
+        random_state.parse_random_state(np.random) if rng is None else rng
+    )


Please replace with a simple call to parse_random_state()

pavoljuhas · 2022-07-08T16:30:56Z

cirq-core/cirq/vis/state_histogram.py

+    values_range = np.arange(len(values))
+    _ = (
+        ax.bar(values_range, values, tick_label=values_range)
+        if tick_label is None
+        else ax.bar(values_range, values, tick_label=tick_label)
+    )


The mypy complaint was

error: Incompatible types in assignment (expression has type "ndarray[Any, dtype[signedinteger[Any]]]", variable has type "Optional[Sequence[str]]") [assignment]

Let's replace with

Suggested change

values_range = np.arange(len(values))

_ = (

ax.bar(values_range, values, tick_label=values_range)

if tick_label is None

else ax.bar(values_range, values, tick_label=tick_label)

)

if tick_label is None:

tick_label = [str(i) for i in range(len(values))]

dabacon

LGTM

requested changes addressed.

12 errors left Part of quantumlib#3767

More types

4674a52

CirqBot added the size: M 50< lines changed <250 label Jul 8, 2022

Type pauli string

05db9cd

vtomole marked this pull request as ready for review July 8, 2022 05:53

vtomole requested review from mrwojtek, a team and cduck as code owners July 8, 2022 05:53

vtomole requested a review from maffoo July 8, 2022 05:53

dstrain115 requested a review from pavoljuhas July 8, 2022 12:55

dabacon requested changes Jul 8, 2022

View reviewed changes

pavoljuhas previously requested changes Jul 8, 2022

View reviewed changes

Respond to review

a32ab1d

vtomole requested review from wcourtney and verult as code owners July 9, 2022 07:41

vtomole added 5 commits July 9, 2022 02:42

Remove values range

7185741

Remove optionals

a8ab8c2

Merge branch 'master' into numpy

fda0eb2

Remove unused

187732d

Merge branch 'numpy' of github.com:vtomole/Cirq into numpy

0a820e0

vtomole requested review from dabacon and pavoljuhas July 9, 2022 08:09

vtomole and others added 2 commits July 11, 2022 16:35

Fix merge conflicts

de5c3cc

Merge branch 'master' into numpy

e831edb

dabacon approved these changes Jul 12, 2022

View reviewed changes

vtomole added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jul 12, 2022

CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jul 12, 2022

Merge branch 'master' into numpy

cce5515

CirqBot merged commit 89a5323 into quantumlib:master Jul 12, 2022

CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jul 12, 2022

CirqBot removed the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jul 12, 2022

vtomole deleted the numpy branch July 12, 2022 06:37

rht pushed a commit to rht/Cirq that referenced this pull request May 1, 2023

More numpy types (quantumlib#5683)

05790ed

12 errors left Part of quantumlib#3767

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More numpy types #5683

More numpy types #5683

vtomole commented Jul 8, 2022 •

edited

dabacon Jul 8, 2022

vtomole Jul 9, 2022

dabacon Jul 8, 2022

vtomole Jul 9, 2022

dabacon Jul 8, 2022

vtomole Jul 9, 2022

dabacon Jul 8, 2022

dabacon Jul 8, 2022

dabacon Jul 8, 2022

vtomole Jul 9, 2022

dabacon Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

vtomole Jul 9, 2022 •

edited

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

pavoljuhas Jul 8, 2022

vtomole Jul 9, 2022

dabacon left a comment

		@@ -1592,7 +1592,7 @@ def _control_keys_(self) -> FrozenSet['cirq.MeasurementKey']:


		def _overlap_collision_time(
		c1: Sequence['cirq.Moment'], c2: Sequence['cirq.Moment'], align: 'cirq.Alignment'

	random_state.parse_random_state(np.random) if prng is None else prng
	random_state.parse_random_state(prng)

More numpy types #5683

More numpy types #5683

Conversation

vtomole commented Jul 8, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vtomole Jul 9, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dabacon left a comment

Choose a reason for hiding this comment

vtomole commented Jul 8, 2022 •

edited

vtomole Jul 9, 2022 •

edited