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

Improvements to the neural dual solver #219

Merged
merged 59 commits into from
Feb 13, 2023
Merged

Improvements to the neural dual solver #219

Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
89a3d1e
Initial batch of updates to neuraldual code.
bamos Dec 22, 2022
c1d541d
icnn: only don't use an activation on the first layer
bamos Dec 22, 2022
d50749b
set default amortization loss to regression
bamos Dec 22, 2022
555172e
Improve notebook
bamos Dec 22, 2022
89339c5
update icnn to use the posdef potential last
bamos Dec 27, 2022
31e9df4
X,Y -> source,target
bamos Dec 27, 2022
cf9bbea
don't fine-tune when the conjugate solver is not provided
bamos Dec 27, 2022
c3add30
provides_gradient->returns_potential
bamos Jan 3, 2023
96fc67b
NeuralDualSolver->W2NeuralDual
bamos Jan 3, 2023
70bf7f9
ConjugateSolverLBFGS->FenchelConjugateLBFGS
bamos Jan 3, 2023
f14d1f7
rm wandb in logging comment
bamos Jan 3, 2023
d7b85ac
remove line split
bamos Jan 3, 2023
84110af
BFGS->LBFGS
bamos Jan 3, 2023
1656a18
address review comments from @michalk8
bamos Jan 4, 2023
649b210
also permit the MLP to model the potential (in addition to the gradient)
bamos Feb 8, 2023
961f533
add alternating update directions option and ability to initialize wi…
bamos Feb 8, 2023
b5a0861
add option to finetune g when getting the potentials
bamos Feb 8, 2023
05206bc
->back_and_forth
bamos Feb 8, 2023
587ec11
fix typing
bamos Feb 8, 2023
bbc0280
add back the W2 distance estimate and penalty
bamos Feb 8, 2023
706f902
fix logging with back-and-forth
bamos Feb 8, 2023
ffafa80
add weight term
bamos Feb 8, 2023
86e62f4
default MLP to returns_potential=True
bamos Feb 8, 2023
9c3daa2
fix newline
bamos Feb 8, 2023
7cf14ad
update icnn_inits nb
bamos Feb 8, 2023
62f76c2
bump down init_std
bamos Feb 9, 2023
0574625
make bib style consistent
bamos Feb 9, 2023
9c02e61
->W2NeuralDual
bamos Feb 9, 2023
10b4a0a
pass on docs
bamos Feb 9, 2023
fb23a22
limit flax version
bamos Feb 9, 2023
ed1e416
neural_dual nb: use two examples, finalize potentials with stable hyp…
bamos Feb 9, 2023
a682d55
update pin for jax/flax testing dependency
bamos Feb 9, 2023
b62ba0d
address review comments from @michalk8
bamos Feb 9, 2023
cee09ae
fix potential type hints
bamos Feb 9, 2023
8e5a8b5
re-run nb with latest code
bamos Feb 9, 2023
1749470
address review comments from @michalk8
bamos Feb 9, 2023
4f3c04b
potential_{value,gradient} -> functions
bamos Feb 9, 2023
b1a6dbf
add latest nb (no outputs)
bamos Feb 9, 2023
2b7fe6e
fix typos
bamos Feb 9, 2023
302ad9d
plot_ot_map: keep source/target measures fixed
bamos Feb 9, 2023
aca2cfa
fix types
bamos Feb 9, 2023
7e041a4
add review comments from @michalk8 and @marcocuturi
bamos Feb 9, 2023
d7a948c
consolidate models
bamos Feb 9, 2023
c889ebb
inverse->forward
bamos Feb 9, 2023
a3fa701
support back_and_forth when using a gradient mapping, improve docs
bamos Feb 9, 2023
3e662ab
move plotting code
bamos Feb 9, 2023
a1f7a66
update nbs
bamos Feb 9, 2023
95e950b
update intro text
bamos Feb 9, 2023
bce380d
conjugate_solver -> conjugate_solvers
bamos Feb 9, 2023
3b56acc
address review comments from @michalk8
bamos Feb 10, 2023
3041eea
update docstring
bamos Feb 10, 2023
efa2507
create problems.nn.dataset, add more tests
bamos Feb 10, 2023
25196ce
fix indentation
bamos Feb 10, 2023
3cd4838
polish docs and restructure dataset to address @michalk8's comments
bamos Feb 11, 2023
e53c339
move plotting code back to ott.problems.linear.potentials
bamos Feb 11, 2023
aed5f99
fix test and dataloaders->dataset
bamos Feb 11, 2023
2e296f6
update notebooks to latest code
bamos Feb 11, 2023
3a70ac8
bump up batch size and update notebooks
bamos Feb 11, 2023
45f33be
address review comments from @michalk8 (sorry for multiple force-pushes)
bamos Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
neural_dual nb: use two examples, finalize potentials with stable hyp… 
…er-params
  • Loading branch information
@bamos
bamos committed Feb 9, 2023
commit ed1e416a707b782d6e8cfb110435b3fcc9a13fcc
Loading