sinter 1.14.dev1712659430__tar.gz → 1.16.dev1768465883__tar.gz

sinter-1.16.dev1768465883/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include src *.py

{sinter-1.14.dev1712659430 → sinter-1.16.dev1768465883}/PKG-INFO

@@ -1,16 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sinter
-Version: 1.14.dev1712659430
+Version: 1.16.dev1768465883
 Summary: Samples stim circuits and decodes them using pymatching.
 Author: Craig Gidney
 Author-email: craig.gidney@gmail.com
 License: Apache 2
 Requires-Python: >=3.7.0
 Description-Content-Type: text/markdown
-Requires-Dist: matplotlib~=3.5
-Requires-Dist: numpy~=1.22
+Requires-Dist: matplotlib
+Requires-Dist: numpy
 Requires-Dist: stim
-Requires-Dist: scipy~=1.9
+Requires-Dist: scipy
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # sinter: fast QEC sampling
 

sinter-1.16.dev1768465883/requirements.txt

@@ -0,0 +1,4 @@
+matplotlib
+numpy
+stim
+scipy

{sinter-1.14.dev1712659430 → sinter-1.16.dev1768465883}/setup.py

@@ -19,7 +19,7 @@ with open('README.md', encoding='UTF-8') as f:
 with open('requirements.txt', encoding='UTF-8') as f:
     requirements = f.read().splitlines()
 
-__version__ = '1.14.dev1712659430'
+__version__ = '1.16.dev1768465883'
 
 setup(
     name='sinter',
@@ -27,7 +27,7 @@ setup(
     author='Craig Gidney',
     author_email='craig.gidney@gmail.com',
     license='Apache 2',
-    packages=['sinter'],
+    packages=['sinter', 'sinter._data', 'sinter._collection', 'sinter._command', 'sinter._decoding'],
     package_dir={'': 'src'},
     description='Samples stim circuits and decodes them using pymatching.',
     long_description=long_description,
@@ -37,6 +37,6 @@ setup(
     install_requires=requirements,
     tests_require=['pytest', 'pymatching'],
     entry_points={
-        'console_scripts': ['sinter=sinter._main:main'],
+        'console_scripts': ['sinter=sinter._command._main:main'],
     },
 )

{sinter-1.14.dev1712659430 → sinter-1.16.dev1768465883}/src/sinter/__init__.py

@@ -1,26 +1,27 @@
-__version__ = '1.14.dev1712659430'
+__version__ = '1.16.dev1768465883'
 
-from sinter._anon_task_stats import (
-    AnonTaskStats,
-)
 from sinter._collection import (
     collect,
     iter_collect,
     post_selection_mask_from_4th_coord,
     Progress,
 )
-from sinter._collection_options import (
+from sinter._data import (
+    AnonTaskStats,
     CollectionOptions,
-)
-from sinter._csv_out import (
     CSV_HEADER,
-)
-from sinter._decoding_all_built_in_decoders import (
-    BUILT_IN_DECODERS,
-)
-from sinter._existing_data import (
     read_stats_from_csv_files,
     stats_from_csv_files,
+    Task,
+    TaskStats,
+)
+from sinter._decoding import (
+    CompiledDecoder,
+    Decoder,
+    BUILT_IN_DECODERS,
+    BUILT_IN_SAMPLERS,
+    Sampler,
+    CompiledSampler,
 )
 from sinter._probability_util import (
     comma_separated_key_values,
@@ -38,19 +39,9 @@ from sinter._plotting import (
     plot_error_rate,
     group_by,
 )
-from sinter._task import (
-    Task,
-)
-from sinter._task_stats import (
-    TaskStats,
-)
 from sinter._predict import (
     predict_discards_bit_packed,
     predict_observables_bit_packed,
     predict_on_disk,
     predict_observables,
 )
-from sinter._decoding_decoder_class import (
-    CompiledDecoder,
-    Decoder,
-)

sinter-1.16.dev1768465883/src/sinter/_collection/__init__.py

@@ -0,0 +1,10 @@
+from sinter._collection._collection import (
+    collect,
+    iter_collect,
+    post_selection_mask_from_4th_coord,
+    post_selection_mask_from_predicate,
+    Progress,
+)
+from sinter._collection._printer import (
+    ThrottledProgressPrinter,
+)

{sinter-1.14.dev1712659430/src/sinter → sinter-1.16.dev1768465883/src/sinter/_collection}/_collection.py

@@ -1,19 +1,15 @@
 import contextlib
 import dataclasses
 import pathlib
-from typing import Any
-from typing import Callable, Iterator, Optional, Union, Iterable, List, TYPE_CHECKING, Tuple, Dict
+from typing import Any, Callable, Iterator, Optional, Union, Iterable, List, TYPE_CHECKING, Tuple, Dict
 
 import math
 import numpy as np
 import stim
 
-from sinter._collection_options import CollectionOptions
-from sinter._csv_out import CSV_HEADER
-from sinter._collection_work_manager import CollectionWorkManager
-from sinter._existing_data import ExistingData
-from sinter._printer import ThrottledProgressPrinter
-from sinter._task_stats import TaskStats
+from sinter._data import CSV_HEADER, ExistingData, TaskStats, CollectionOptions, Task
+from sinter._collection._collection_manager import CollectionManager
+from sinter._collection._printer import ThrottledProgressPrinter
 
 if TYPE_CHECKING:
     import sinter
@@ -42,7 +38,7 @@ def iter_collect(*,
                  tasks: Union[Iterator['sinter.Task'],
                               Iterable['sinter.Task']],
                  hint_num_tasks: Optional[int] = None,
-                 additional_existing_data: Optional[ExistingData] = None,
+                 additional_existing_data: Union[None, dict[str, 'TaskStats'], Iterable['TaskStats']] = None,
                  max_shots: Optional[int] = None,
                  max_errors: Optional[int] = None,
                  decoders: Optional[Iterable[str]] = None,
@@ -51,7 +47,7 @@ def iter_collect(*,
                  start_batch_size: Optional[int] = None,
                  count_observable_error_combos: bool = False,
                  count_detection_events: bool = False,
-                 custom_decoders: Optional[Dict[str, 'sinter.Decoder']] = None,
+                 custom_decoders: Optional[Dict[str, Union['sinter.Decoder', 'sinter.Sampler']]] = None,
                  custom_error_count_key: Optional[str] = None,
                  allowed_cpu_affinity_ids: Optional[Iterable[int]] = None,
                  ) -> Iterator['sinter.Progress']:
@@ -156,6 +152,19 @@ def iter_collect(*,
         >>> print(total_shots)
         200
     """
+    existing_data: dict[str, TaskStats]
+    if isinstance(additional_existing_data, ExistingData):
+        existing_data = additional_existing_data.data
+    elif isinstance(additional_existing_data, dict):
+        existing_data = additional_existing_data
+    elif additional_existing_data is None:
+        existing_data = {}
+    else:
+        acc = ExistingData()
+        for stat in additional_existing_data:
+            acc.add_sample(stat)
+        existing_data = acc.data
+
     if isinstance(decoders, str):
         decoders = [decoders]
 
@@ -166,50 +175,65 @@ def iter_collect(*,
         except TypeError:
             pass
 
-    with CollectionWorkManager(
-        tasks_iter=iter(tasks),
-        global_collection_options=CollectionOptions(
+    if decoders is not None:
+        old_tasks = tasks
+        tasks = (
+            Task(
+                circuit=task.circuit,
+                decoder=decoder,
+                detector_error_model=task.detector_error_model,
+                postselection_mask=task.postselection_mask,
+                postselected_observables_mask=task.postselected_observables_mask,
+                json_metadata=task.json_metadata,
+                collection_options=task.collection_options,
+                circuit_path=task.circuit_path,
+            )
+            for task in old_tasks
+            for decoder in (decoders if task.decoder is None else [task.decoder])
+        )
+
+    progress_log: list[Optional[TaskStats]] = []
+    def log_progress(e: Optional[TaskStats]):
+        progress_log.append(e)
+    with CollectionManager(
+        num_workers=num_workers,
+        tasks=tasks,
+        collection_options=CollectionOptions(
             max_shots=max_shots,
             max_errors=max_errors,
             max_batch_seconds=max_batch_seconds,
             start_batch_size=start_batch_size,
             max_batch_size=max_batch_size,
         ),
-        decoders=decoders,
+        existing_data=existing_data,
         count_observable_error_combos=count_observable_error_combos,
         count_detection_events=count_detection_events,
-        additional_existing_data=additional_existing_data,
-        custom_decoders=custom_decoders,
         custom_error_count_key=custom_error_count_key,
+        custom_decoders=custom_decoders or {},
         allowed_cpu_affinity_ids=allowed_cpu_affinity_ids,
+        worker_flush_period=max_batch_seconds or 120,
+        progress_callback=log_progress,
     ) as manager:
         try:
             yield Progress(
                 new_stats=(),
                 status_message=f"Starting {num_workers} workers..."
             )
-            manager.start_workers(num_workers)
-
-            yield Progress(
-                new_stats=(),
-                status_message="Finding work..."
-            )
-            manager.fill_work_queue()
-            yield Progress(
-                new_stats=(),
-                status_message=manager.status(num_circuits=hint_num_tasks)
-            )
-
-            while manager.fill_work_queue():
-                # Wait for a worker to finish a job.
-                sample = manager.wait_for_next_sample()
-                manager.fill_work_queue()
+            manager.start_workers()
+            manager.start_distributing_work()
+
+            while manager.task_states:
+                manager.process_message()
+                if progress_log:
+                    vals = list(progress_log)
+                    progress_log.clear()
+                    for e in vals:
+                        if e is not None:
+                            yield Progress(
+                                new_stats=(e,),
+                                status_message=manager.status_message(),
+                            )
 
-                # Report the incremental results.
-                yield Progress(
-                    new_stats=(sample,) if sample.shots > 0 else (),
-                    status_message=manager.status(num_circuits=hint_num_tasks),
-                )
         except KeyboardInterrupt:
             yield Progress(
                 new_stats=(),
@@ -234,7 +258,7 @@ def collect(*,
             start_batch_size: Optional[int] = None,
             print_progress: bool = False,
             hint_num_tasks: Optional[int] = None,
-            custom_decoders: Optional[Dict[str, 'sinter.Decoder']] = None,
+            custom_decoders: Optional[Dict[str, Union['sinter.Decoder', 'sinter.Sampler']]] = None,
             custom_error_count_key: Optional[str] = None,
             allowed_cpu_affinity_ids: Optional[Iterable[int]] = None,
             ) -> List['sinter.TaskStats']:
@@ -356,7 +380,7 @@ def collect(*,
     progress_printer = ThrottledProgressPrinter(
         outs=[],
         print_progress=print_progress,
-        min_progress_delay=1,
+        min_progress_delay=0.1,
     )
     with contextlib.ExitStack() as exit_stack:
         # Open save/resume file.