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: Valued connections should not be canonical input #91

Merged
Merged
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
27 changes: 14 additions & 13 deletions mithril/framework/logical/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -849,20 +849,21 @@
# Update Canonicals
if isinstance(c_input := model.canonical_input, Connection):
c_input_obj = self.conns.get_con_by_metadata(c_input.data.metadata)
if c_input_obj not in self.dependency_map._local_output_dependency_map:
# Update canonical input with model canonical input
if c_input_obj not in self.conns.input_connections:
self._canonical_input = NOT_AVAILABLE
else:
assert c_input_obj is not None
self._canonical_input = c_input_obj
if c_input_obj is not None and c_input_obj.metadata.data.value is TBD:
if c_input_obj not in self.dependency_map._local_output_dependency_map:
# Update canonical input with model canonical input
if c_input_obj not in self.conns.input_connections:
self._canonical_input = NOT_AVAILABLE

Check warning on line 856 in mithril/framework/logical/model.py

View check run for this annotation

Codecov / codecov/patch

mithril/framework/logical/model.py#L856

Added line #L856 was not covered by tests
else:
assert c_input_obj is not None
self._canonical_input = c_input_obj

elif (
self._canonical_input
in self.dependency_map._local_output_dependency_map
):
# Model canonical output used as input than make it None
self._canonical_input = NOT_AVAILABLE
elif (
self._canonical_input
in self.dependency_map._local_output_dependency_map
):
# Model canonical output used as input than make it None
self._canonical_input = NOT_AVAILABLE

if isinstance(c_output := model.canonical_output, Connection):
c_output_obj = self.conns.get_con_by_metadata(c_output.data.metadata)
Expand Down
30 changes: 30 additions & 0 deletions tests/scripts/test_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,36 @@ def test_canonical_input_9():
assert model.canonical_output == model.output # type: ignore


def test_canonical_input_10():
# Valued cannection cannot be canonical input
model = Model()
model += Add()(left=3, right="input2", output="output")

assert model.canonical_input is NOT_AVAILABLE


def test_canonical_input_11():
# Valued cannection cannot be canonical input
model = Model()
model += (buff := Buffer())
model += Add()(left=3, right="input2", output="output")

canonical_input = model.canonical_input
assert not isinstance(canonical_input, NotAvailable)
assert canonical_input.metadata == buff.input.metadata


def test_canonical_input_12():
# Valued cannection cannot be canonical input
model = Model()
model += (buff := Buffer())
model += Buffer()(input=3 / buff.output)

canonical_input = model.canonical_input
assert not isinstance(canonical_input, NotAvailable)
assert canonical_input.metadata == buff.input.metadata


def test_canonical_dual_iadd_op():
model1 = Model()
model1 += (c1 := Convolution2D(3, 4))
Expand Down
Loading