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.

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

fix(Inference): Don't add constraints between static edges #693

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions src/extension/infer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,7 @@ impl UnificationContext {
for port in hugr.node_inputs(tgt_node).filter(|src_port| {
matches!(
sig.port_kind(*src_port),
Some(EdgeKind::Value(_))
| Some(EdgeKind::Static(_))
| Some(EdgeKind::ControlFlow)
Some(EdgeKind::Value(_)) | Some(EdgeKind::ControlFlow)
)
}) {
let m_tgt = *self
Expand Down
2 changes: 1 addition & 1 deletion src/hugr/rewrite/replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ mod test {
FunctionType::new_linear(just_list.clone()).with_extension_delta(&exset),
)?;

let pred_const = cfg.add_constant(ops::Const::unary_unit_sum(), None)?;
let pred_const = cfg.add_constant(ops::Const::unary_unit_sum(), exset)?;
Copy link
Contributor

@acl-cqc acl-cqc Nov 15, 2023

Choose a reason for hiding this comment

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

This is because we can no longer infer an extension set for the Const itself, right? Presumably we could still use None for the LoadConstant? So what about changing the builder to automatically use pure for the Const node, but still allow specifying something (or None) for the LoadConstant?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, no, hang on - this is just the Const, there is no LoadConstant here. So IOW, the exset could be anything, that will play no further part in inference?

Hmmm, we should drop the param. That could be another PR/issue, tho.

Copy link
Contributor Author

@croyzor croyzor Nov 15, 2023

Choose a reason for hiding this comment

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

I think we should drop the parameter, default to pure for const and move this param to load_constant. I'll open another PR for this.
At the moment though, load_constant uses the extension set that is provided with the ConstId, which is why exset here needs to be specified when the const node is created


let entry = single_node_block(&mut cfg, pop, &pred_const, true)?;
let bb2 = single_node_block(&mut cfg, push, &pred_const, false)?;
Expand Down