Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reimplement Circuit::get_commands_of_type() #1730

Merged
merged 4 commits into from
Jan 8, 2025
Merged

Reimplement Circuit::get_commands_of_type() #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7107d20
Add failing test.
cqc-alec Jan 6, 2025
7ec8622
Reimplement Circuit::get_commands_of_type().
cqc-alec Jan 8, 2025
b32cf7c
Bump tket version.
cqc-alec Jan 8, 2025
ada130f
Update changelog.
cqc-alec Jan 8, 2025
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
2 changes: 1 addition & 1 deletion pytket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.57@tket/stable")
self.requires("tket/1.3.58@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")
Expand Down
4 changes: 4 additions & 0 deletions pytket/docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Features:

* Squash sequences of conditional gates in `SquashRzPhasedX` pass.

Fixes:

* Fix issue with `Circuit.commands_of_type(OpType.Conditional)`.

1.37.0 (December 2024)
----------------------

Expand Down
2 changes: 1 addition & 1 deletion tket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class TketConan(ConanFile):
name = "tket"
version = "1.3.57"
version = "1.3.58"
package_type = "library"
license = "Apache 2"
homepage = "https://github.com/CQCL/tket"
Expand Down
17 changes: 3 additions & 14 deletions tket/src/Circuit/macro_circ_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,9 @@ VertexSet Circuit::get_gates_of_type(const OpType& op_type) const {

std::list<Command> Circuit::get_commands_of_type(OpType op_type) const {
std::list<Command> coms;
std::function<bool(Op_ptr)> skip_func = [=](Op_ptr op) {
return (op->get_type() != op_type);
};
SliceIterator slice_iter(*this, skip_func);
for (const Vertex& v : *slice_iter) {
coms.push_back(command_from_vertex(
v, slice_iter.get_u_frontier(), slice_iter.get_prev_b_frontier()));
}
while (!slice_iter.finished()) {
slice_iter.cut_ = next_cut(
slice_iter.cut_.u_frontier, slice_iter.cut_.b_frontier, skip_func);
for (const Vertex& v : *slice_iter) {
coms.push_back(command_from_vertex(
v, slice_iter.get_u_frontier(), slice_iter.get_prev_b_frontier()));
for (const Command& cmd : *this) {
if (cmd.get_op_ptr()->get_type() == op_type) {
coms.push_back(cmd);
}
}
return coms;
Expand Down
11 changes: 11 additions & 0 deletions tket/test/src/Circuit/test_Circ.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3548,5 +3548,16 @@ SCENARIO("Finding subcircuits") {
}
}

SCENARIO("Filter conditional commands") {
// https://github.com/CQCL/tket/issues/1726
GIVEN("Circuit with a conditional after a measure") {
Circuit c(1, 1);
c.add_measure(0, 0);
c.add_conditional_gate<unsigned>(OpType::X, {}, {0}, {0}, 1);
std::list<Command> cmds = c.get_commands_of_type(OpType::Conditional);
REQUIRE(cmds.size() == 1);
}
}

} // namespace test_Circ
} // namespace tket
Loading