cirq-core 1.5.0.dev20241105230840__py3-none-any.whl → 1.5.0.dev20241105235147__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.dev20241105230840"
+__version__ = "1.5.0.dev20241105235147"

cirq/_version_test.py

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

cirq/work/sampler.py

@@ -14,19 +14,7 @@
 """Abstract base class for things sampling quantum circuits."""
 
 import collections
-from itertools import islice
-from typing import (
-    Dict,
-    FrozenSet,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    TYPE_CHECKING,
-    Union,
-)
+from typing import Dict, FrozenSet, List, Optional, Sequence, Tuple, TypeVar, TYPE_CHECKING, Union
 
 import duet
 import pandas as pd
@@ -49,14 +37,6 @@ T = TypeVar('T')
 class Sampler(metaclass=value.ABCMetaImplementAnyOneOf):
     """Something capable of sampling quantum circuits. Simulator or hardware."""
 
-    # Users have a rate limit of 1000 QPM for read/write requests to
-    # the Quantum Engine. The sampler will poll from the DB every 1s
-    # for inflight requests for results. Empirically, for circuits
-    # sent in run_batch, sending circuits in CHUNK_SIZE=5 for large
-    # number of circuits (> 200) with large depths (100 layers)
-    # does not encounter quota exceeded issues for non-streaming cases.
-    CHUNK_SIZE: int = 5
-
     def run(
         self,
         program: 'cirq.AbstractCircuit',
@@ -311,32 +291,16 @@ class Sampler(metaclass=value.ABCMetaImplementAnyOneOf):
         programs: Sequence['cirq.AbstractCircuit'],
         params_list: Optional[Sequence['cirq.Sweepable']] = None,
         repetitions: Union[int, Sequence[int]] = 1,
+        limiter: duet.Limiter = duet.Limiter(10),
     ) -> Sequence[Sequence['cirq.Result']]:
         """Runs the supplied circuits asynchronously.
 
         See docs for `cirq.Sampler.run_batch`.
         """
         params_list, repetitions = self._normalize_batch_args(programs, params_list, repetitions)
-        if len(programs) <= self.CHUNK_SIZE:
-            return await duet.pstarmap_async(
-                self.run_sweep_async, zip(programs, params_list, repetitions)
-            )
-
-        results = []
-        for program_chunk, params_chunk, reps_chunk in zip(
-            _chunked(programs, self.CHUNK_SIZE),
-            _chunked(params_list, self.CHUNK_SIZE),
-            _chunked(repetitions, self.CHUNK_SIZE),
-        ):
-            # Run_sweep_async for the current chunk
-            await duet.sleep(1)  # Delay for 1 second between chunk
-            results.extend(
-                await duet.pstarmap_async(
-                    self.run_sweep_async, zip(program_chunk, params_chunk, reps_chunk)
-                )
-            )
-
-        return results
+        return await duet.pstarmap_async(
+            self.run_sweep_async, zip(programs, params_list, repetitions, [limiter] * len(programs))
+        )
 
     def _normalize_batch_args(
         self,
@@ -489,8 +453,3 @@ class Sampler(metaclass=value.ABCMetaImplementAnyOneOf):
                     )
                 num_instances[key] += 1
         return {k: (num_instances[k], qid_shape) for k, qid_shape in qid_shapes.items()}
-
-
-def _chunked(iterable: Sequence[T], n: int) -> Iterator[tuple[T, ...]]:
-    it = iter(iterable)
-    return iter(lambda: tuple(islice(it, n)), ())

cirq/work/sampler_test.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Tests for cirq.Sampler."""
 from typing import Sequence
-from unittest import mock
 
 import pytest
 
@@ -224,7 +223,9 @@ async def test_run_batch_async_calls_run_sweep_asynchronously():
     params_list = [params1, params2]
 
     class AsyncSampler(cirq.Sampler):
-        async def run_sweep_async(self, program, params, repetitions: int = 1):
+        async def run_sweep_async(
+            self, program, params, repetitions: int = 1, unused: duet.Limiter = duet.Limiter(None)
+        ):
             if params == params1:
                 await duet.sleep(0.001)
 
@@ -267,55 +268,6 @@ def test_sampler_run_batch_bad_input_lengths():
         )
 
 
-@mock.patch('duet.pstarmap_async')
-@pytest.mark.parametrize('call_count', [1, 2, 3])
-@duet.sync
-async def test_run_batch_async_sends_circuits_in_chunks(spy, call_count):
-    class AsyncSampler(cirq.Sampler):
-        CHUNK_SIZE = 3
-
-        async def run_sweep_async(self, _, params, __: int = 1):
-            pass  # pragma: no cover
-
-    sampler = AsyncSampler()
-    a = cirq.LineQubit(0)
-    circuit_list = [cirq.Circuit(cirq.X(a) ** sympy.Symbol('t'), cirq.measure(a, key='m'))] * (
-        sampler.CHUNK_SIZE * call_count
-    )
-    param_list = [cirq.Points('t', [0.3, 0.7])] * (sampler.CHUNK_SIZE * call_count)
-
-    await sampler.run_batch_async(circuit_list, params_list=param_list)
-
-    assert spy.call_count == call_count
-
-
-@pytest.mark.parametrize('call_count', [1, 2, 3])
-@duet.sync
-async def test_run_batch_async_runs_runs_sequentially(call_count):
-    a = cirq.LineQubit(0)
-    finished = []
-    circuit1 = cirq.Circuit(cirq.X(a) ** sympy.Symbol('t'), cirq.measure(a, key='m'))
-    circuit2 = cirq.Circuit(cirq.Y(a) ** sympy.Symbol('t'), cirq.measure(a, key='m'))
-    params1 = cirq.Points('t', [0.3, 0.7])
-    params2 = cirq.Points('t', [0.4, 0.6])
-
-    class AsyncSampler(cirq.Sampler):
-        CHUNK_SIZE = 1
-
-        async def run_sweep_async(self, _, params, __: int = 1):
-            if params == params1:
-                await duet.sleep(0.001)
-
-            finished.append(params)
-
-    sampler = AsyncSampler()
-    circuit_list = [circuit1, circuit2] * call_count
-    param_list = [params1, params2] * call_count
-    await sampler.run_batch_async(circuit_list, params_list=param_list)
-
-    assert finished == param_list
-
-
 def test_sampler_simple_sample_expectation_values():
     a = cirq.LineQubit(0)
     sampler = cirq.Simulator()

{cirq_core-1.5.0.dev20241105230840.dist-info → cirq_core-1.5.0.dev20241105235147.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241105230840
+Version: 1.5.0.dev20241105235147
 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.5.0.dev20241105230840.dist-info → cirq_core-1.5.0.dev20241105235147.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=Egw-bRc_502yPr1b9dEIaPhlLwRuHGpoFofmUfhPivQ,1206
-cirq/_version_test.py,sha256=QLgOnT6d8lEK3_BP7kwTsNu7XqS2_je85lQCW-nft20,147
+cirq/_version.py,sha256=Ey0ynXkiFaW1nBxhycPXoXoc89NAUMEyK-HXRacOgIk,1206
+cirq/_version_test.py,sha256=4W3uKdYhz6bv2jm6sEvcRfMrIGSsgznYr_IajXVGPUg,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=ytePZtNZgKjOF2NiVpUTuotB-JKZmQNOFIFdvXqsxHw,13271
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -1182,12 +1182,12 @@ cirq/work/observable_settings.py,sha256=OsZS8XvHT2LCFGkzu-wh1WShOx93I1nZ2K7uce-i
 cirq/work/observable_settings_test.py,sha256=hV3g5ld5OZchTjVMVL_8cLXsbSBMz5DAsE4Vui2xTuk,4233
 cirq/work/pauli_sum_collector.py,sha256=N1IsIwudBi84XWP1x7LNE2uQ6DGR2LFIWPhGbdHxaA4,4230
 cirq/work/pauli_sum_collector_test.py,sha256=aeo06iLIYZjWjN3C4loVHRYWpV35lSSlcX2cOVdt2Ss,2437
-cirq/work/sampler.py,sha256=3N_angFz4UKXRlsgp2sJq2wRx7yuEg9G9T8eP0joAkE,21082
-cirq/work/sampler_test.py,sha256=0HoptI2r-7yR5hmlvu6ykqkZ8TYO-lkIVvlv8yyDnDk,14885
+cirq/work/sampler.py,sha256=BDd1HrUOOcHBOvXNJqVX0vRcvmm8btZmZa5yYC5y8n0,19856
+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.dev20241105230840.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241105230840.dist-info/METADATA,sha256=mMGm8W6udg-_Ez9VBoxZgRjuZWwGnpyxfMPeA0K2flM,1992
-cirq_core-1.5.0.dev20241105230840.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-cirq_core-1.5.0.dev20241105230840.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241105230840.dist-info/RECORD,,
+cirq_core-1.5.0.dev20241105235147.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20241105235147.dist-info/METADATA,sha256=NGfDEt4BBBQBP6UV-QJxn3J-3Rn5d0diLKJ5vDrJyXo,1992
+cirq_core-1.5.0.dev20241105235147.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+cirq_core-1.5.0.dev20241105235147.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20241105235147.dist-info/RECORD,,