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

Unify outputs types #703

Merged
merged 20 commits into from
Apr 2, 2024
Merged

Unify outputs types #703

merged 20 commits into from
Apr 2, 2024

Conversation

SarahAlidoost
Copy link
Contributor

@SarahAlidoost SarahAlidoost commented Jan 30, 2024

closes #640
relates #691, #713, #711

See an overview of changes here.

@cwmeijer cwmeijer added this to In progress in SS Sprint 5 Feb 7, 2024
@SarahAlidoost SarahAlidoost added the standup Temp label- for disscussion with the team next standup label Feb 21, 2024
@SarahAlidoost SarahAlidoost removed the standup Temp label- for disscussion with the team next standup label Feb 21, 2024
@SarahAlidoost SarahAlidoost changed the title Unify outputs type and value ranges Unify outputs types Feb 21, 2024
@SarahAlidoost SarahAlidoost marked this pull request as ready for review February 21, 2024 15:57
@SarahAlidoost SarahAlidoost moved this from In progress to Ready for review in SS Sprint 5 Feb 21, 2024
dianna/__init__.py Outdated Show resolved Hide resolved
@cwmeijer
Copy link
Contributor

cwmeijer commented Feb 27, 2024

Thanks for your PR! Clearly, a lot of work went into it!
I only reviewed 1 or 2 files yet. Could you have a look at my comment on type hints?
I also see that the notebooks are failing.
image
I think it's because you changed the output type of some explainer so it doesn't match the notebook's code anymore. Could you try and fix those?

SarahAlidoost and others added 2 commits February 27, 2024 15:49
Co-authored-by: Christiaan Meijer <c.meijer@esciencecenter.nl>
@SarahAlidoost
Copy link
Contributor Author

Thanks for your PR! Clearly, a lot of work went into it! I only reviewed 1 or 2 files yet. Could you have a look at my comment on type hints? I also see that the notebooks are failing. image I think it's because you changed the output type of some explainer so it doesn't match the notebook's code anymore. Could you try and fix those?

Thanks for reviewing. I addressed your comment about typing. Regarding the notebook error, as discussed, they will be fixed in a separate PR, see #711

Copy link
Contributor

@cwmeijer cwmeijer left a comment

Choose a reason for hiding this comment

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

Thanks for this PR! Great addition to our code base and improvement in usability!
I made some suggestions, but all are to some extend details. Whether you change anything or not, I approve merging this PR.
🎖

dianna/methods/kernelshap_image.py Outdated Show resolved Hide resolved
dianna/methods/kernelshap_image.py Outdated Show resolved Hide resolved
@cwmeijer cwmeijer added this to Ready for review in SS Sprint 6 Feb 28, 2024
@elboyran
Copy link
Contributor

elboyran commented Mar 6, 2024

Some checks should pass before we merge.

@SarahAlidoost
Copy link
Contributor Author

Some checks should pass before we merge.

Do you mean the failed checks for running the notebooks? For those checks to be passed, the notebooks should be updated. We decided not to update them in this pull request as it makes the PR large. Please see issue #711. Please let me know if there is another check you want me to fix in this PR.

@elboyran
Copy link
Contributor

elboyran commented Mar 6, 2024

Yes, you are correct.

@SarahAlidoost
Copy link
Contributor Author

Thanks for this PR! Great addition to our code base and improvement in usability! I made some suggestions, but all are to some extend details. Whether you change anything or not, I approve merging this PR. 🎖

Thank you for reviewing and nice comments 👍

@elboyran
Copy link
Contributor

elboyran commented Mar 13, 2024

When do we merge this PR?
Please, keep in mind that after merging #699, the tutorials will be at a new location.

Old and proposed folder structure of dianna/tutorials :

main branch

tutorials (4 directories, 38 files)

├── README.md
├── conversion_onnx
│   ├── ...
├── data
│   ├──...
├── demo.ipynb
├── img
│   ├── ...
├── kernelshap_geometric_shapes.ipynb
├── kernelshap_mnist.ipynb
├── kernelshap_tabular_penguin.ipynb
├── kernelshap_tabular_weather.ipynb
├── lime_images.ipynb
├── lime_tabular_penguin.ipynb
├── lime_tabular_weather.ipynb
├── lime_text.ipynb
├── lime_timeseries_coffee.ipynb
├── lime_timeseries_weather.ipynb
├── models
│   ├── ....
├── rise_imagenet.ipynb
├── rise_mnist.ipynb
├── rise_text.ipynb
└── rise_timeseries_weather.ipynb


667-reorganize branch

tutorials (5 directories, 20 files)

├── README.md
├── conversion_onnx
│   ├── ...
├── demo.ipynb
└── explainers
├── KernelSHAP
│   ├── kernelshap_geometric_shapes.ipynb
│   ├── kernelshap_mnist.ipynb
│   ├── kernelshap_tabular_penguin.ipynb
│   └── kernelshap_tabular_weather.ipynb
├── LIME
│   ├── lime_images.ipynb
│   ├── lime_tabular_penguin.ipynb
│   ├── lime_tabular_weather.ipynb
│   ├── lime_text.ipynb
│   ├── lime_timeseries_coffee.ipynb
│   └── lime_timeseries_weather.ipynb
└── RISE
├── rise_imagenet.ipynb
├── rise_mnist.ipynb
├── rise_text.ipynb
└── rise_timeseries_weather.ipynb

@SarahAlidoost SarahAlidoost merged commit 2c8e956 into main Apr 2, 2024
15 of 18 checks passed
@SarahAlidoost SarahAlidoost deleted the unify_outputs branch April 2, 2024 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
SS Sprint 5
Ready for review
SS Sprint 6
Ready for review
Development

Successfully merging this pull request may close these issues.

unify the function outputs in the API
3 participants