cirq-core 1.7.0.dev20251014004317__py3-none-any.whl → 1.7.0.dev20251015163408__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.7.0.dev20251014004317"
+__version__ = "1.7.0.dev20251015163408"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.7.0.dev20251014004317"
+    assert cirq.__version__ == "1.7.0.dev20251015163408"

cirq/ops/eigen_gate.py

@@ -346,11 +346,12 @@ class EigenGate(raw_types.Gate):
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> EigenGate:
         exponent = resolver.value_of(self._exponent, recursive)
-        if isinstance(exponent, numbers.Complex):
-            if isinstance(exponent, numbers.Real):
-                exponent = float(exponent)
-            else:
-                raise ValueError(f'Complex exponent {exponent} not supported for EigenGate')
+        # Note that int/float checking is purposely done first,
+        # since numbers instance checking is somewhat slow.
+        if isinstance(exponent, (int, float)) or isinstance(exponent, numbers.Real):  # noqa: SIM101
+            exponent = float(exponent)
+        elif isinstance(exponent, numbers.Complex):
+            raise ValueError(f'Complex exponent {exponent} not supported for EigenGate')
         return self._with_exponent(exponent=exponent)
 
     def _equal_up_to_global_phase_(self, other, atol):

cirq/ops/phased_x_gate.py

@@ -176,12 +176,12 @@ class PhasedXPowGate(raw_types.Gate):
         """See `cirq.SupportsParameterization`."""
         phase_exponent = resolver.value_of(self._phase_exponent, recursive)
         exponent = resolver.value_of(self._exponent, recursive)
-        if isinstance(phase_exponent, numbers.Complex):
+        if not isinstance(phase_exponent, float) and isinstance(phase_exponent, numbers.Complex):
             if isinstance(phase_exponent, numbers.Real):
                 phase_exponent = float(phase_exponent)
             else:
                 raise ValueError(f'PhasedXPowGate does not support complex value {phase_exponent}')
-        if isinstance(exponent, numbers.Complex):
+        if not isinstance(exponent, float) and isinstance(exponent, numbers.Complex):
             if isinstance(exponent, numbers.Real):
                 exponent = float(exponent)
             else:

cirq/ops/phased_x_z_gate.py

@@ -231,17 +231,19 @@ class PhasedXZGate(raw_types.Gate):
         z_exponent = resolver.value_of(self._z_exponent, recursive)
         x_exponent = resolver.value_of(self._x_exponent, recursive)
         axis_phase_exponent = resolver.value_of(self._axis_phase_exponent, recursive)
-        if isinstance(z_exponent, numbers.Complex):
+        if not isinstance(z_exponent, float) and isinstance(z_exponent, numbers.Complex):
             if isinstance(z_exponent, numbers.Real):
                 z_exponent = float(z_exponent)
             else:
                 raise ValueError(f'Complex exponent {z_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(x_exponent, numbers.Complex):
+        if not isinstance(x_exponent, float) and isinstance(x_exponent, numbers.Complex):
             if isinstance(x_exponent, numbers.Real):
                 x_exponent = float(x_exponent)
             else:
                 raise ValueError(f'Complex exponent {x_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(axis_phase_exponent, numbers.Complex):
+        if not isinstance(axis_phase_exponent, float) and isinstance(
+            axis_phase_exponent, numbers.Complex
+        ):
             if isinstance(axis_phase_exponent, numbers.Real):
                 axis_phase_exponent = float(axis_phase_exponent)
             else:

cirq/protocols/resolve_parameters.py

@@ -169,14 +169,8 @@ def resolve_parameters(
         return val
 
     # Ensure it is a dictionary wrapped in a ParamResolver.
-    param_resolver = study.ParamResolver(param_resolver)
-
-    # Handle special cases for sympy expressions and sequences.
-    # These may not in fact preserve types, but we pretend they do by casting.
-    if isinstance(val, sympy.Expr):
-        return cast(T, param_resolver.value_of(val, recursive))
-    if isinstance(val, (list, tuple)):
-        return cast(T, type(val)(resolve_parameters(e, param_resolver, recursive) for e in val))
+    if not isinstance(param_resolver, study.ParamResolver):
+        param_resolver = study.ParamResolver(param_resolver)
 
     is_parameterized = (
         val._is_parameterized_() if hasattr(val, '_is_parameterized_') else NotImplemented
@@ -192,8 +186,15 @@ def resolve_parameters(
 
     if result is not NotImplemented:
         return result
-    else:
-        return val
+
+    # Handle special cases for sympy expressions and sequences.
+    # These may not in fact preserve types, but we pretend they do by casting.
+    if isinstance(val, sympy.Expr):
+        return cast(T, param_resolver.value_of(val, recursive))
+    if isinstance(val, (list, tuple)):
+        return cast(T, type(val)(resolve_parameters(e, param_resolver, recursive) for e in val))
+
+    return val
 
 
 def resolve_parameters_once(val: T, param_resolver: cirq.ParamResolverOrSimilarType) -> T:

cirq/study/resolver.py

@@ -118,21 +118,16 @@ class ParamResolver:
             sympy.SympifyError: If the resulting value cannot be interpreted.
         """
 
-        # Input is a pass through type, no resolution needed: return early
-        v = _resolve_value(value)
-        if v is not NotImplemented:
-            return v
-
         # Handle string or symbol
         if isinstance(value, (str, sympy.Symbol)):
             string = value if isinstance(value, str) else value.name
-            symbol = value if isinstance(value, sympy.Symbol) else sympy.Symbol(value)
             param_value = self._param_dict.get(string, _NOT_FOUND)
             if param_value is _NOT_FOUND:
+                symbol = value if isinstance(value, sympy.Symbol) else sympy.Symbol(value)
                 param_value = self._param_dict.get(symbol, _NOT_FOUND)
-            if param_value is _NOT_FOUND:
-                # Symbol or string cannot be resolved if not in param dict; return as symbol.
-                return symbol
+                if param_value is _NOT_FOUND:
+                    # Symbol or string cannot be resolved if not in param dict; return as symbol.
+                    return symbol
             v = _resolve_value(param_value)
             if v is not NotImplemented:
                 return v
@@ -144,6 +139,11 @@ class ParamResolver:
                 param_value = self._value_of_recursive(value)
             return param_value
 
+        # Input is a pass through type, no resolution needed: return early
+        v = _resolve_value(value)
+        if v is not NotImplemented:
+            return v
+
         if not isinstance(value, sympy.Basic):
             # No known way to resolve this variable, return unchanged.
             return value
@@ -278,7 +278,7 @@ class ParamResolver:
 
 
 def _resolve_value(val: Any) -> Any:
-    if val is None:
+    if val is None or isinstance(val, float):
         return val
     if isinstance(val, numbers.Number) and not isinstance(val, sympy.Basic):
         return val

{cirq_core-1.7.0.dev20251014004317.dist-info → cirq_core-1.7.0.dev20251015163408.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20251014004317
+Version: 1.7.0.dev20251015163408
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.7.0.dev20251014004317.dist-info → cirq_core-1.7.0.dev20251015163408.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=emXpdD5ZvwLRlFAoQB8YatmZyU3b4e9jg6FppMTUhkU,33900
 cirq/_doc.py,sha256=28ZskY9ZtZ_4GS1oXPUgklKnJqmAE-rkUfzcsJ0--nA,2941
 cirq/_import.py,sha256=ixBu4EyGl46Ram2cP3p5eZVEFDW5L2DS-VyTjz4N9iw,8429
 cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
-cirq/_version.py,sha256=blS-qvfrBok-PsDZQ0mUdfwq4LYSli5ihX2IfcrOChU,1206
-cirq/_version_test.py,sha256=B1qau5-2ZH8eOXSw5NFc_5MoYtvoKuoXqkZt0yF6arQ,155
+cirq/_version.py,sha256=c5ZeIHOWJZrUCXn3gn88r-qLqp9FbzhrJIJP_wqwDwM,1206
+cirq/_version_test.py,sha256=-pmMHgmLb0_cTfy7ToIGkWjXExGEO1H8isgOEKdV-BA,155
 cirq/conftest.py,sha256=wSDKNdIQRDfLnXvOCWD3erheOw8JHRhdfQ53EyTUIXg,1239
 cirq/json_resolver_cache.py,sha256=A5DIgFAY1hUNt9vai_C3-gGBv24116CJMzQxMcXOax4,13726
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -312,7 +312,7 @@ cirq/ops/dense_pauli_string.py,sha256=sRf2O62YXSedbOYyKSfS5qQbTaunC6BH6AobmX72nP
 cirq/ops/dense_pauli_string_test.py,sha256=t4kl_8QdXnAbM3Bs-RpO-_fjtGZ1LSRl1UbXWJMX8Kc,23159
 cirq/ops/diagonal_gate.py,sha256=HNMxcgKgfZ2ZcXGaPhcBp6yOwu_stpSN3_GtNeWnR5s,8909
 cirq/ops/diagonal_gate_test.py,sha256=JRQWrL4cEYzVjwal-EewyIPgThUwLdrE6f9i7ifd6Rk,6319
-cirq/ops/eigen_gate.py,sha256=OoUpOwHw6VZ2CpH0Qb-eQLD4c-cjj8wFwBr8NEc7C0g,17788
+cirq/ops/eigen_gate.py,sha256=A8WcBS3AVCbZ3KcJ2f39liCMOn59uhmTn4h0sSzxDyw,17938
 cirq/ops/eigen_gate_test.py,sha256=k48rIbYKUErElQBfiV8cNGcKRnO6_vSJtghDxm-rflA,16772
 cirq/ops/fourier_transform.py,sha256=JMledJB0tPjLlIlG9bfapJSqass94rXkAheXragQxq8,7455
 cirq/ops/fourier_transform_test.py,sha256=fum4Kyxqb8AcAsELZsZcmkzbyzB7zf3cH1b32R5LFQ4,6331
@@ -368,9 +368,9 @@ cirq/ops/permutation_gate.py,sha256=mTCKrLSNP3nm2hPebfBJNR5mHO6qb1ZqDT3pFA0zM_M,
 cirq/ops/permutation_gate_test.py,sha256=HgXqFoDbhl0EcFbpr0Lj7dA0UxleQ_m_JZ96HfdCZyc,3381
 cirq/ops/phased_iswap_gate.py,sha256=AQIPHurGVx4ccinrT8UZc9bZT9yX53Q4PlBk4uaqrGw,8939
 cirq/ops/phased_iswap_gate_test.py,sha256=hRcyf2QHCExKO-XmZ9_2TV8DePBESEgM-CEB5bn-ZfY,7516
-cirq/ops/phased_x_gate.py,sha256=ffIRnS_84saQYuwD4wsbEL2i11RXJ7XmxxRteWOwd68,9247
+cirq/ops/phased_x_gate.py,sha256=fShc7xTIY6dnVmc6iC7L7XId1yDHLiE_iCzm5oQdKxg,9325
 cirq/ops/phased_x_gate_test.py,sha256=lQ6UV9X52joByV_SLzNceO785uVY5wSqlba8tMpzHSA,10976
-cirq/ops/phased_x_z_gate.py,sha256=88P8w-XdrV-y5n0q3_wci_BmMCZ5BOW4c8eDPjVyrQg,11446
+cirq/ops/phased_x_z_gate.py,sha256=fQmWXhqH9xISfTeLUA9scLsvnVD3jTA4wKDpj2P8EVI,11591
 cirq/ops/phased_x_z_gate_test.py,sha256=ZmV0NdJJMzile88bRHYGYPXxOP785fW_Tn4tCxbphPY,10876
 cirq/ops/projector.py,sha256=xxt3YhomvLfQjFWlU7yeKHTbPlgBHGQUcfiSbMxlIQk,5645
 cirq/ops/projector_test.py,sha256=vphfIBPkrEPXj4I6B_IPM84wOW-DsETSR9ua4lDioF4,9232
@@ -447,7 +447,7 @@ cirq/protocols/qasm.py,sha256=njxlAUNwzQfyZXn3Uwk4z6HvcXb6vgcRsRpFRLTNutY,7186
 cirq/protocols/qasm_test.py,sha256=HirWOanvVpqd9aT9s8etKBvfjbEKfpnro8Vyrq7WELc,2277
 cirq/protocols/qid_shape_protocol.py,sha256=JTzhzsz_hNe7QYMLSoJbLacolXj8WrtF5_3Xim_mctc,7652
 cirq/protocols/qid_shape_protocol_test.py,sha256=qCocF8pVb6U27lnHJiRkRRDQSgA59KvwXr6RxGEixXI,2347
-cirq/protocols/resolve_parameters.py,sha256=wuLE9cyigtWF6bptIc9rhS7xG9-KQCNCZ3H14_Grd3I,7402
+cirq/protocols/resolve_parameters.py,sha256=5E2PzG317AdSeYXwu8lNj3PT7xNu3px_-sZsljgl3Ys,7453
 cirq/protocols/resolve_parameters_test.py,sha256=2R2T2p4NkbD4IV2_4i8WkvSHu3OqjXo-Bf856Rwb-3w,4933
 cirq/protocols/trace_distance_bound.py,sha256=xF_qfkFV_T7O3-5lBITupq6ulBYuzFXDHaYDv7it96E,4150
 cirq/protocols/trace_distance_bound_test.py,sha256=0bI9uYttJj5eayM05kShPh9qkxeKG1egcZ9fXJPZWNU,1980
@@ -982,7 +982,7 @@ cirq/sim/clifford/stabilizer_state_ch_form_test.py,sha256=UuvgpwexGB5LzMfaa3Gws2
 cirq/study/__init__.py,sha256=OyJhZjBiEkNbtSuSZaOwHGwwnOIGgnn-W8ec0xHhHBI,1647
 cirq/study/flatten_expressions.py,sha256=q9U-AukDri63yC4pF_dEKCX81RfquK4z31ktLkL0gz0,15528
 cirq/study/flatten_expressions_test.py,sha256=ONYcsFoL7Re7IsySwXgnnIlrWCuUu1ds2f90-2uNj1c,6202
-cirq/study/resolver.py,sha256=TozodaKHKobwTKVR3g3DblzPljTrErAxVHryZVwpraQ,11747
+cirq/study/resolver.py,sha256=KDaG4kK3iO3Y3DFgEZZpKi4Lnco9sKSHm-xydMbP6X4,11789
 cirq/study/resolver_test.py,sha256=LY1h8RCPY4d_8O5hprRcIf3HFhzODQrMbUrmwmt1fbM,10727
 cirq/study/result.py,sha256=ci9Pg9IW4OMR4aZ4SaQ7TPVTgoSU-1WarjKEXBv2F2g,19214
 cirq/study/result_test.py,sha256=VdzUNYcyIwFmoaaj9Ahi8jzepwH3TrN4JEY-JHECgBs,15805
@@ -1244,8 +1244,8 @@ cirq/work/sampler.py,sha256=rxbMWvrhu3gfNSBjZKozw28lLKVvBAS_1EGyPdYe8Xg,19041
 cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=Fs2JWwq0n9zv7_G5Rm-9vPeHUag7uctcMOHg0JTkZpc,2371
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.7.0.dev20251014004317.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20251014004317.dist-info/METADATA,sha256=qPQ40xKJGC8eKexGd6cSuTxEtYuKvG02P0j4uyt7buY,4757
-cirq_core-1.7.0.dev20251014004317.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20251014004317.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20251014004317.dist-info/RECORD,,
+cirq_core-1.7.0.dev20251015163408.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20251015163408.dist-info/METADATA,sha256=gOS7HmBv-_0l_iUcbO_zbpQZdLLSQQz4F4HazS4JPLU,4757
+cirq_core-1.7.0.dev20251015163408.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20251015163408.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20251015163408.dist-info/RECORD,,