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

feat(losses): add Dice loss implementation #19409

Merged
merged 3 commits into from
Apr 1, 2024

Conversation

lpizzinidev
Copy link
Contributor

Adds Dice class/function implementation to losses.

@codecov-commenter
Copy link

codecov-commenter commented Mar 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.98%. Comparing base (b57bfcd) to head (3e0ef6f).

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #19409      +/-   ##
==========================================
+ Coverage   75.97%   75.98%   +0.01%     
==========================================
  Files         366      366              
  Lines       40742    40759      +17     
  Branches     7945     7946       +1     
==========================================
+ Hits        30954    30971      +17     
  Misses       8075     8075              
  Partials     1713     1713              
Flag Coverage Δ
keras 75.83% <100.00%> (+0.01%) ⬆️
keras-jax 60.13% <100.00%> (+0.01%) ⬆️
keras-numpy 54.11% <100.00%> (+0.01%) ⬆️
keras-tensorflow 61.39% <100.00%> (+0.01%) ⬆️
keras-torch 60.28% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@fchollet fchollet left a comment

Choose a reason for hiding this comment

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

Thank you for the PR!



@keras_export("keras.losses.dice")
def dice(y_true, y_pred, smooth=1e-6):
Copy link
Member

Choose a reason for hiding this comment

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

You can remove the smooth argument.


intersection = ops.sum(ops.dot(inputs, targets))
dice = ops.divide(
2.0 * intersection + smooth, ops.sum(y_true) + ops.sum(y_pred) + smooth
Copy link
Member

Choose a reason for hiding this comment

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

Instead smooth, use backend.epsilon(). Only use it for the denominator.

Returns:
Dice loss value.
"""
y_true = ops.cast(y_true, dtype="float32")
Copy link
Member

Choose a reason for hiding this comment

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

There's no need to force the use of float32, you can just use ops.convert_to_tensor(y_true)

Dice loss value.
"""
y_true = ops.cast(y_true, dtype="float32")
y_pred = ops.cast(y_pred, dtype="float32")
Copy link
Member

Choose a reason for hiding this comment

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

Same here.

y_pred = ops.convert_to_tensor(y_pred)
y_true = ops.cast(y_true, y_pred.dtype)

@lpizzinidev
Copy link
Contributor Author

@fchollet Thanks for reviewing 👍

@innat
Copy link

innat commented Mar 31, 2024

Shouldn't it be in keras-cv?

keras-team/keras-cv#371
keras-team/keras-cv#968

inputs = ops.reshape(y_true, [-1])
targets = ops.reshape(y_pred, [-1])

intersection = ops.sum(ops.dot(inputs, targets))
Copy link
Member

Choose a reason for hiding this comment

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

Easier to replace dot with * here (doesn't change numerics)

keras/losses/losses.py Show resolved Hide resolved
Copy link
Member

@fchollet fchollet left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@google-ml-butler google-ml-butler bot added kokoro:force-run ready to pull Ready to be merged into the codebase labels Apr 1, 2024
@fchollet fchollet merged commit 6c591d7 into keras-team:master Apr 1, 2024
6 checks passed
@google-ml-butler google-ml-butler bot removed ready to pull Ready to be merged into the codebase kokoro:force-run labels Apr 1, 2024
james77777778 added a commit to james77777778/keras that referenced this pull request Apr 3, 2024
* Refactor dtypes in codebase and add float8_* dtypes

* Update comments

Fix for JAX export on GPU. (keras-team#19404)

Fix formatting in export_lib. (keras-team#19405)

`ops/numpy.py`: Support `key` as `list` in `GetItem` (keras-team#19310)

When loading a model that contains `GetItem` nodes with multidimensional
indices/slices as `key`, the `key` argument is loaded from JSON as a `list`,
not a `tuple` (because JSON does not have the distinction).

So, treat the `key list` as equivalent to the `key tuple`.
Copying is important: otherwise, the later `pop()` will remove the bound
slice elements from the op itself.

`saving/serialization_lib_test.py`:

* Add `test_numpy_get_item_layer()`:
	test for consistent serialization/deserialization of a model which
	contains `ops.numpy.GetItem`;

feat(losses): add Dice loss implementation (keras-team#19409)

* feat(losses): add Dice loss implementation

* removed smooth parameter and type casting

* adjusted casting and dot operator

Update casting

Bump the github-actions group with 1 update (keras-team#19412)

Bumps the github-actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).

Updates `github/codeql-action` from 3.24.6 to 3.24.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@8a470fd...1b1aada)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fix issue with shared layer deserialization

Remove dead code in saving lib (keras-team#19415)

Remove unused beta param for silu, use torch op directly (keras-team#19417)

The beta param was only accepted on the tensorflow/torch backends
and not in the `keras.ops` API, nor was it tested. I think best
just to ditch, since no one could be relying on it.

Fix print_fn for custom function (keras-team#19419)

Add fp8 to `EinsumDense`

Add test script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Assigned Reviewer
Development

Successfully merging this pull request may close these issues.

5 participants