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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework of Sklearn Metrics #1327

Merged
merged 44 commits into from Jun 10, 2020
Merged

Rework of Sklearn Metrics #1327

merged 44 commits into from Jun 10, 2020

Commits on Jun 9, 2020

  1. Create utils.py

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    99a94dc View commit details
    Browse the repository at this point in the history

  2. Create __init__.py

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    4f546b5 View commit details
    Browse the repository at this point in the history

  3. redo sklearn metrics

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    ae19aa8 View commit details
    Browse the repository at this point in the history

  4. add some more metrics

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    fec66b4 View commit details
    Browse the repository at this point in the history

  5. add sklearn metrics

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    08ad7b0 View commit details
    Browse the repository at this point in the history

  6. New metric classes (#1326) 

    * Create metrics package

* Create metric.py

* Create utils.py

* Create __init__.py

* add tests for metric utils

* add docstrings for metrics utils

* add function to recursively apply other function to collection

* add tests for this function

* update test

* Update pytorch_lightning/metrics/metric.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* update metric name

* remove example docs

* fix tests

* add metric tests

* fix to tensor conversion

* fix apply to collection

* Update CHANGELOG.md

* Update pytorch_lightning/metrics/metric.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* remove tests from init

* add missing type annotations

* rename utils to convertors

* Create metrics.rst

* Update index.rst

* Update index.rst

* Update pytorch_lightning/metrics/convertors.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update pytorch_lightning/metrics/convertors.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update pytorch_lightning/metrics/convertors.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update pytorch_lightning/metrics/metric.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update tests/utilities/test_apply_to_collection.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update tests/utilities/test_apply_to_collection.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Update tests/metrics/convertors.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* add doctest example

* rename file and fix imports

* added parametrized test

* replace lambda with inlined function

* rename apply_to_collection to apply_func

* Separated class description from init args

* Apply suggestions from code review

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

* adjust random values

* suppress output when seeding

* remove gpu from doctest

* Add requested changes and add ellipsis for doctest

* forgot to push these files...

* add explicit check for dtype to convert to

* fix ddp tests

* remove explicit ddp destruction

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
    @justusschock @Borda
    justusschock and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    2722c08 View commit details
    Browse the repository at this point in the history

  7. Create __init__.py

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    d7bf19a View commit details
    Browse the repository at this point in the history

  8. redo sklearn metrics

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    ba2c6f7 View commit details
    Browse the repository at this point in the history

  9. add sklearn metrics

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    6595de8 View commit details
    Browse the repository at this point in the history

  10. start adding sklearn tests

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    729690e View commit details
    Browse the repository at this point in the history

  11. fix typo

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    429dab6 View commit details
    Browse the repository at this point in the history

  12. fix typo

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    387b9b2 View commit details
    Browse the repository at this point in the history

  13. fix typo

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    74ab62b View commit details
    Browse the repository at this point in the history

  14. fix typo

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    8e5f1d6 View commit details
    Browse the repository at this point in the history

  15. return x and y only for curves

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    5082268 View commit details
    Browse the repository at this point in the history

  16. fix typo

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    10cde37 View commit details
    Browse the repository at this point in the history

  17. add missing tests for sklearn funcs

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    1a1762d View commit details
    Browse the repository at this point in the history

  18. imports

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    a698282 View commit details
    Browse the repository at this point in the history

  19. __all__

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    debd245 View commit details
    Browse the repository at this point in the history

  20. imports

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    04adf4b View commit details
    Browse the repository at this point in the history

  21. fix sklearn arguments

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    c72bda9 View commit details
    Browse the repository at this point in the history

  22. fix imports

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    ca471d6 View commit details
    Browse the repository at this point in the history

  23. update requirements

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    e9f5faf View commit details
    Browse the repository at this point in the history

  24. Update CHANGELOG.md

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    13f205a View commit details
    Browse the repository at this point in the history

  25. Update test_sklearn_metrics.py

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    b5dbdb8 View commit details
    Browse the repository at this point in the history

  26. formatting

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    a7e3e4f View commit details
    Browse the repository at this point in the history

  27. formatting

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    cc9b1b3 View commit details
    Browse the repository at this point in the history

  28. format

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    c9908a1 View commit details
    Browse the repository at this point in the history

  29. fix all warnings and formatting problems

    @awaelchli @Borda
    awaelchli authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    41e5971 View commit details
    Browse the repository at this point in the history

  30. Update environment.yml

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    82781e5 View commit details
    Browse the repository at this point in the history

  31. Update requirements-extra.txt

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    01c3e57 View commit details
    Browse the repository at this point in the history

  32. Update environment.yml

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    6a674b6 View commit details
    Browse the repository at this point in the history

  33. Update requirements-extra.txt

    @justusschock @Borda
    justusschock authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    c96e3d7 View commit details
    Browse the repository at this point in the history

  34. Update CHANGELOG.md

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    b779e37 View commit details
    Browse the repository at this point in the history

  35. docs

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    f6e6cec View commit details
    Browse the repository at this point in the history

  36. inherit

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    533bb7c View commit details
    Browse the repository at this point in the history

  37. fix all warnings and formatting problems

    @awaelchli @Borda
    awaelchli authored and Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    ca117e4 View commit details
    Browse the repository at this point in the history

  38. docs inherit.

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    36fa04c View commit details
    Browse the repository at this point in the history

  39. docs

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    0a3a31a View commit details
    Browse the repository at this point in the history

  40. Apply suggestions from code review 

    Co-authored-by: Nicki Skafte <skaftenicki@gmail.com>
    @Borda @SkafteNicki
    Borda and SkafteNicki committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    c8d6cac View commit details
    Browse the repository at this point in the history

  41. docs

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    eeede87 View commit details
    Browse the repository at this point in the history

  42. req

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    db8e724 View commit details
    Browse the repository at this point in the history

  43. min

    @Borda
    Borda committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    d49298a View commit details
    Browse the repository at this point in the history

  44. Apply suggestions from code review 

    Co-authored-by: Tullie Murrell <tulliemurrell@gmail.com>
    @Borda @tullie
    Borda and tullie committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    363bd64 View commit details
    Browse the repository at this point in the history