Merge remote-tracking branch 'origin/main'

Author: noajshu

.bazelrc

@@ -1,2 +1,2 @@
-common --noenable_bzlmod --enable_workspace
+common --enable_bzlmod --enable_workspace
 build --cxxopt='-std=c++20'

MODULE.bazel

@@ -0,0 +1,23 @@
+module(name = "tesseract", version = "1.0")
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_python", version = "0.40.0")
+bazel_dep(name = "rules_cc", version = "0.0.17")
+bazel_dep(name = "pybind11_bazel", version = "2.13.6")
+
+DEFAULT_PYTHON_VERSION = "3.11"
+
+python_configure = use_extension("@pybind11_bazel//:python_configure.bzl", "extension")
+use_repo(python_configure, "local_config_python")
+
+
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+
+pip.parse(
+    hub_name = "pypi",
+    python_version = "3.11",
+    requirements_lock = "//src/py:requirements_lock.txt",
+)
+
+use_repo(pip, "pypi")

WORKSPACE

@@ -68,51 +68,9 @@ http_archive(
 )
 
 http_archive(
-    name = "rules_python",
-    sha256 = "62ddebb766b4d6ddf1712f753dac5740bea072646f630eb9982caa09ad8a7687",
-    strip_prefix = "rules_python-0.39.0",
-    url = "https://github.com/bazelbuild/rules_python/releases/download/0.39.0/rules_python-0.39.0.tar.gz",
-)
-
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "rules_proto",
-    sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4",
-    strip_prefix = "rules_proto-7.1.0",
-    url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz",
-)
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-rules_proto_dependencies()
-
-load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
-rules_proto_toolchains()
-
-
-load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
-
-py_repositories()
-
-python_register_toolchains(
-    name = "python",
-    ignore_root_user_error = True,
-    python_version = "3.12",
-)
-
-
-http_archive(
-  name = "pybind11_bazel",
-  strip_prefix = "pybind11_bazel-2.13.6",
-  sha256 = "9df284330336958c837fb70dc34c0a6254dac52a5c983b3373a8c2bbb79ac35e",
-  urls = ["https://github.com/pybind/pybind11_bazel/archive/v2.13.6.zip"],
-)
-# We still require the pybind library.
-http_archive(
-  name = "pybind11",
-  build_file = "@pybind11_bazel//:pybind11-BUILD.bazel",
-  strip_prefix = "pybind11-2.13.6",
-  sha256 = "d0a116e91f64a4a2d8fb7590c34242df92258a61ec644b79127951e821b47be6",
-  urls = ["https://github.com/pybind/pybind11/archive/v2.13.6.zip"],
+    name = "stim_py",
+    build_file = "//external:stim_py.BUILD",
+    sha256 = "95236006859d6754be99629d4fb44788e742e962ac8c59caad421ca088f7350e",
+    strip_prefix = "stim-1.15.0",
+    urls = ["https://github.com/quantumlib/Stim/releases/download/v1.15.0/stim-1.15.0.tar.gz"],
 )

external/stim_py.BUILD

@@ -0,0 +1,64 @@
+load("@pybind11_bazel//:build_defs.bzl", "pybind_library")
+load("@pybind11_bazel//:build_defs.bzl", "pybind_extension")
+
+SOURCE_FILES_NO_MAIN = glob(
+    [
+        "src/**/*.cc",
+        "src/**/*.h",
+        "src/**/*.inl",
+    ],
+    exclude = glob([
+        "src/**/*.test.cc",
+        "src/**/*.test.h",
+        "src/**/*.perf.cc",
+        "src/**/*.perf.h",
+        "src/**/*.pybind.cc",
+        "src/**/*.pybind.h",
+        "src/**/main.cc",
+    ]),
+)
+
+PYBIND_MODULES = [
+    "src/stim/py/march.pybind.cc",
+    "src/stim/py/stim.pybind.cc",
+]
+
+PYBIND_FILES_WITHOUT_MODULES = glob(
+    [
+        "src/**/*.pybind.cc",
+        "src/**/*.pybind.h",
+    ],
+    exclude=PYBIND_MODULES,
+)
+
+
+
+pybind_library(
+    name = "stim_pybind_lib",
+    srcs = SOURCE_FILES_NO_MAIN + PYBIND_FILES_WITHOUT_MODULES,
+    copts = [
+        "-O3",
+        "-std=c++20",
+        "-fvisibility=hidden",
+        "-march=native",
+        "-DVERSION_INFO=0.0.dev0",
+    ],
+    includes = ["src/"],
+  visibility = ["//visibility:public"],
+)
+
+pybind_extension(
+    name = "stim",
+    srcs = PYBIND_MODULES,
+    copts = [
+        "-O3",
+        "-std=c++20",
+        "-fvisibility=hidden",
+        "-march=native",
+        "-DSTIM_PYBIND11_MODULE_NAME=stim",
+        "-DVERSION_INFO=0.0.dev0",
+    ],
+    deps=[":stim_pybind_lib"],
+    includes = ["src/"],
+  visibility = ["//visibility:public"],
+)

src/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # load("@benchmark//:benchmark.bzl", "cc_benchmark")
-load("@pybind11_bazel//:build_defs.bzl", "pybind_extension")
+load("@pybind11_bazel//:build_defs.bzl", "pybind_extension", "pybind_library")
 load("@rules_python//python:defs.bzl", "py_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -64,22 +64,41 @@ cc_library(
 )
 
 
+pybind_library(
+    name = "tesseract_decoder_pybind",
+    srcs = [
+        "common.pybind.h",
+        "utils.pybind.h",
+        "simplex.pybind.h",
+        "tesseract.pybind.h",
+    ],
+    deps = [
+        ":libcommon",
+        ":libutils",
+        ":libsimplex",
+        ":libtesseract",
+        "@stim_py//:stim_pybind_lib",
+    ],
+)
+
 pybind_extension(
     name = "tesseract_decoder",
     srcs = [
-        "common.pybind.h",
         "tesseract.pybind.cc",
     ],
     deps = [
-        ":libcommon",
+        ":tesseract_decoder_pybind",
+        "@stim_py//:stim",
     ],
 )
 
 
 py_library(
     name="lib_tesseract_decoder",
-    data=[":tesseract_decoder"],
     imports=["src"],
+    deps=[
+        ":tesseract_decoder",
+    ],
 )
 
 

src/common.pybind.h

@@ -1,3 +1,17 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef TESSERACT_COMMON_PY_H
 #define TESSERACT_COMMON_PY_H
 
@@ -8,13 +22,14 @@
 #include <vector>
 
 #include "common.h"
+#include "src/stim/dem/dem_instruction.pybind.h"
+#include "stim/dem/detector_error_model_target.pybind.h"
 
 namespace py = pybind11;
 
 void add_common_module(py::module &root) {
   auto m = root.def_submodule("common", "classes commonly used by the decoder");
 
-  // TODO: add as_dem_instruction_targets
   py::class_<common::Symptom>(m, "Symptom")
       .def(py::init<std::vector<int>, common::ObservablesMask>(),
            py::arg("detectors") = std::vector<int>(),
@@ -23,19 +38,38 @@ void add_common_module(py::module &root) {
       .def_readwrite("observables", &common::Symptom::observables)
       .def("__str__", &common::Symptom::str)
       .def(py::self == py::self)
-      .def(py::self != py::self);
+      .def(py::self != py::self)
+      .def("as_dem_instruction_targets", [](common::Symptom s) {
+        std::vector<stim_pybind::ExposedDemTarget> ret;
+        for (auto &t : s.as_dem_instruction_targets()) ret.emplace_back(t);
+        return ret;
+      });
 
-  // TODO: add constructor with stim::DemInstruction.
   py::class_<common::Error>(m, "Error")
       .def_readwrite("likelihood_cost", &common::Error::likelihood_cost)
       .def_readwrite("probability", &common::Error::probability)
       .def_readwrite("symptom", &common::Error::symptom)
       .def("__str__", &common::Error::str)
       .def(py::init<>())
       .def(py::init<double, std::vector<int> &, common::ObservablesMask,
-                    std::vector<bool> &>())
+                    std::vector<bool> &>(),
+           py::arg("likelihood_cost"), py::arg("detectors"),
+           py::arg("observables"), py::arg("dets_array"))
       .def(py::init<double, double, std::vector<int> &, common::ObservablesMask,
-                    std::vector<bool> &>());
+                    std::vector<bool> &>(),
+           py::arg("likelihood_cost"), py::arg("probability"),
+           py::arg("detectors"), py::arg("observables"), py::arg("dets_array"))
+      .def(py::init([](stim_pybind::ExposedDemInstruction edi) {
+             return new common::Error(edi.as_dem_instruction());
+           }),
+           py::arg("error"));
+
+  m.def("merge_identical_errors", &common::merge_identical_errors,
+        py::arg("dem"));
+  m.def("remove_zero_probability_errors",
+        &common::remove_zero_probability_errors, py::arg("dem"));
+  m.def("dem_from_counts", &common::dem_from_counts, py::arg("orig_dem"),
+        py::arg("error_counts"), py::arg("num_shots"));
 }
 
 #endif

src/py/BUILD

@@ -0,0 +1,48 @@
+load("@rules_python//python:py_test.bzl", "py_test")
+load("@rules_python//python:pip.bzl", "compile_pip_requirements")
+
+py_test(
+    name = "common_test",
+    srcs = ["common_test.py"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@pypi//pytest",
+        "//src:lib_tesseract_decoder",
+    ],
+)
+
+py_test(
+    name = "utils_test",
+    srcs = ["utils_test.py"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@pypi//pytest",
+        "//src:lib_tesseract_decoder",
+    ],
+)
+
+py_test(
+    name = "simplex_test",
+    srcs = ["simplex_test.py"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@pypi//pytest",
+        "//src:lib_tesseract_decoder",
+    ],
+)
+
+py_test(
+    name = "tesseract_test",
+    srcs = ["tesseract_test.py"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@pypi//pytest",
+        "//src:lib_tesseract_decoder",
+    ],
+)
+
+compile_pip_requirements(
+    name = "requirements",
+    src = "requirements.in",
+    requirements_txt = "requirements_lock.txt",
+)

src/py/common_test.py

@@ -0,0 +1,65 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+import stim
+
+from src import tesseract_decoder
+
+
+def test_as_dem_instruction_targets():
+    s = tesseract_decoder.common.Symptom([1, 2], 4324)
+    dits = s.as_dem_instruction_targets()
+    assert dits == [
+        stim.DemTarget("D1"),
+        stim.DemTarget("D2"),
+        stim.DemTarget("L2"),
+        stim.DemTarget("L5"),
+        stim.DemTarget("L6"),
+        stim.DemTarget("L7"),
+        stim.DemTarget("L12"),
+    ]
+
+
+def test_error_from_dem_instruction():
+    di = stim.DemInstruction("error", [0.125], [stim.target_logical_observable_id(3)])
+    error = tesseract_decoder.common.Error(di)
+
+    assert str(error) == "Error{cost=1.945910, symptom=Symptom{}}"
+
+
+def test_merge_identical_errors():
+    dem = stim.DetectorErrorModel()
+    assert isinstance(
+        tesseract_decoder.common.merge_identical_errors(dem), stim.DetectorErrorModel
+    )
+
+
+def test_remove_zero_probability_errors():
+    dem = stim.DetectorErrorModel()
+    assert isinstance(
+        tesseract_decoder.common.remove_zero_probability_errors(dem),
+        stim.DetectorErrorModel,
+    )
+
+
+def test_dem_from_counts():
+    dem = stim.DetectorErrorModel()
+    assert isinstance(
+        tesseract_decoder.common.dem_from_counts(dem, [], 3), stim.DetectorErrorModel
+    )
+
+
+if __name__ == "__main__":
+    raise SystemExit(pytest.main([__file__]))

src/py/requirements.in

@@ -0,0 +1,2 @@
+stim
+pytest