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

Jump to bottom

feat: Implement rewrite IdentityInsertion #474

Merged
merged 9 commits into from
Aug 31, 2023
Merged

feat: Implement rewrite IdentityInsertion #474

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
651fd5d
WIP on InsertIdentity.
cqc-alec Aug 30, 2023
c29e707
TODO comment.
cqc-alec Aug 30, 2023
c11beb2
add some assumption/condition comments
ss2165 Aug 31, 2023
c4e71cd
use ApplyResult
ss2165 Aug 31, 2023
bbbd0e0
turn simple_replace test samples in to fixtures
ss2165 Aug 31, 2023
8d976e8
implement noop node adding
ss2165 Aug 31, 2023
9040264
fixup! turn simple_replace test samples in to fixtures
ss2165 Aug 31, 2023
344d983
add identity insertion tests
ss2165 Aug 31, 2023
21ac480
add check port is output
ss2165 Aug 31, 2023
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
20 changes: 16 additions & 4 deletions src/hugr/rewrite/insert_identity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::hugr::{HugrMut, Node};
use crate::ops::LeafOp;
use crate::types::EdgeKind;
use crate::{Hugr, HugrView, Port};
use crate::{Direction, Hugr, HugrView, Port};

use super::Rewrite;

Expand Down Expand Up @@ -38,6 +38,10 @@ pub enum IdentityInsertionError {
/// Invalid port kind.
#[error("post_port has invalid kind {0:?}. Must be Value.")]
InvalidPortKind(Option<EdgeKind>),

/// Must be input port.
#[error("post_port is an output port, must be input.")]
PortIsOutput,
}

impl Rewrite for IdentityInsertion {
Expand All @@ -53,11 +57,15 @@ impl Rewrite for IdentityInsertion {
Conditions:
1. post_port is Value kind.
2. post_port is connected to a sibling of post_node.
3. post_port is input.
*/

unimplemented!()
}
fn apply(self, h: &mut Hugr) -> Result<Self::ApplyResult, IdentityInsertionError> {
if self.post_port.direction() != Direction::Incoming {
return Err(IdentityInsertionError::PortIsOutput);
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it now be safe to use unwrap() at line 72 as otherwise the hugr is invalid? Or is there an edge case I've forgotten?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes - expect is just an unwrap with a message, I essentially use it to comment assumptions. Though I should move the check for value kind before that.

let (pre_node, pre_port) = h
.linked_ports(self.post_node, self.post_port)
.exactly_one()
Expand All @@ -73,7 +81,6 @@ impl Rewrite for IdentityInsertion {
h.connect(pre_node, pre_port.index(), new_node, 0)
.expect("Should only fail if ports don't exist.");

// TODO Check type, insert Noop...
h.connect(new_node, 0, self.post_node, self.post_port.index())
.expect("Should only fail if ports don't exist.");
Ok(new_node)
Expand Down Expand Up @@ -121,9 +128,14 @@ mod tests {

let final_node = tail.node();

let final_node_port = h.node_inputs(final_node).next().unwrap();
let final_node_output = h.node_outputs(final_node).next().unwrap();
let rw = IdentityInsertion::new(final_node, final_node_output);
let apply_result = h.apply_rewrite(rw);
assert_eq!(apply_result, Err(IdentityInsertionError::PortIsOutput));

let rw = IdentityInsertion::new(final_node, final_node_port);
let final_node_input = h.node_inputs(final_node).next().unwrap();

let rw = IdentityInsertion::new(final_node, final_node_input);

let apply_result = h.apply_rewrite(rw);
assert_eq!(
Expand Down