fix wasm issues

pytket/binders/circuit/Circuit/main.cpp

@@ -415,14 +415,7 @@ void def_circuit(py::class_<Circuit, std::shared_ptr<Circuit>> &pyCircuit) {
           ":return: the number of gates in the Circuit")
       .def_property_readonly(
           "wasm_uid",
-          [](const Circuit &circ) {
-            std::optional<std::string> result;
-            try {
-              result = circ.get_wasm_file_uid();
-            } catch (const std::exception &) {
-            }
-            return result;
-          },
+          [](const Circuit &circ) { return circ.get_wasm_file_uid(); },
           ":return: the unique wasm uid of the circuit")
       .def_property_readonly(
           "n_qubits", &Circuit::n_qubits,

pytket/docs/changelog.rst

@@ -4,6 +4,10 @@ Changelog
 1.36.0 (unreleased)
 -------------------
 
+API changes:
+
+* Remove the deprecated methods `auto_rebase_pass()` and `auto_squash_pass()`.
+
 Features:
 
 * Add `Circuit.wasm_uid` property to get the wasm UID from the circuit

pytket/tests/zx_diagram_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from math import isclose, pow  # noqa: A004
+from math import isclose
 from typing import Tuple
 
 import numpy as np

tket/include/tket/Circuit/Circuit.hpp

@@ -464,7 +464,7 @@ class Circuit {
   UnitID get_id_from_out(const Vertex &out) const;
 
   opt_reg_info_t get_reg_info(std::string reg_name) const;
-  std::string get_wasm_file_uid() const;
+  std::optional<std::string> get_wasm_file_uid() const;
   register_t get_reg(std::string reg_name) const;
 
   // returns the total number of vertices in dag

tket/src/Circuit/macro_manipulation.cpp

@@ -143,7 +143,8 @@ void Circuit::append_with_map(const Circuit& c2, const unit_map_t& qm) {
     if (copy.get_wasm_file_uid() != get_wasm_file_uid()) {
       throw Unsupported(
           "Cannot append circuits with different wasm uids: " +
-          get_wasm_file_uid() + " and " + copy.get_wasm_file_uid());
+          get_wasm_file_uid().emplace(" - ") + " and " +
+          copy.get_wasm_file_uid().emplace(" - "));
     }
   }
 

tket/src/Circuit/setters_and_getters.cpp

@@ -291,45 +291,44 @@ opt_reg_info_t Circuit::get_reg_info(std::string reg_name) const {
     return found->reg_info();
 }
 
-std::string Circuit::get_wasm_file_uid() const {
+std::optional<std::string> Circuit::get_wasm_file_uid() const {
+  std::optional<std::string> result = std::nullopt;
   BGL_FORALL_VERTICES(v, dag, DAG) {
     if (get_OpType_from_Vertex(v) == OpType::WASM) {
-      return (static_cast<const WASMOp &>(*get_Op_ptr_from_Vertex(v)))
-          .get_wasm_file_uid();
+      result = (static_cast<const WASMOp &>(*get_Op_ptr_from_Vertex(v)))
+                   .get_wasm_file_uid();
+      return result;
     } else if (
         (get_OpType_from_Vertex(v) == OpType::Conditional) &&
         (static_cast<const Conditional &>(*get_Op_ptr_from_Vertex(v))
              .get_op()
              ->get_type() == OpType::WASM)) {
-      return static_cast<const WASMOp &>(
-                 *(static_cast<const Conditional &>(*get_Op_ptr_from_Vertex(v)))
-                      .get_op())
-          .get_wasm_file_uid();
+      result =
+          static_cast<const WASMOp &>(
+              *(static_cast<const Conditional &>(*get_Op_ptr_from_Vertex(v)))
+                   .get_op())
+              .get_wasm_file_uid();
+      return result;
     } else if (get_OpType_from_Vertex(v) == OpType::CircBox) {
-      try {
-        return (static_cast<const CircBox &>(*get_Op_ptr_from_Vertex(v)))
-            .to_circuit()
-            ->get_wasm_file_uid();
-      } catch (std::domain_error const &) {
-        continue;
-      }
+      result = (static_cast<const CircBox &>(*get_Op_ptr_from_Vertex(v)))
+                   .to_circuit()
+                   ->get_wasm_file_uid();
+      if (result != std::nullopt) return result;
     } else if (
         (get_OpType_from_Vertex(v) == OpType::Conditional) &&
         (static_cast<const Conditional &>(*get_Op_ptr_from_Vertex(v))
              .get_op()
              ->get_type() == OpType::CircBox)) {
-      try {
-        return (static_cast<const CircBox &>(*(static_cast<const Conditional &>(
-                                                   *get_Op_ptr_from_Vertex(v)))
-                                                  .get_op()))
-            .to_circuit()
-            ->get_wasm_file_uid();
-      } catch (std::domain_error const &) {
-        continue;
-      }
+      result =
+          (static_cast<const CircBox &>(
+               *(static_cast<const Conditional &>(*get_Op_ptr_from_Vertex(v)))
+                    .get_op()))
+              .to_circuit()
+              ->get_wasm_file_uid();
+      if (result != std::nullopt) return result;
     }
   }
-  throw std::domain_error("Can't find WASM Op in circuit");
+  return result;
 }
 
 register_t Circuit::get_reg(std::string reg_name) const {

tket/test/src/test_wasm.cpp

@@ -209,6 +209,50 @@ SCENARIO("generating circ with wasm") {
     REQUIRE(u.depth() == 2);
     REQUIRE(u.get_wasm_file_uid() == wasm_file);
   }
+  GIVEN("circuit get wasm uid 2") {
+    Circuit u(0, 1);
+
+    const std::shared_ptr<WASMOp> wop_ptr =
+        std::make_shared<WASMOp>(2, 1, uv_2, uv_2, wasm_func, wasm_file);
+
+    const std::shared_ptr<WASMOp> wop_ptr_2 =
+        std::make_shared<WASMOp>(1, 3, uv_2, uv_3, wasm_func, wasm_file);
+
+    u.add_op<UnitID>(wop_ptr, {Bit(0), Bit(0), WasmState(0)});
+    u.add_op<UnitID>(
+        wop_ptr_2, {Bit(0), WasmState(0), WasmState(1), WasmState(2)});
+
+    u.assert_valid();
+    REQUIRE(u.depth() == 2);
+    REQUIRE(u.get_wasm_file_uid() == wasm_file);
+
+    CircBox circbox(u);
+    Circuit major_circ(0, 1);
+    major_circ.add_box(circbox, {0});
+
+    REQUIRE(major_circ.depth() == 1);
+    REQUIRE(major_circ.get_wasm_file_uid() == wasm_file);
+  }
+  GIVEN("circuit get wasm uid 3") {
+    Circuit u(0, 1);
+
+    const std::shared_ptr<WASMOp> wop_ptr =
+        std::make_shared<WASMOp>(2, 1, uv_2, uv_2, wasm_func, wasm_file);
+
+    const std::shared_ptr<WASMOp> wop_ptr_2 =
+        std::make_shared<WASMOp>(1, 3, uv_2, uv_3, wasm_func, wasm_file);
+
+    u.assert_valid();
+    REQUIRE(u.depth() == 0);
+    REQUIRE(u.get_wasm_file_uid() == std::nullopt);
+
+    CircBox circbox(u);
+    Circuit major_circ(0, 1);
+    major_circ.add_box(circbox, {0});
+
+    REQUIRE(major_circ.depth() == 1);
+    REQUIRE(major_circ.get_wasm_file_uid() == std::nullopt);
+  }
   GIVEN("circuit with wasm append") {
     Circuit u(1, 1);
     Circuit u2(1, 1);