more fixes

Author: noajshu

src/simplex.pybind.h

@@ -21,8 +21,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <sstream>
-
 #include "common.h"
 #include "simplex.h"
 #include "stim_utils.pybind.h"
@@ -146,11 +144,10 @@ void add_simplex_module(py::module& root) {
           "decode_to_errors",
           [](SimplexDecoder& self, const py::array_t<bool>& syndrome) {
             if ((size_t)syndrome.size() != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "Syndrome array size (" << syndrome.size()
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              throw std::invalid_argument(msg.str());
+              std::string msg = "Syndrome array size (" + std::to_string(syndrome.size()) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             std::vector<uint64_t> detections;
@@ -311,11 +308,11 @@ void add_simplex_module(py::module& root) {
             size_t num_detectors = syndromes_unchecked.shape(1);
 
             if (num_detectors != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "The number of detectors in the input array (" << num_detectors
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              throw std::invalid_argument(msg.str());
+              std::string msg = "The number of detectors in the input array (" +
+                                std::to_string(num_detectors) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             // Allocate the result array.

src/tesseract.pybind.h

@@ -21,8 +21,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <sstream>
-
 #include "stim_utils.pybind.h"
 #include "tesseract.h"
 
@@ -249,15 +247,10 @@ void add_tesseract_module(py::module& root) {
           "decode_to_errors",
           [](TesseractDecoder& self, const py::array_t<bool>& syndrome) {
             if ((size_t)syndrome.size() != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "Syndrome array size (" << syndrome.size()
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              std::string msg = "Syndrome array size (" +
-                                std
-                  : to_string(syndrome.size()) +
-                    ") does not match the number of detectors in the decoder (" +
-                    std::to_string(self.num_detectors) + ")." throw std::invalid_argument(msg);
+              std::string msg = "Syndrome array size (" + std::to_string(syndrome.size()) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             std::vector<uint64_t> detections;
@@ -291,11 +284,10 @@ void add_tesseract_module(py::module& root) {
           [](TesseractDecoder& self, const py::array_t<bool>& syndrome, size_t det_order,
              size_t det_beam) {
             if ((size_t)syndrome.size() != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "Syndrome array size (" << syndrome.size()
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              throw std::invalid_argument(msg.str());
+              std::string msg = "Syndrome array size (" + std::to_string(syndrome.size()) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             std::vector<uint64_t> detections;
@@ -403,11 +395,10 @@ void add_tesseract_module(py::module& root) {
           "decode",
           [](TesseractDecoder& self, const py::array_t<bool>& syndrome) {
             if ((size_t)syndrome.size() != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "Syndrome array size (" << syndrome.size()
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              throw std::invalid_argument(msg.str());
+              std::string msg = "Syndrome array size (" + std::to_string(syndrome.size()) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             std::vector<uint64_t> detections;
@@ -461,11 +452,11 @@ void add_tesseract_module(py::module& root) {
             size_t num_detectors = syndromes_unchecked.shape(1);
 
             if (num_detectors != self.num_detectors) {
-              std::ostringstream msg;
-              msg << "The number of detectors in the input array (" << num_detectors
-                  << ") does not match the number of detectors in the decoder ("
-                  << self.num_detectors << ").";
-              throw std::invalid_argument(msg.str());
+              std::string msg = "The number of detectors in the input array (" +
+                                std::to_string(num_detectors) +
+                                ") does not match the number of detectors in the decoder (" +
+                                std::to_string(self.num_detectors) + ").";
+              throw std::invalid_argument(msg);
             }
 
             // Allocate the result array.

src/tesseract_sinter_compat.pybind.h

@@ -83,7 +83,7 @@ struct TesseractSinterCompiledDecoder {
       // Store predictions into the output buffer
       uint8_t* single_result_buffer = result_buffer + shot * num_observable_bytes;
       std::fill(single_result_buffer, single_result_buffer + num_observable_bytes, 0);
-      for (int obs_index : predictions) {
+      for (size_t obs_index : predictions) {
         if (obs_index >= 0 && obs_index < num_observables) {
           single_result_buffer[obs_index / 8] ^= (1 << (obs_index % 8));
         }
@@ -191,7 +191,7 @@ struct TesseractSinterDecoder {
 
       // Pack the predictions back into a bit-packed format.
       std::fill(single_result_data.begin(), single_result_data.end(), 0);
-      for (int obs_index : predictions) {
+      for (size_t obs_index : predictions) {
         if (obs_index >= 0 && obs_index < num_obs) {
           single_result_data[obs_index / 8] ^= (1 << (obs_index % 8));
         }