iterate

quantumlib · Dec 14, 2023 · d1821d8 · d1821d8
1 parent 028f048
commit d1821d8
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
     env:
       CIBW_BUILD: "${{ matrix.os_dist.dist }}"
       CIBW_ARCHS_MACOS: "${{ matrix.os_dist.macosarch }}"
-      CIBW_TEST_REQUIRES: pytest stim
+      CIBW_TEST_REQUIRES: pytest stim sinter
       CIBW_TEST_COMMAND: pytest {project}/src
     steps:
       - uses: actions/checkout@v3
@@ -107,27 +107,6 @@ jobs:
     - run: cmake . -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
     - run: cmake --build .
     - run: out/chromobius --help
-  build_lib:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: cmake .
-    - run: make libchromobius -j 2
-    - run: echo -e '#include "chromobius.h"\nint main(int argc,const char **argv) {return (int)(chromobius::obsmask_int)0;}' > test.cc
-    - run: g++ -std=c++20 test.cc out/libchromobius.a -I src
-    - run: ./a.out
-  build_lib_install:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: mkdir install_dir
-    - run: cmake . -DCMAKE_INSTALL_PREFIX=install_dir
-    - run: make -j 2
-    - run: make install
-    - run: echo -e '#include "chromobius.h"\nint main(int argc,const char **argv) {return (int)(chromobius::obsmask_int)0;}' > test.cc
-    - run: g++ -std=c++20 test.cc out/libchromobius.a -I install_dir/include
-    - run: ./a.out
-    - run: install_dir/bin/chromobius --help
   perf:
     runs-on: ubuntu-latest
     steps:

diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ build
 package_data
 .eggs
 dist
+MODULE.bazel
+MODULE.bazel.lock
diff --git a/doc/chromobius.pyi b/doc/chromobius.pyi
@@ -16,7 +16,7 @@ class CompiledDecoder:
         >>> import stim
         >>> import chromobius
         >>>
-        >>> dem = stim.Circuit("""
+        >>> dem = stim.Circuit('''
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
         ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -25,7 +25,7 @@ class CompiledDecoder:
         ...     DETECTOR(3, 0, 0, 1) rec[-1]
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """).detector_error_model()
+        ... ''').detector_error_model()
         ...
         ... decoder = chromobius.CompiledDecoder.from_dem(dem)
     """
@@ -70,7 +70,7 @@ class CompiledDecoder:
             >>> import stim
             >>> import chromobius
             >>>
-            >>> dem = stim.Circuit("""
+            >>> dem = stim.Circuit('''
             ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
             ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
             ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -79,7 +79,7 @@ class CompiledDecoder:
             ...     DETECTOR(3, 0, 0, 1) rec[-1]
             ...     M 0
             ...     OBSERVABLE_INCLUDE(0) rec[-1]
-            ... """).detector_error_model()
+            ... ''').detector_error_model()
             ...
             ... decoder = chromobius.CompiledDecoder.from_dem(dem)
         """
@@ -122,7 +122,7 @@ class CompiledDecoder:
             >>> import chromobius
             >>> import numpy as np
             >>>
-            >>> repetition_color_code = stim.Circuit("""
+            >>> repetition_color_code = stim.Circuit('''
             ...     # Apply noise.
             ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
             ...     # Measure three-body stabilizers to catch errors.
@@ -139,7 +139,7 @@ class CompiledDecoder:
             ...     # Check on the message.
             ...     M 0
             ...     OBSERVABLE_INCLUDE(0) rec[-1]
-            ... """)
+            ... ''')
             ...
             ... # Sample the circuit.
             ... shots = 4096
@@ -200,7 +200,7 @@ def compile_decoder_for_dem(
         >>> import stim
         >>> import chromobius
         >>>
-        >>> dem = stim.Circuit("""
+        >>> dem = stim.Circuit('''
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
         ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -209,7 +209,7 @@ def compile_decoder_for_dem(
         ...     DETECTOR(3, 0, 0, 1) rec[-1]
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """).detector_error_model()
+        ... ''').detector_error_model()
         ...
         ... decoder = chromobius.compile_decoder_for_dem(dem)
     """

diff --git a/doc/chromobius_api_reference.md b/doc/chromobius_api_reference.md
@@ -60,7 +60,7 @@ def compile_decoder_for_dem(
         >>> import stim
         >>> import chromobius
         >>>
-        >>> dem = stim.Circuit("""
+        >>> dem = stim.Circuit('''
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
         ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -69,7 +69,7 @@ def compile_decoder_for_dem(
         ...     DETECTOR(3, 0, 0, 1) rec[-1]
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """).detector_error_model()
+        ... ''').detector_error_model()
         ...
         ... decoder = chromobius.compile_decoder_for_dem(dem)
     """
@@ -105,7 +105,7 @@ class CompiledDecoder:
         >>> import stim
         >>> import chromobius
         >>>
-        >>> dem = stim.Circuit("""
+        >>> dem = stim.Circuit('''
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
         ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -114,7 +114,7 @@ class CompiledDecoder:
         ...     DETECTOR(3, 0, 0, 1) rec[-1]
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """).detector_error_model()
+        ... ''').detector_error_model()
         ...
         ... decoder = chromobius.CompiledDecoder.from_dem(dem)
     """
@@ -166,7 +166,7 @@ def from_dem(
         >>> import stim
         >>> import chromobius
         >>>
-        >>> dem = stim.Circuit("""
+        >>> dem = stim.Circuit('''
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
         ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -175,7 +175,7 @@ def from_dem(
         ...     DETECTOR(3, 0, 0, 1) rec[-1]
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """).detector_error_model()
+        ... ''').detector_error_model()
         ...
         ... decoder = chromobius.CompiledDecoder.from_dem(dem)
     """
@@ -225,7 +225,7 @@ def predict_obs_flips_from_dets_bit_packed(
         >>> import chromobius
         >>> import numpy as np
         >>>
-        >>> repetition_color_code = stim.Circuit("""
+        >>> repetition_color_code = stim.Circuit('''
         ...     # Apply noise.
         ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
         ...     # Measure three-body stabilizers to catch errors.
@@ -242,7 +242,7 @@ def predict_obs_flips_from_dets_bit_packed(
         ...     # Check on the message.
         ...     M 0
         ...     OBSERVABLE_INCLUDE(0) rec[-1]
-        ... """)
+        ... ''')
         ...
         ... # Sample the circuit.
         ... shots = 4096

diff --git a/setup.py b/setup.py
@@ -15,8 +15,8 @@
 PERF_FILES = glob.glob("src/**/*.perf.cc", recursive=True)
 MAIN_FILES = glob.glob("src/**/main.cc", recursive=True)
 HEADER_FILES = glob.glob("src/**/*.h", recursive=True) + glob.glob("src/**/*.inl", recursive=True)
-EXTRA_FILES = ['CMakeLists.txt']
-RELEVANT_SOURCE_FILES = sorted((set(EXTRA_FILES) | set(ALL_SOURCE_FILES) | set(HEADER_FILES)) - set(TEST_FILES + PERF_FILES + MAIN_FILES + MUX_SOURCE_FILES))
+CMAKE_FILES = ['CMakeLists.txt', *glob.glob("file_lists/**", recursive=True)]
+RELEVANT_SOURCE_FILES = sorted((set(CMAKE_FILES) | set(ALL_SOURCE_FILES) | set(HEADER_FILES)) - set(TEST_FILES + PERF_FILES + MAIN_FILES + MUX_SOURCE_FILES))
 
 
 class CMakeExtension(setuptools.Extension):

diff --git a/src/chromobius/pybind/chromobius.pybind.cc b/src/chromobius/pybind/chromobius.pybind.cc
@@ -136,7 +136,7 @@ PYBIND11_MODULE(chromobius, m) {
                 >>> import stim
                 >>> import chromobius
                 >>>
-                >>> dem = stim.Circuit("""
+                >>> dem = stim.Circuit('''
                 ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
                 ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
                 ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -145,7 +145,7 @@ PYBIND11_MODULE(chromobius, m) {
                 ...     DETECTOR(3, 0, 0, 1) rec[-1]
                 ...     M 0
                 ...     OBSERVABLE_INCLUDE(0) rec[-1]
-                ... """).detector_error_model()
+                ... ''').detector_error_model()
                 ...
                 ... decoder = chromobius.CompiledDecoder.from_dem(dem)
         )DOC")
@@ -192,7 +192,7 @@ PYBIND11_MODULE(chromobius, m) {
                 >>> import chromobius
                 >>> import numpy as np
                 >>>
-                >>> repetition_color_code = stim.Circuit("""
+                >>> repetition_color_code = stim.Circuit('''
                 ...     # Apply noise.
                 ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
                 ...     # Measure three-body stabilizers to catch errors.
@@ -209,7 +209,7 @@ PYBIND11_MODULE(chromobius, m) {
                 ...     # Check on the message.
                 ...     M 0
                 ...     OBSERVABLE_INCLUDE(0) rec[-1]
-                ... """)
+                ... ''')
                 ...
                 ... # Sample the circuit.
                 ... shots = 4096
@@ -275,7 +275,7 @@ PYBIND11_MODULE(chromobius, m) {
                 >>> import stim
                 >>> import chromobius
                 >>>
-                >>> dem = stim.Circuit("""
+                >>> dem = stim.Circuit('''
                 ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
                 ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
                 ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -284,7 +284,7 @@ PYBIND11_MODULE(chromobius, m) {
                 ...     DETECTOR(3, 0, 0, 1) rec[-1]
                 ...     M 0
                 ...     OBSERVABLE_INCLUDE(0) rec[-1]
-                ... """).detector_error_model()
+                ... ''').detector_error_model()
                 ...
                 ... decoder = chromobius.compile_decoder_for_dem(dem)
         )DOC")
@@ -333,7 +333,7 @@ PYBIND11_MODULE(chromobius, m) {
                 >>> import stim
                 >>> import chromobius
                 >>>
-                >>> dem = stim.Circuit("""
+                >>> dem = stim.Circuit('''
                 ...     X_ERROR(0.1) 0 1 2 3 4 5 6 7
                 ...     MPP Z0*Z1*Z2 Z1*Z2*Z3 Z2*Z3*Z4 Z3*Z4*Z5
                 ...     DETECTOR(0, 0, 0, 1) rec[-4]
@@ -342,7 +342,7 @@ PYBIND11_MODULE(chromobius, m) {
                 ...     DETECTOR(3, 0, 0, 1) rec[-1]
                 ...     M 0
                 ...     OBSERVABLE_INCLUDE(0) rec[-1]
-                ... """).detector_error_model()
+                ... ''').detector_error_model()
                 ...
                 ... decoder = chromobius.CompiledDecoder.from_dem(dem)
         )DOC")