-
Notifications
You must be signed in to change notification settings - Fork 19.6k
Fix TF trainer bug when first input is None #21630
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
Open
neo-alex
wants to merge
1
commit into
keras-team:master
Choose a base branch
from
neo-alex:fix-tf-trainer-first-input-none
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+6
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,7 +68,9 @@ def train_step(self, data): | |
) | ||
self._loss_tracker.update_state( | ||
loss_module.unscale_loss_for_distribution(loss), | ||
sample_weight=tf.shape(tree.flatten(x)[0])[0], | ||
sample_weight=tf.shape( | ||
next(i for i in tree.flatten(x) if i is not None) | ||
)[0], | ||
) | ||
if self.optimizer is not None: | ||
loss = self.optimizer.scale_loss(loss) | ||
|
@@ -96,7 +98,9 @@ def test_step(self, data): | |
) | ||
self._loss_tracker.update_state( | ||
loss_module.unscale_loss_for_distribution(loss), | ||
sample_weight=tf.shape(tree.flatten(x)[0])[0], | ||
sample_weight=tf.shape( | ||
next(i for i in tree.flatten(x) if i is not None) | ||
)[0], | ||
Comment on lines
+101
to
+103
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. +1 |
||
) | ||
return self.compute_metrics(x, y, y_pred, sample_weight=sample_weight) | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change correctly handles cases where the first input is
None
. However, it introduces a risk of aStopIteration
error if all inputs inx
areNone
. This can be difficult to debug, especially inside atf.function
.A more robust approach would be to handle this edge case explicitly, for example by raising a
ValueError
with a clear message.Also, this logic is duplicated in
test_step
. Consider extracting it into a private helper method to improve maintainability and ensure consistency.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1