Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ AllowShortLoopsOnASingleLine: false
AllowShortLambdasOnASingleLine: None
BinPackArguments: false
BinPackParameters: false

PointerAlignment: Right
ReferenceAlignment: Right
IncludeCategories:
- Regex: '^<.*>$'
Priority: 1
- Regex: '^"gtest/.*"$'
Priority: 2
- Regex: '^".*"$'
Priority: 3
- Regex: "^<.*>$"
Priority: 1
- Regex: '^"gtest/.*"$'
Priority: 2
- Regex: '^".*"$'
Priority: 3
...
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ FetchContent_MakeAvailable(googletest)

FetchContent_Declare(stim
GIT_REPOSITORY https://github.com/quantumlib/Stim.git
GIT_TAG 1320ad7eac7de34d2e9c70daa44fbc6d84174450)
GIT_TAG v1.16.0)
FetchContent_MakeAvailable(stim)
if (NOT (MSVC))
target_compile_options(libstim PRIVATE -fno-strict-aliasing -fPIC ${ARCH_OPT})
Expand Down
61 changes: 61 additions & 0 deletions src/pymatching/sparse_blossom/driver/user_graph.pybind.cc
Original file line number Diff line number Diff line change
Expand Up @@ -612,4 +612,65 @@ void pm_pybind::pybind_user_graph_methods(py::module &m, py::class_<pm::UserGrap
"timelike_weights"_a = py::none(),
"measurement_error_probabilities"_a = py::none(),
"faults_matrix"_a = py::none());

g.def(
py::pickle(
[](pm::UserGraph &g) {
py::list edges_list;
for (const auto &edge : g.edges) {
py::list implied_weights_list;
for (const auto &iw : edge.implied_weights_for_other_edges) {
implied_weights_list.append(py::make_tuple(iw.node1, iw.node2, iw.implied_weight));
}
edges_list.append(
py::make_tuple(
edge.node1,
edge.node2,
edge.observable_indices,
edge.weight,
edge.error_probability,
implied_weights_list));
}

return py::make_tuple(
g.get_num_nodes(),
g.get_num_observables(),
edges_list,
g.boundary_nodes,
g.loaded_from_dem_without_correlations);
},
[](py::tuple t) {
pm::UserGraph g(t[0].cast<size_t>(), t[1].cast<size_t>());
g.boundary_nodes = t[3].cast<std::set<size_t>>();
g.loaded_from_dem_without_correlations = t[4].cast<bool>();

for (const auto &edge_obj : t[2].cast<py::list>()) {
auto et = edge_obj.cast<py::tuple>();
pm::UserEdge edge;
edge.node1 = et[0].cast<size_t>();
edge.node2 = et[1].cast<size_t>();
edge.observable_indices = et[2].cast<std::vector<size_t>>();
edge.weight = et[3].cast<double>();
edge.error_probability = et[4].cast<double>();

for (const auto &iw_obj : et[5].cast<py::list>()) {
auto iw_tuple = iw_obj.cast<py::tuple>();
edge.implied_weights_for_other_edges.emplace_back(
iw_tuple[0].cast<size_t>(), iw_tuple[1].cast<size_t>(), iw_tuple[2].cast<double>());
}

g.edges.push_back(edge);
auto edge_it = std::prev(g.edges.end());

g.nodes[edge.node1].neighbors.push_back({edge_it, 1});
if (edge.node2 != SIZE_MAX && edge.node2 != edge.node1)
g.nodes[edge.node2].neighbors.push_back({edge_it, 0});
}

for (size_t i : g.boundary_nodes)
if (i < g.nodes.size())
g.nodes[i].is_boundary = true;

return g;
}));
}