Merge pull request #1718 from CQCL/ae/synthtkcond

CQCL · Dec 11, 2024 · 1556310 · 1556310
2 parents cae9fea + 16a50e6
commit 1556310
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/pytket/conanfile.py b/pytket/conanfile.py
@@ -38,7 +38,7 @@ def requirements(self):
         self.requires("pybind11_json/0.2.15")
         self.requires("symengine/0.13.0")
         self.requires("tkassert/0.3.4@tket/stable")
-        self.requires("tket/1.3.55@tket/stable")
+        self.requires("tket/1.3.56@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tktokenswap/0.3.9@tket/stable")

diff --git a/pytket/docs/changelog.rst b/pytket/docs/changelog.rst
@@ -4,6 +4,11 @@ Changelog
 1.37.0 (Unreleased)
 -------------------
 
+Features:
+
+* Rebase to TK2 using fewer two-qubit gates, improving compilation results in
+  some scenarios.
+
 Fixes:
 
 * Fix circuit iteration giving invalid slices in some cases.

diff --git a/tket/conanfile.py b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.3.55"
+    version = "1.3.56"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"

diff --git a/tket/src/Transformations/Rebase.cpp b/tket/src/Transformations/Rebase.cpp
@@ -266,9 +266,9 @@ Transform rebase_HQS() {
 // Multiqs: TK2
 // Singleqs: TK1
 Transform rebase_TK() {
-  return rebase_factory(
-      {OpType::TK2, OpType::TK1}, CircPool::CX_using_TK2(),
-      CircPool::tk1_to_tk1);
+  return rebase_factory_via_tk2(
+      {OpType::TK2, OpType::TK1}, CircPool::tk1_to_tk1,
+      CircPool::TK2_using_TK2);
 }
 
 // Multiqs: XXPhase

diff --git a/tket/test/src/test_Synthesis.cpp b/tket/test/src/test_Synthesis.cpp
@@ -2081,21 +2081,35 @@ static void check_conditions(PassPtr pp, const Circuit &c) {
 }
 
 SCENARIO("Synthesis with conditional gates") {
-  // https://github.com/CQCL/tket/issues/394
-  Circuit c(3);
-  c.add_c_register("c", 3);
-  c.add_op<unsigned>(OpType::H, {0});
-  c.add_op<unsigned>(OpType::CX, {0, 1});
-  c.add_measure(0, 0);
-  c.add_measure(1, 1);
-  c.add_conditional_gate<unsigned>(OpType::U1, {0.25}, {1}, {0}, 1);
-  c.add_conditional_gate<unsigned>(OpType::CnRy, {0.25}, {0, 1, 2}, {0, 1}, 0);
-  c.add_conditional_gate<unsigned>(OpType::CnRx, {0.25}, {0, 1, 2}, {0, 1}, 0);
-  c.add_conditional_gate<unsigned>(OpType::CnRz, {0.25}, {0, 1, 2}, {0, 1}, 0);
-  c.add_measure(2, 2);
-  check_conditions(SynthesiseTK(), c);
-  check_conditions(SynthesiseTket(), c);
-  check_conditions(SynthesiseUMD(), c);
+  GIVEN("Circuit with conditional U1") {
+    // https://github.com/CQCL/tket/issues/394
+    Circuit c(3);
+    c.add_c_register("c", 3);
+    c.add_op<unsigned>(OpType::H, {0});
+    c.add_op<unsigned>(OpType::CX, {0, 1});
+    c.add_measure(0, 0);
+    c.add_measure(1, 1);
+    c.add_conditional_gate<unsigned>(OpType::U1, {0.25}, {1}, {0}, 1);
+    c.add_conditional_gate<unsigned>(
+        OpType::CnRy, {0.25}, {0, 1, 2}, {0, 1}, 0);
+    c.add_conditional_gate<unsigned>(
+        OpType::CnRx, {0.25}, {0, 1, 2}, {0, 1}, 0);
+    c.add_conditional_gate<unsigned>(
+        OpType::CnRz, {0.25}, {0, 1, 2}, {0, 1}, 0);
+    c.add_measure(2, 2);
+    check_conditions(SynthesiseTK(), c);
+    check_conditions(SynthesiseTket(), c);
+    check_conditions(SynthesiseUMD(), c);
+  }
+
+  GIVEN("SynthesiseTK with conditional 2-qubit gates") {
+    // https://github.com/CQCL/tket/issues/1708
+    Circuit c(2, 1);
+    c.add_conditional_gate<unsigned>(OpType::ZZPhase, {0.5}, {0, 1}, {0}, 1);
+    CompilationUnit cu(c);
+    SynthesiseTK()->apply(cu);
+    CHECK(cu.get_circ_ref().count_n_qubit_gates(2) == 1);
+  }
 }
 
 SCENARIO("Restricting ZZPhase gate angles.") {