cirq-core 1.5.0.dev20250124083125__py3-none-any.whl → 1.5.0.dev20250128015450__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 10, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.5.0.dev20250124083125"
+__version__ = "1.5.0.dev20250128015450"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version():
-    assert cirq.__version__ == "1.5.0.dev20250124083125"
+    assert cirq.__version__ == "1.5.0.dev20250128015450"

cirq/devices/grid_qubit.py

@@ -34,11 +34,9 @@ class _BaseGridQid(ops.Qid):
     _col: int
     _dimension: int
     _comp_key: Optional[Tuple[int, int]] = None
-    _hash: Optional[int] = None
+    _hash: int
 
     def __hash__(self) -> int:
-        if self._hash is None:
-            self._hash = ((self._dimension - 2) * 1_000_003 + self._col) * 1_000_003 + self._row
         return self._hash
 
     def __eq__(self, other) -> bool:
@@ -215,6 +213,9 @@ class GridQid(_BaseGridQid):
             dimension: The dimension of the qid's Hilbert space, i.e.
                 the number of quantum levels.
         """
+        row = int(row)
+        col = int(col)
+        dimension = int(dimension)
         key = (row, col, dimension)
         inst = cls._cache.get(key)
         if inst is None:
@@ -223,6 +224,7 @@ class GridQid(_BaseGridQid):
             inst._row = row
             inst._col = col
             inst._dimension = dimension
+            inst._hash = ((dimension - 2) * 1_000_003 + col) * 1_000_003 + row
             cls._cache[key] = inst
         return inst
 
@@ -378,12 +380,15 @@ class GridQubit(_BaseGridQid):
             row: the row coordinate
             col: the column coordinate
         """
+        row = int(row)
+        col = int(col)
         key = (row, col)
         inst = cls._cache.get(key)
         if inst is None:
             inst = super().__new__(cls)
             inst._row = row
             inst._col = col
+            inst._hash = col * 1_000_003 + row
             cls._cache[key] = inst
         return inst
 

cirq/devices/grid_qubit_test.py

@@ -391,3 +391,24 @@ def test_immutable():
 def test_complex():
     assert complex(cirq.GridQubit(row=1, col=2)) == 2 + 1j
     assert isinstance(complex(cirq.GridQubit(row=1, col=2)), complex)
+
+
+def test_numpy_index():
+    np5, np6, np3 = [np.int64(i) for i in [5, 6, 3]]
+    q = cirq.GridQubit(np5, np6)
+    hash(q)  # doesn't throw
+    assert q.row == 5
+    assert q.col == 6
+    assert q.dimension == 2
+    assert isinstance(q.row, int)
+    assert isinstance(q.col, int)
+    assert isinstance(q.dimension, int)
+
+    q = cirq.GridQid(np5, np6, dimension=np3)
+    hash(q)  # doesn't throw
+    assert q.row == 5
+    assert q.col == 6
+    assert q.dimension == 3
+    assert isinstance(q.row, int)
+    assert isinstance(q.col, int)
+    assert isinstance(q.dimension, int)

cirq/devices/line_qubit.py

@@ -30,11 +30,9 @@ class _BaseLineQid(ops.Qid):
 
     _x: int
     _dimension: int
-    _hash: Optional[int] = None
+    _hash: int
 
     def __hash__(self) -> int:
-        if self._hash is None:
-            self._hash = (self._dimension - 2) * 1_000_003 + self._x
         return self._hash
 
     def __eq__(self, other) -> bool:
@@ -193,6 +191,8 @@ class LineQid(_BaseLineQid):
             dimension: The dimension of the qid's Hilbert space, i.e.
                 the number of quantum levels.
         """
+        x = int(x)
+        dimension = int(dimension)
         key = (x, dimension)
         inst = cls._cache.get(key)
         if inst is None:
@@ -200,6 +200,7 @@ class LineQid(_BaseLineQid):
             inst = super().__new__(cls)
             inst._x = x
             inst._dimension = dimension
+            inst._hash = (dimension - 2) * 1_000_003 + x
             cls._cache[key] = inst
         return inst
 
@@ -301,10 +302,12 @@ class LineQubit(_BaseLineQid):
         Args:
             x: The x coordinate.
         """
+        x = int(x)
         inst = cls._cache.get(x)
         if inst is None:
             inst = super().__new__(cls)
             inst._x = x
+            inst._hash = x
             cls._cache[x] = inst
         return inst
 

cirq/devices/line_qubit_test.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import numpy as np
 import pytest
 
 import cirq
@@ -284,3 +285,20 @@ def test_numeric():
     assert isinstance(int(cirq.LineQubit(x=5)), int)
     assert isinstance(float(cirq.LineQubit(x=5)), float)
     assert isinstance(complex(cirq.LineQubit(x=5)), complex)
+
+
+def test_numpy_index():
+    np5 = np.int64(5)
+    q = cirq.LineQubit(np5)
+    assert hash(q) == 5
+    assert q.x == 5
+    assert q.dimension == 2
+    assert isinstance(q.x, int)
+    assert isinstance(q.dimension, int)
+
+    q = cirq.LineQid(np5, np.int64(3))
+    hash(q)  # doesn't throw
+    assert q.x == 5
+    assert q.dimension == 3
+    assert isinstance(q.x, int)
+    assert isinstance(q.dimension, int)

{cirq_core-1.5.0.dev20250124083125.dist-info → cirq_core-1.5.0.dev20250128015450.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20250124083125
+Version: 1.5.0.dev20250128015450
 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
@@ -12,12 +12,12 @@ Requires-Python: >=3.10.0
 License-File: LICENSE
 Requires-Dist: attrs>=21.3.0
 Requires-Dist: duet>=0.2.8
-Requires-Dist: matplotlib~=3.0
-Requires-Dist: networkx>=2.4
-Requires-Dist: numpy>=1.24
-Requires-Dist: pandas
+Requires-Dist: matplotlib~=3.7
+Requires-Dist: networkx~=3.1
+Requires-Dist: numpy>=1.25
+Requires-Dist: pandas~=2.0
 Requires-Dist: sortedcontainers~=2.0
-Requires-Dist: scipy~=1.8
+Requires-Dist: scipy~=1.11
 Requires-Dist: sympy
 Requires-Dist: typing-extensions>=4.2
 Requires-Dist: tqdm

{cirq_core-1.5.0.dev20250124083125.dist-info → cirq_core-1.5.0.dev20250128015450.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=Qq3ZcfgD-Nb81cEppQdJqhAyrVqXKtfXZYGXT0p-Wh0,34718
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=JHzy1sBc8gxV0tc2C6keMIRShBtpgrGSEp7liraq2DU,1206
-cirq/_version_test.py,sha256=6gCIKSIrQjkIsGLbNAytGUQNjpfyatTFUpwJ_OmIJj8,147
+cirq/_version.py,sha256=iTOQbP9YXb61j6NflYwPs5gQxqqJ9BSPMuPrAbJ85no,1206
+cirq/_version_test.py,sha256=U9Js-xnrPJPn6ON3wX3bWEJFzRbd74PQar559MXErt8,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=p-vEOa-8GQ2cFIAdze-kd6C1un1uRvtujVPljVKaHBg,13557
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -157,12 +157,12 @@ cirq/devices/device.py,sha256=9rUZwpbbmqk8AUVH4N4KfJ59j5im7hVgDJAHtN9iH_0,5361
 cirq/devices/device_test.py,sha256=v3gT6jrGLLfYnZbTizIaIMkI3s5_xVM3OV9JQchvAxY,1124
 cirq/devices/grid_device_metadata.py,sha256=h4Xo_PaiZqQSVUgb1ctVtYYYE2tNik2KQhCgooilZrE,8629
 cirq/devices/grid_device_metadata_test.py,sha256=IeOqYOZcUGhB4ivuQW2g0Q9dt-zFA0H6Dav6yv6Lul0,8592
-cirq/devices/grid_qubit.py,sha256=ynJYYih1QcZPLuNQYbooJWvSruhlep6qKFdiwdfVuSk,18819
-cirq/devices/grid_qubit_test.py,sha256=EzI8dWWnCfYbwruwsKlBzb41lQTA6AEOB2X16oQAz-0,14044
+cirq/devices/grid_qubit.py,sha256=7Pvy5FXwOJPxN-EDrEaS3Jip_2PLEeih8uZHYgcgsHM,18927
+cirq/devices/grid_qubit_test.py,sha256=qC7AEp9r8-KWSRiM-GMua8rYAyPWFLSq8dedLjwf6Ks,14621
 cirq/devices/insertion_noise_model.py,sha256=-X07pSTp-lxQj6AQT_89gTHx_jKtI9GSMrD4dozCwTs,3614
 cirq/devices/insertion_noise_model_test.py,sha256=i9jB257VXO5wi5QdDO5G4tphx5RKMaouUsdsQT3kiBU,3992
-cirq/devices/line_qubit.py,sha256=SFN7VaxVhcEnH9VPtqPeQ3Aygp0xa8kZ0yntkI_DiVc,11836
-cirq/devices/line_qubit_test.py,sha256=_X1ofFHtuo0myFfsu1nlTJf9OLuLWRgZHHW2VG23ERY,9547
+cirq/devices/line_qubit.py,sha256=XXZl1WfqOl4PuTgZTbijtwMxzZoB77t3_C-c8XAExBA,11876
+cirq/devices/line_qubit_test.py,sha256=1smZ8Jvf8y0KkLM-zuDWg_TH05nwF07WxZORD1z-6Es,9975
 cirq/devices/named_topologies.py,sha256=grFXvi0UDHZl1pRyHDWSqjub3xF_Yf7RLXfMAZbyoEA,15790
 cirq/devices/named_topologies_test.py,sha256=Nj_tlGmqPH7IVUzpUHPnAPlfUWhSGbZsIHdsLLjxIZs,4736
 cirq/devices/noise_model.py,sha256=c00mxBd7ZYw8k-cCoKgF5ePI8WKcPyJS925NarivIRI,11339
@@ -1202,8 +1202,8 @@ cirq/work/sampler.py,sha256=bE5tmVkcR6cZZMLETxDfHehdsYUMbx2RvBeIBetehI4,19187
 cirq/work/sampler_test.py,sha256=hL2UWx3dz2ukZVNxWftiKVvJcQoLplLZdQm-k1QcA40,13282
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20250124083125.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20250124083125.dist-info/METADATA,sha256=Ygd4x48Fml3TYoTGIMPuS7MJxEz0XEbqwsp-G6E-Umw,2105
-cirq_core-1.5.0.dev20250124083125.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20250124083125.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20250124083125.dist-info/RECORD,,
+cirq_core-1.5.0.dev20250128015450.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20250128015450.dist-info/METADATA,sha256=6NiGo0MXejAjWylDjH87jgmWAs8EkhObEy0dSMyRWn8,2111
+cirq_core-1.5.0.dev20250128015450.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20250128015450.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20250128015450.dist-info/RECORD,,