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: new methods added to smash.factory.Net #312

Merged
merged 28 commits into from
Sep 10, 2024
Merged

ENH: new methods added to smash.factory.Net #312

merged 28 commits into from
Sep 10, 2024

Conversation

nghi-truyen
Copy link
Member

@nghi-truyen nghi-truyen commented Sep 9, 2024 •
edited
Loading

New features are added to smash.factory.Net sub-package:

  • Net.set_weight to set weights for the regionalization NN
  • Net.set_bias to set biases for the regionalization NN
  • Net.get_weight to get weights of the regionalization NN
  • Net.get_bias to get biases of the regionalization NN
  • Net.forward_pass to run a forward pass for the regionalization NN

Some tests are also added for the new methods

@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
Fix indent docstring net
3d71aec
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
63a49b7
@nghi-truyen
add weight/bias_shape into trainable layer
ee7824d
@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
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
873302c
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
a189bc3
@nghi-truyen
Change x_train name to x in net
47bda59
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
71b3148
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
4951e29
@nghi-truyen
Generate baseline
016e853
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
4eae8e6
@nghi-truyen
Fix doc net
bb207ff
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
4133580
@nghi-truyen
Fix raise message net.set_weight_bias
7b297cb
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass:
56855c6 
Change hybrid structure name
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass:
1bce0fc 
- More flexible NN structure for hybrid models
- Ignore conflicts on baseline
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
217f05d
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
8c6c0f0
@nghi-truyen
ENH: add random_state to set_weight and set_bias methods
0ed8ecc
@nghi-truyen
Minor fix typos
d0bbb22
@nghi-truyen
Merge branch 'enh-hybrid-models' into enh-net-forward-pass
1b40d8d
@nghi-truyen
Merge remote-tracking branch 'upstream/main' into enh-net-forward-pass
cdc8818
@nghi-truyen nghi-truyen added the enhancement New feature or request label Sep 9, 2024
@nghi-truyen nghi-truyen added this to the Release v1.1.0 milestone Sep 9, 2024
@nghi-truyen nghi-truyen linked an issue Sep 9, 2024 that may be closed by this pull request
ENH: add a public method to run a forward pass for Net #279
Closed
inoelloc
inoelloc reviewed Sep 9, 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.

Good pour moi. Je laisse @pag13 jeter un oeil avant de merge !

smash/core/simulation/_doc.py Outdated Show resolved Hide resolved
smash/factory/net/_layers.py Show resolved Hide resolved
smash/factory/net/_standardize.py Outdated Show resolved Hide resolved
smash/factory/net/net.py Show resolved Hide resolved
pag13
pag13 reviewed Sep 10, 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.

Changes ok for me, thanks.

smash/core/simulation/_doc.py Outdated Show resolved Hide resolved
@nghi-truyen nghi-truyen merged commit f1d6416 into DassHydro:main Sep 10, 2024
22 checks passed
@nghi-truyen nghi-truyen deleted the enh-net-forward-pass branch September 10, 2024 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@inoelloc inoelloc inoelloc left review comments

@pag13 pag13 pag13 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: add a public method to run a forward pass for Net
3 participants
@nghi-truyen @pag13 @inoelloc