diff options
author | MaxReimann <max.reimann@student.hpi.uni-potsdam.de> | 2015-12-22 18:00:13 +0300 |
---|---|---|
committer | MaxReimann <max.reimann@student.hpi.uni-potsdam.de> | 2015-12-22 18:00:13 +0300 |
commit | 5ce8b93f9f9f89a8c029b7cc2adc420ed4267a67 (patch) | |
tree | 62251969c77771c7ad822c15c47cd00a30ffb1da /init.lua | |
parent | 518644686347802bf1a24a05118d4593c1f07af0 (diff) |
Resolve merge error
Diffstat (limited to 'init.lua')
-rw-r--r-- | init.lua | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -13,6 +13,7 @@ torch.include('optim', 'lbfgs.lua') torch.include('optim', 'adagrad.lua') torch.include('optim', 'rprop.lua') torch.include('optim', 'adam.lua') +torch.include('optim', 'adamax.lua') torch.include('optim', 'rmsprop.lua') torch.include('optim', 'adadelta.lua') torch.include('optim', 'cmaes.lua') |