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 issue with unsorted dict #20613

Merged
merged 1 commit into from
Dec 9, 2024
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
8 changes: 7 additions & 1 deletion keras/src/models/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,13 @@ def _standardize_inputs(self, inputs):
raise_exception = True
else:
raise_exception = True

if (
isinstance(self._inputs_struct, dict)
and not isinstance(inputs, dict)
and list(self._inputs_struct.keys())
!= sorted(self._inputs_struct.keys())
):
raise_exception = True
self._maybe_warn_inputs_struct_mismatch(
inputs, raise_exception=raise_exception
)
Expand Down
16 changes: 15 additions & 1 deletion keras/src/models/functional_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from keras.src.models import Functional
from keras.src.models import Model
from keras.src.models import Sequential
from keras.src import ops


class FunctionalTest(testing.TestCase):
Expand Down Expand Up @@ -573,7 +574,6 @@ def is_input_warning(w):
with pytest.warns() as warning_logs:
model.predict([np.ones((2, 2)), np.zeros((2, 2))], verbose=0)
self.assertLen(list(filter(is_input_warning, warning_logs)), 1)

# No warning for mismatched tuples and lists.
model = Model([i1, i2], outputs)
with warnings.catch_warnings(record=True) as warning_logs:
Expand Down Expand Up @@ -699,3 +699,17 @@ def test_dict_input_to_list_model(self):
"tags": tags_data,
}
)

def test_list_input_with_dict_build(self):
x1 = Input((10,), name="IT")
x2 = Input((10,), name="IS")
y = layers.subtract([x1, x2])
model = Model(inputs={"IT": x1, "IS": x2}, outputs=y)
x1 = ops.ones((1, 10))
x2 = ops.zeros((1, 10))
r1 = model({"IT": x1, "IS": x2})
with self.assertRaisesRegex(
ValueError,
"The structure of `inputs` doesn't match the expected structure",
):
r2 = model([x1, x2])
Loading