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

Integrate experimental metrics with other modules #549

Merged
merged 13 commits into from
Jan 30, 2024

Conversation

fcogidi
Copy link
Collaborator

@fcogidi fcogidi commented Jan 22, 2024

PR Type

Fix.

Short Description

  • Add average precision metric.
  • Use experimental metrics package in other Cyclops modules.

Tests Added

tests/cyclops/evaluate/metrics/experimental/test_average_precision.py

@fcogidi fcogidi added the refactor Refactor existing code, with same or similar functionality label Jan 22, 2024
@fcogidi fcogidi marked this pull request as draft January 28, 2024 23:41
@fcogidi fcogidi marked this pull request as ready for review January 29, 2024 18:48
@fcogidi fcogidi requested a review from amrit110 January 29, 2024 18:49
@fcogidi
Copy link
Collaborator Author

fcogidi commented Jan 29, 2024

@amrit110 Please take a look at the docs build.

PS: Welcome back! :)

@amrit110
Copy link
Member

amrit110 commented Jan 29, 2024

@fcogidi thanks :). Fixed the issue with the notebook kernel. Think there is some other error now, seems to be in the plotting function.

Copy link

codecov bot commented Jan 29, 2024

Codecov Report

Attention: 36 lines in your changes are missing coverage. Please review.

Comparison is base (5c4ebb2) 70.50% compared to head (46ef980) 70.71%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #549      +/-   ##
==========================================
+ Coverage   70.50%   70.71%   +0.21%     
==========================================
  Files         124      126       +2     
  Lines       11106    11224     +118     
==========================================
+ Hits         7830     7937     +107     
- Misses       3276     3287      +11     
Files Coverage Δ
cyclops/evaluate/fairness/config.py 100.00% <100.00%> (ø)
cyclops/evaluate/metrics/experimental/auroc.py 100.00% <100.00%> (ø)
...evaluate/metrics/experimental/average_precision.py 100.00% <100.00%> (ø)
cyclops/evaluate/metrics/experimental/f_score.py 100.00% <ø> (ø)
.../evaluate/metrics/experimental/functional/auroc.py 94.31% <100.00%> (ø)
cyclops/evaluate/metrics/experimental/mae.py 100.00% <100.00%> (ø)
cyclops/evaluate/metrics/experimental/mape.py 94.73% <100.00%> (+0.29%) ⬆️
cyclops/evaluate/metrics/experimental/mse.py 90.90% <100.00%> (+0.43%) ⬆️
.../metrics/experimental/negative_predictive_value.py 100.00% <ø> (ø)
.../evaluate/metrics/experimental/precision_recall.py 100.00% <ø> (ø)
... and 12 more

Impacted file tree graph

@fcogidi fcogidi merged commit 8fb3cf1 into main Jan 30, 2024
9 checks passed
@fcogidi fcogidi deleted the intergrate_experimental_metrics_with_evaluators branch January 30, 2024 00:11
rjavadi pushed a commit that referenced this pull request Jan 30, 2024
* integrate experimental metrics with other modules

* add average precision metric to experimental metrics package

* fix tutorials

* Add type hints and keyword arguments to metrics classes

* Update nbsphinx version to 0.9.3

* Update nbconvert version to 7.14.2

* Fix type annotations and formatting issues

* Update kernel display name in mortality_prediction.ipynb

* Add guard clause to prevent module execution on import

* Update `torch_distributed.py` with type hints

* Add multiclass and multilabel average precision metrics

* Change jupyter kernel

* Fix type annotations for metric values in ClassificationPlotter

---------

Co-authored-by: Amrit K <amritk@vectorinstitute.ai>
amrit110 added a commit that referenced this pull request Feb 11, 2024
* Changed documentation theme to sphinx-book-theme

* Added details about Pandoc requirment

* Added initial document for accuracy.py

* Fix pre-commit hook errors

* Added confusion matrix doc

* Add auroc doc and fix titles

* Add average precision docs

* Added more documents for metrics

* Add index for user guide in side bar

* Minor patches (#542)

* Fix capitalization of Python

* Change ValueError to TypeError and update docstrings

* Add Precision-Recall Curve to experimental metrics (#544)

* Add ROC curve (#545)

* Add ROC metrics to experimental module

* fix typo

* Fix docstrings

* Add AUROC (#546)

* Add AUROC metric to experimental module

* Refactor binary and multiclass ROC functions

* Refactor tests to use a common thresholds list

* Fix mypy error

* Add regression metrics (#547)

* Add regression support

* update docstrings

* Ignore `no-any-return` errors

* Integrate experimental metrics with other modules (#549)

* integrate experimental metrics with other modules

* add average precision metric to experimental metrics package

* fix tutorials

* Add type hints and keyword arguments to metrics classes

* Update nbsphinx version to 0.9.3

* Update nbconvert version to 7.14.2

* Fix type annotations and formatting issues

* Update kernel display name in mortality_prediction.ipynb

* Add guard clause to prevent module execution on import

* Update `torch_distributed.py` with type hints

* Add multiclass and multilabel average precision metrics

* Change jupyter kernel

* Fix type annotations for metric values in ClassificationPlotter

---------

Co-authored-by: Amrit K <amritk@vectorinstitute.ai>

* Changed documentation theme to sphinx-book-theme

* Don't update deps

* Pre-commit fixes

* Add doc for ROC Curve

* Fix footer in docs

* Bump to 0.2.3

Signed-off-by: Amrit Krishnan <amrit110@gmail.com>

* Add logo and css fixes

* Fix formatting of conf.py file

* Small fix

* Move evaluation metrics docs under API reference

* Fix poetry build

* Improve documentation structure

* Formatting fixes

---------

Signed-off-by: Amrit Krishnan <amrit110@gmail.com>
Co-authored-by: Franklin <41602287+fcogidi@users.noreply.github.com>
Co-authored-by: Amrit K <amritk@vectorinstitute.ai>
Co-authored-by: Amrit Krishnan <amrit110@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Refactor existing code, with same or similar functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants