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

model factory refactor #146

Merged
merged 153 commits into from May 13, 2020
Merged

model factory refactor #146

merged 153 commits into from May 13, 2020

Conversation

ndiamant
Copy link
Contributor

@ndiamant ndiamant commented Mar 2, 2020

  • parents and u_connect work
  • No variational mode yet
  • model tests are much more thorough. They are very slow though, because tf is slow at loading
  • Looks like it adds a bunch of lines, but many are to temporarily preserve make_variational..., which will soon be deprecated

Here is a model with u_connect, multiple inputs, multiple outputs, and parented outputs
image

Comment on lines 570 to 571
sample_weights = [None] * len(out_batch)
return (in_batch, out_batch, sample_weights, paths) if return_paths else (in_batch, out_batch, sample_weights)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the same as master, not sure why it's presented as a change

Comment on lines 617 to 618
sample_weights = [in_batch.pop(sample_weight.input_name()).flatten()] * len(out_batch)
return (in_batch, out_batch, sample_weights, paths) if return_paths else (in_batch, out_batch, sample_weights)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the same as master, not sure why it's presented as a change

Copy link
Collaborator

@lucidtronix lucidtronix left a comment

Choose a reason for hiding this comment

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

Still a few cases where master performs marginally better, but I think we are close enough!

@lucidtronix
Copy link
Collaborator

After running tests pushing new dockers for CPU & GPU and pre-commit hooking I think this is good to merge.

@ndiamant ndiamant merged commit 0be8da3 into master May 13, 2020
@ndiamant ndiamant deleted the nd_model_factory_refactor branch May 13, 2020 17:37
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

2 participants