From d84f914ae1d5aceead80d95e0f84a1a58b0ed224 Mon Sep 17 00:00:00 2001 From: Melf Date: Fri, 7 Jun 2024 11:11:58 +0100 Subject: [PATCH 1/4] update tket version --- pytket/conanfile.py | 2 +- tket/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pytket/conanfile.py b/pytket/conanfile.py index 1e0037a0b5..aa1b754bf0 100644 --- a/pytket/conanfile.py +++ b/pytket/conanfile.py @@ -32,7 +32,7 @@ def package(self): cmake.install() def requirements(self): - self.requires("tket/1.3.4@tket/stable") + self.requires("tket/1.3.5@tket/stable") self.requires("tklog/0.3.3@tket/stable") self.requires("tkrng/0.3.3@tket/stable") self.requires("tkassert/0.3.4@tket/stable") diff --git a/tket/conanfile.py b/tket/conanfile.py index d6995cac8b..b0266faddc 100644 --- a/tket/conanfile.py +++ b/tket/conanfile.py @@ -23,7 +23,7 @@ class TketConan(ConanFile): name = "tket" - version = "1.3.4" + version = "1.3.5" package_type = "library" license = "Apache 2" homepage = "https://github.com/CQCL/tket" From 7a125941f3406ab977a4281c462280b249a09404 Mon Sep 17 00:00:00 2001 From: Melf Date: Fri, 7 Jun 2024 11:13:07 +0100 Subject: [PATCH 2/4] update parameter of remove_blank_wires in gen_flatten_relabel_registers_pass --- tket/src/Predicates/PassGenerators.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tket/src/Predicates/PassGenerators.cpp b/tket/src/Predicates/PassGenerators.cpp index 0a6c3f316a..8568eccc9f 100644 --- a/tket/src/Predicates/PassGenerators.cpp +++ b/tket/src/Predicates/PassGenerators.cpp @@ -357,7 +357,7 @@ PassPtr gen_flatten_relabel_registers_pass(const std::string& label) { Transform t = Transform([=](Circuit& circuit, std::shared_ptr maps) { unsigned n_qubits = circuit.n_qubits(); - circuit.remove_blank_wires(false); + circuit.remove_blank_wires(true); bool changed = circuit.n_qubits() < n_qubits; std::map relabelling_map; std::vector all_qubits = circuit.all_qubits(); From 47a27d5a84f7e734309b68d9bcb5cdf1a6865a74 Mon Sep 17 00:00:00 2001 From: Melf Date: Fri, 7 Jun 2024 11:38:48 +0100 Subject: [PATCH 3/4] add python testcase for compilation pass flatten_relabel --- pytket/tests/predicates_test.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pytket/tests/predicates_test.py b/pytket/tests/predicates_test.py index 334f02110d..bcfb12b741 100644 --- a/pytket/tests/predicates_test.py +++ b/pytket/tests/predicates_test.py @@ -24,6 +24,7 @@ Unitary2qBox, Node, Qubit, + Bit, UnitID, Conditional, ) @@ -885,7 +886,10 @@ def test_conditional_phase() -> None: def test_flatten_relabel_pass() -> None: - c = Circuit(3) + c = Circuit(3, 3) + c.add_bit(Bit("d", 0)) + c.add_bit(Bit("d", 1)) + c.add_c_register("e", 5) c.H(1).H(2) rename_map: RenameUnitsMap = dict() rename_map[Qubit(0)] = Qubit("a", 4) @@ -901,6 +905,10 @@ def test_flatten_relabel_pass() -> None: assert cu.initial_map[Qubit("a", 4)] == Qubit("a", 4) assert cu.initial_map[Qubit("b", 7)] == Qubit("a", 1) assert cu.circuit.qubits == [Qubit("a", 0), Qubit("a", 1)] + assert cu.circuit.n_bits == 10 + assert cu.circuit.get_c_register("c").size == 3 + assert cu.circuit.get_c_register("d").size == 2 + assert cu.circuit.get_c_register("e").size == 5 # test default argument c = Circuit() From 14a3c0aec669a415a300cc89082020864e042796 Mon Sep 17 00:00:00 2001 From: Melf Date: Fri, 7 Jun 2024 14:53:42 +0100 Subject: [PATCH 4/4] update tket version --- pytket/conanfile.py | 2 +- tket/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pytket/conanfile.py b/pytket/conanfile.py index aa1b754bf0..36208ddfe5 100644 --- a/pytket/conanfile.py +++ b/pytket/conanfile.py @@ -32,7 +32,7 @@ def package(self): cmake.install() def requirements(self): - self.requires("tket/1.3.5@tket/stable") + self.requires("tket/1.3.6@tket/stable") self.requires("tklog/0.3.3@tket/stable") self.requires("tkrng/0.3.3@tket/stable") self.requires("tkassert/0.3.4@tket/stable") diff --git a/tket/conanfile.py b/tket/conanfile.py index b0266faddc..6a21d45d1f 100644 --- a/tket/conanfile.py +++ b/tket/conanfile.py @@ -23,7 +23,7 @@ class TketConan(ConanFile): name = "tket" - version = "1.3.5" + version = "1.3.6" package_type = "library" license = "Apache 2" homepage = "https://github.com/CQCL/tket"