Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

ENH/MAINT: CNN regionalization, smash.Net.add() is deprecated #255

Merged
merged 18 commits into from
Jul 30, 2024

Conversation

nghi-truyen
Copy link
Member

@nghi-truyen nghi-truyen commented Jul 14, 2024

  • New regionalization mapping with CNN
  • smash.Net.add() is deprecated and replaced by multiple addition functions: add_conv2d, add_dense, add_scale,... The activation layer is now added by passing an argument into a trainable layer.
  • New unit test for smash.Net() combining Dense and Conv2D layers.

Important notes:

@nghi-truyen nghi-truyen added enhancement New feature or request maintenance Maintenance labels Jul 14, 2024
@nghi-truyen nghi-truyen added this to the Release v1.1.0 milestone Jul 14, 2024
@nghi-truyen nghi-truyen requested a review from inoelloc July 14, 2024 12:17
@nghi-truyen nghi-truyen linked an issue Jul 14, 2024 that may be closed by this pull request
@nghi-truyen
Copy link
Member Author

nghi-truyen commented Jul 14, 2024

@inoelloc Hello,
Je viens de faire 2 PRs sur le changement de l'optim Fortran-Python et l'ajout de CNN (donc la méthode net.add a aussi changé). L'idée c'est de réduire au maximum les conflits sur ma branche dev (modèle hydride) et de faciliter les changments à faire pour chaque PR. Je propose de faire les PRs par cet ordre pour simplifier le boulot :

@inoelloc
Copy link
Contributor

@inoelloc Hello, Je viens de faire 2 PRs sur le changement de l'optim Fortran-Python et l'ajout de CNN (donc la méthode net.add a aussi changé). L'idée c'est de réduire au maximum les conflits sur ma branche dev (modèle hydride) et de faciliter les changments à faire pour chaque PR. Je propose de faire les PRs par cet ordre pour simplifier le boulot :

* [Moving L-BFGS and SBS optimizers from Fortran to Python #238](https://github.com/DassHydro/smash/issues/238)

* [Add CNN mapping for regionalization #251](https://github.com/DassHydro/smash/issues/251)

* [New hydrid and ODE-based hydrological models #253](https://github.com/DassHydro/smash/issues/253)

* [Combine all optimizers from Fortran and Python #240](https://github.com/DassHydro/smash/issues/240)

* [mapping="ann" would be deprecated and replaced by "mlp" and "cnn" #254](https://github.com/DassHydro/smash/issues/254)

* [Saving the Model object and model ddt through the optimization process #252](https://github.com/DassHydro/smash/issues/252)

Hi, thanks. ok ok pour tout ca. J'aimerais finaliser les PR en cours avant de merge tout ca ^^"

Copy link
Contributor

@inoelloc inoelloc left a comment

Choose a reason for hiding this comment

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

Voila pas grand chose finalement. Je suis quand meme partant pour qu'en discute un peu ;)

smash/core/simulation/_standardize.py Show resolved Hide resolved
smash/factory/mesh/_standardize.py Outdated Show resolved Hide resolved
smash/factory/net/_layers.py Show resolved Hide resolved
smash/factory/net/_layers.py Show resolved Hide resolved
smash/factory/net/_layers.py Show resolved Hide resolved
smash/factory/net/_standardize.py Show resolved Hide resolved
smash/factory/net/net.py Show resolved Hide resolved
smash/tests/diff_baseline.csv Show resolved Hide resolved
@nghi-truyen nghi-truyen merged commit 2bde99a into main Jul 30, 2024
22 checks passed
@nghi-truyen nghi-truyen deleted the enh-cnn-regionalization branch July 30, 2024 13:09
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
enhancement New feature or request maintenance Maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add CNN mapping for regionalization
2 participants