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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ENH: Add hybrid models for gr and loieau structures #327

Merged
merged 160 commits into from
Sep 24, 2024
Merged

ENH: Add hybrid models for gr and loieau structures #327

merged 160 commits into from
Sep 24, 2024

Conversation

nghi-truyen
Copy link
Member

New hybrid model structures are added to smash (based on the previous one for gr4):

  • gr5_mlp
  • gr6_mlp
  • grc_mlp
  • grd_mlp
  • loieau_mlp

@nghi-truyen
Merge remote-tracking branch 'upstream/main' into enh-combine-optimizers
b58ec06
@nghi-truyen
initalize branch combine optimizers
233a8cc
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-combine-optimizers
90afd60
@nghi-truyen
Merge remote-tracking branch 'upstream/enh-cnn-regionalization' into …
c70db0c 
…enh-net-forward-pass
@nghi-truyen
ENH: add set, get and forward_pass methods for Net
30eb4c5
@nghi-truyen
ENH: add test net forward pass + fix doc net
e4b06e8
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-combine-optimizers
75a847c
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-combine-optimizers
91bed2f
@nghi-truyen
Fix indent docstring net
3d71aec
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-combine-optimizers
b8dc977
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
63a49b7
@nghi-truyen
add weight/bias_shape into trainable layer
b4c5dfc
@nghi-truyen
add weight/bias_shape into trainable layer
ee7824d
@nghi-truyen
Remove redundant in Python function sbs_optimize
0ffd8ad
@nghi-truyen
Merge remote-tracking branch 'upstream/enh-cnn-regionalization' into …
7f5f9ec 
…enh-net-forward-pass
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
41a7aa6
@nghi-truyen
adaptive optimizers for all mappings
91429b2
@nghi-truyen
Merge remote-tracking branch 'upstream/move-optimizers-to-Python' int…
e1a5a64 
…o enh-combine-optimizers
@nghi-truyen
finalize optimizer combination
7b5b069
@nghi-truyen
Fix parameter update when using early stopping + dic api doc optimize
268fe5e
@nghi-truyen
Correct comment typo
b14c4af
@nghi-truyen
Fix comment
3b60a04
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…
9fc544b 
…pings
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
873302c
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…
a371562 
…pings
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
a189bc3
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…
a577e2b 
…pings
@nghi-truyen
Change x_train name to x in net
47bda59
@nghi-truyen
Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…
d007323 
…pings
@nghi-truyen
retrieve key x in control_info + fix api doc for control prior name
834fa73
nghi-truyen and others added 18 commits September 13, 2024 16:02
@nghi-truyen
Apply suggestion change from PAG review
060bd9e
@nghi-truyen
Merge branch 'enh-add-callback-optimize' into maint-remove-cost-optio…
328d804 
…ns-control-info
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into maint-remove-cost-o…
18d653b 
…ptions-control-info
@nghi-truyen
Merge branch 'enh-add-callback-optimize' into maint-change-default-net
ae15fe1
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into maint-change-defaul…
76ee294 
…t-net
@nghi-truyen
Merge branch 'maint-remove-cost-options-control-info' into enh-retrie…
007454a 
…ve-model-from-control
@nghi-truyen
Merge branch 'maint-change-default-net' into enh-retrieve-model-from-…
c905e83 
…control
@nghi-truyen
Apply suggestion changes from PAG review
7929854
@nghi-truyen
Merge branch 'maint-change-default-net' into enh-retrieve-model-from-…
7a6288b 
…control
@nghi-truyen
Apply suggestion change from FC review
7c816ba
@nghi-truyen
Merge branch 'maint-change-default-net' into enh-retrieve-model-from-…
59a39a7 
…control
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into enh-retrieve-model-…
520dd3d 
…from-control
@nghi-truyen
Apply suggestion changes from FC review
66599fb
@nghi-truyen
Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…
3eba900 
…-gr-and-loieau-structures
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into enh-hybrid-models-g…
70db3c1 
…r-and-loieau-structures
@nghi-truyen
MAINT: Update branch + merge from main
0572fc6
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into enh-hybrid-models-g…
c8a3d1d 
…r-and-loieau-structures
@nghi-truyen
Revert _version.py
5ed2a84
@nghi-truyen nghi-truyen added the enhancement New feature or request label Sep 18, 2024
@nghi-truyen nghi-truyen added this to the Release v1.1.0 milestone Sep 18, 2024
@nghi-truyen nghi-truyen linked an issue Sep 18, 2024 that may be closed by this pull request
ENH: Possibility of adding hybrid models for other hydrological structures (gr5, gr6, grc, grd, loieau) #295
Closed
inoelloc
inoelloc approved these changes Sep 23, 2024
View reviewed changes
Copy link
Member

@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.

Ok. Ca va faire pas mal de documentation tout ca !

smash/_constant.py Outdated Show resolved Hide resolved
pag13
pag13 reviewed Sep 23, 2024
View reviewed changes
Copy link
Collaborator

@pag13 pag13 left a comment

Choose a reason for hiding this comment

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

Gros commit encore Truyen, joli ça va en faire des tests sur un large sample, qui nécessiteront peut être d'effectuer des modifs des structures ou au moins des recettes d'optim (bornes, stepwise, etc) ?
Belle release et draft de code en vue !

smash/_constant.py Show resolved Hide resolved
smash/fcore/operator/md_gr_operator.f90 Outdated Show resolved Hide resolved
smash/fcore/operator/md_gr_operator.f90 Outdated Show resolved Hide resolved
smash/fcore/operator/md_gr_operator.f90 Show resolved Hide resolved
@nghi-truyen nghi-truyen merged commit 4833726 into DassHydro:main Sep 24, 2024
22 checks passed
@nghi-truyen nghi-truyen deleted the enh-hybrid-models-gr-and-loieau-structures branch September 24, 2024 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pag13 pag13 pag13 left review comments

@inoelloc inoelloc inoelloc approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
Release v1.1.0
Development

Successfully merging this pull request may close these issues.

ENH: Possibility of adding hybrid models for other hydrological structures (gr5, gr6, grc, grd, loieau)
3 participants
@nghi-truyen @pag13 @inoelloc