Eliminate need for using NumPy 2 printoptions()

Further study of the cases and the methods available in NumPy led to a
solution that doesn't require using `printoptions(legacy="1.25")` to
prevent data types from showing up in things like circuit diagrams.

Author: mhucka

cirq-core/cirq/_compat.py

@@ -192,8 +192,10 @@ def _print(self, expr, **kwargs):
     if hasattr(value, "__qualname__"):
         return f"{value.__module__}.{value.__qualname__}"
 
-    with np.printoptions(legacy='1.25'):
-        return repr(value)
+    if isinstance(value, np.number):
+        return repr(value.item())
+
+    return repr(value)
 
 
 def dataclass_repr(value: Any, namespace: str = 'cirq') -> str:

cirq-core/cirq/ops/fsim_gate.py

@@ -23,7 +23,7 @@
 
 import cmath
 import math
-from typing import AbstractSet, Any, Dict, Iterator, Optional, Tuple
+from typing import AbstractSet, Any, Dict, Iterator, Optional, Tuple, Union
 
 import numpy as np
 import sympy
@@ -52,6 +52,12 @@ def _half_pi_mod_pi(param: 'cirq.TParamVal') -> bool:
     return param in (-np.pi / 2, np.pi / 2, -sympy.pi / 2, sympy.pi / 2)
 
 
+def _plainvalue(value: Union[int, float, complex, np.number]) -> Union[int, float, complex]:
+    """Returns a plain Python number if the given value is a NumPy number.
+    Used to avoid a change in repr behavior introduced in NumPy 2."""
+    return value.item() if isinstance(value, np.number) else value
+
+
 @value.value_equality(approximate=True)
 class FSimGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
     r"""Fermionic simulation gate.
@@ -196,10 +202,9 @@ def _decompose_(self, qubits) -> Iterator['cirq.OP_TREE']:
         yield cirq.CZ(a, b) ** (-self.phi / np.pi)
 
     def _circuit_diagram_info_(self, args: 'cirq.CircuitDiagramInfoArgs') -> Tuple[str, ...]:
-        with np.printoptions(legacy='1.25'):
-            t = args.format_radians(self.theta)
-            p = args.format_radians(self.phi)
-            return f'FSim({t}, {p})', f'FSim({t}, {p})'
+        t = args.format_radians(_plainvalue(self.theta))
+        p = args.format_radians(_plainvalue(self.phi))
+        return f'FSim({t}, {p})', f'FSim({t}, {p})'
 
     def __pow__(self, power) -> 'FSimGate':
         return FSimGate(cirq.mul(self.theta, power), cirq.mul(self.phi, power))
@@ -477,16 +482,15 @@ def to_exponent(angle_rads: 'cirq.TParamVal') -> 'cirq.TParamVal':
         yield cirq.Z(q1) ** to_exponent(after[1])
 
     def _circuit_diagram_info_(self, args: 'cirq.CircuitDiagramInfoArgs') -> Tuple[str, ...]:
-        with np.printoptions(legacy='1.25'):
-            theta = args.format_radians(self.theta)
-            zeta = args.format_radians(self.zeta)
-            chi = args.format_radians(self.chi)
-            gamma = args.format_radians(self.gamma)
-            phi = args.format_radians(self.phi)
-            return (
-                f'PhFSim({theta}, {zeta}, {chi}, {gamma}, {phi})',
-                f'PhFSim({theta}, {zeta}, {chi}, {gamma}, {phi})',
-            )
+        theta = args.format_radians(_plainvalue(self.theta))
+        zeta = args.format_radians(_plainvalue(self.zeta))
+        chi = args.format_radians(_plainvalue(self.chi))
+        gamma = args.format_radians(_plainvalue(self.gamma))
+        phi = args.format_radians(_plainvalue(self.phi))
+        return (
+            f'PhFSim({theta}, {zeta}, {chi}, {gamma}, {phi})',
+            f'PhFSim({theta}, {zeta}, {chi}, {gamma}, {phi})',
+        )
 
     def __repr__(self) -> str:
         theta = proper_repr(self.theta)

cirq-core/cirq/protocols/circuit_diagram_info_protocol.py

@@ -243,14 +243,15 @@ def __repr__(self) -> str:
         )
 
     def format_real(self, val: Union[sympy.Basic, int, float]) -> str:
-        with np.printoptions(legacy='1.25'):
-            if isinstance(val, sympy.Basic):
-                return str(val)
-            if val == int(val):
-                return str(int(val))
-            if self.precision is None:
-                return str(val)
-            return f'{float(val):.{self.precision}}'
+        if isinstance(val, sympy.Basic):
+            return str(val)
+        if isinstance(val, np.number):
+            val = val.item()
+        if val == int(val):
+            return str(int(val))
+        if self.precision is None:
+            return str(val)
+        return f'{float(val):.{self.precision}}'
 
     def format_complex(self, val: Union[sympy.Basic, int, float, 'cirq.TParamValComplex']) -> str:
         if isinstance(val, sympy.Basic):