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

dashboard and tutorials data, models and labels locations (issue #667) #699

Merged
merged 58 commits into from
Mar 20, 2024

Conversation

elboyran
Copy link
Contributor

@elboyran elboyran commented Jan 26, 2024

solves issue #667

@elboyran elboyran marked this pull request as draft January 26, 2024 16:03
@elboyran elboyran changed the title issue #667 removing the bee.jpg issue #667 dashboard data models and labels locations Jan 26, 2024
@elboyran

This comment was marked as outdated.

@elboyran elboyran self-assigned this Jan 26, 2024
@elboyran elboyran changed the title issue #667 dashboard data models and labels locations dashboard data models and labels locations (part of issue #667) Jan 26, 2024
@dianna-ai dianna-ai deleted a comment from review-notebook-app bot Feb 2, 2024
@elboyran
Copy link
Contributor Author

elboyran commented Mar 4, 2024

Conflicting files seems to be only about clear output from notebooks. Not sure how to ignore this.

@elboyran elboyran marked this pull request as ready for review March 6, 2024 08:04
@elboyran elboyran marked this pull request as draft March 6, 2024 08:04
@elboyran elboyran marked this pull request as ready for review March 6, 2024 08:14
@elboyran elboyran requested a review from loostrum March 6, 2024 08:14
@elboyran
Copy link
Contributor Author

elboyran commented Mar 7, 2024

Old and proposed folder structures of dianna/dianna and dianna/tutorials :

main branch

dianna (6 directories, 56 files)

├── init.py
├── ...
├── dashboard
│   ├── ...
├── data
│   ├── bee_2.png
│   ├── binary-mnist.npz
│   ├── digit0.jpeg
│   ├── digit0.jpg
│   ├── digit0.png
│   ├── digit1.png
│   ├── labels_mnist.txt
│   ├── labels_resnet50.txt
│   ├── labels_text.txt
│   ├── leafsnap_model.onnx
│   ├── logo.png
│   ├── mnist_model_tf.onnx
│   ├── movie_review_model.onnx
│   ├── movie_reviews_word_vectors.txt
│   ├── season_prediction_model_temp_max_binary.onnx
│   ├── weather_data.npy
│   └── weather_data_labels.txt
├── methods
│   ├── ...
├── utils
│   ├── ...
└── visualization
│   ├── ...

tutorials (4 directories, 38 files)

├── README.md
├── conversion_onnx
│   ├── ...
├── data
│   ├── binary-mnist.npz
│   ├── coffee_test.csv
│   ├── coffee_train.csv
│   ├── leafsnap_classes.csv
│   ├── leafsnap_example_acer_rubrum.jpg
│   ├── movie_reviews_word_vectors.txt
│   └── shapes.npz
├── demo.ipynb
├── img
│   ├── bee.jpg
│   └── digit0.jpg
├── 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
│   ├── coffee.onnx
│   ├── geometric_shapes_model.onnx
│   ├── leafsnap_model.onnx
│   ├── mnist_model.onnx
│   ├── mnist_model_tf.onnx
│   ├── movie_review_model.onnx
│   ├── penguin_model.onnx
│   ├── season_prediction_model_temp_max_binary.onnx
│   └── sunshine_hours_regression_model.onnx
├── rise_imagenet.ipynb
├── rise_mnist.ipynb
├── rise_text.ipynb
└── rise_timeseries_weather.ipynb


667-reorganize branch

dianna (8 directories, 66 files)

├── init.py
├── ...
├── dashboard
│   ├── ...
├── data
│   ├── bee.jpg
│   ├── binary-mnist.npz
│   ├── digit0.jpeg
│   ├── digit0.jpg
│   ├── digit0.png
│   ├── digit1.png
│   ├── leafsnap_example_acer_rubrum.jpg
│   ├── logo.png
│   ├── shapes.npz
│   └── weather_data.npy
├── labels
│   ├── coffee_test.csv
│   ├── coffee_train.csv
│   ├── labels_mnist.txt
│   ├── labels_resnet50.txt
│   ├── labels_text.txt
│   ├── leafsnap_classes.csv
│   ├── movie_reviews_word_vectors.txt
│   └── weather_data_labels.txt
├── methods
│   ├── ...
├── models
│   ├── coffee.onnx
│   ├── geometric_shapes_model.onnx
│   ├── leafsnap_model.onnx
│   ├── mnist_model.onnx
│   ├── mnist_model_tf.onnx
│   ├── movie_review_model.onnx
│   ├── penguin_model.onnx
│   ├── season_prediction_model_temp_max_binary.onnx
│   └── sunshine_hours_regression_model.onnx
├── utils
│   ├── ...
└── visualization
├── ...

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

Copy link
Member

@loostrum loostrum left a comment

Choose a reason for hiding this comment

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

Very nice, thanks for reorganizing this! I very much like that all data files are in one place now. I do have one thing to discuss: we now include everything under dianna/data in the pip package, so everyone that install dianna gets a pretty big download as it includes all those files. However, the files are only needed for the tutorials and dashboard. Would it make sense to not include the bigger files in the pip package, and only download them when needed in the notebooks/dashboard code?

@elboyran
Copy link
Contributor Author

elboyran commented Mar 13, 2024

Very nice, thanks for reorganizing this! I very much like that all data files are in one place now. I do have one thing to discuss: we now include everything under dianna/data in the pip package, so everyone that install dianna gets a pretty big download as it includes all those files. However, the files are only needed for the tutorials and dashboard. Would it make sense to not include the bigger files in the pip package, and only download them when needed in the notebooks/dashboard code?

You are right. Maybe after addressing #171 it will not be an issue.

@elboyran
Copy link
Contributor Author

@cwmeijer do you mind merging this after the new release?

@loostrum
Copy link
Member

Very nice, thanks for reorganizing this! I very much like that all data files are in one place now. I do have one thing to discuss: we now include everything under dianna/data in the pip package, so everyone that install dianna gets a pretty big download as it includes all those files. However, the files are only needed for the tutorials and dashboard. Would it make sense to not include the bigger files in the pip package, and only download them when needed in the notebooks/dashboard code?

You are right. Maybe after addressing #171 it will not be an issue.

Let's leave it for now indeed. For reference: it can be done by editing the MANIFEST.in file. The pypi package default is to not include any non-python files.

@elboyran
Copy link
Contributor Author

Very nice, thanks for reorganizing this! I very much like that all data files are in one place now. I do have one thing to discuss: we now include everything under dianna/data in the pip package, so everyone that install dianna gets a pretty big download as it includes all those files. However, the files are only needed for the tutorials and dashboard. Would it make sense to not include the bigger files in the pip package, and only download them when needed in the notebooks/dashboard code?

You are right. Maybe after addressing #171 it will not be an issue.

Let's leave it for now indeed. For reference: it can be done by editing the MANIFEST.in file. The pypi package default is to not include any non-python files.

Is your review for this PR positive then? ;-)

Copy link
Member

@loostrum loostrum left a comment

Choose a reason for hiding this comment

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

Good point, it is! :)

There are just 2 merge conflicts to resolve first in the notebooks, but I assume that will work out

@elboyran elboyran mentioned this pull request Mar 13, 2024
@elboyran
Copy link
Contributor Author

Good point, it is! :)

There are just 2 merge conflicts to resolve first in the notebooks, but I assume that will work out

Indeed, as I mentioned earlier I think these are just 2 notebooks that differ in with or without cell output. I'm not fluent enough in git to resolve manually the conflicts (cannot be done anutomatically). Can someone who knows better, merge the branch 667-reorganise to main? @loostrum, @cwmeijer ?

@loostrum
Copy link
Member

I'll try fixing it now

@elboyran
Copy link
Contributor Author

elboyran commented Mar 20, 2024 via email

@loostrum loostrum merged commit 3f19af5 into main Mar 20, 2024
16 of 17 checks passed
@elboyran elboyran deleted the 667-reorganize branch April 10, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants