Commit Graph

572 Commits

Author SHA1 Message Date
Mike J Innes
5ee6e8f504 overload correct repeated 2017-06-19 16:48:52 -07:00
Mike J Innes
7d2a34b55d unroll multiple inputs 2017-06-17 19:21:39 -07:00
Mike J Innes
8306ed2ed7 don't force params here 2017-06-17 19:18:09 -07:00
ylxdzsw
c9ae219613 simplify back! of Chain 2017-06-14 21:58:43 +08:00
ylxdzsw
cca21a617c training julia models 2017-06-12 19:39:34 +08:00
Ali Hamdi
422b3bd5d8 Merge remote-tracking branch 'origin/add-more-tf-ops-2' into add-more-tf-ops 2017-06-10 11:45:30 +02:00
Ali Hamdi
5143410313 Merge remote-tracking branch 'upstream/master' into add-more-tf-ops-2 2017-06-10 11:43:27 +02:00
Mike J Innes
e4a7e7b335 more general seq/tuple support 2017-06-10 08:33:17 +01:00
Ali Hamdi
0b9436cfcd add chol 2017-06-09 21:50:25 +02:00
Ali Hamdi
7559196ab9 add size 2017-06-09 21:46:29 +02:00
Ali Hamdi
697a300ec3 add diagm 2017-06-09 21:35:31 +02:00
Ali Hamdi
6dfb554e95 add diag 2017-06-09 21:22:02 +02:00
Ali Hamdi
e6db3b0e89 Merge remote-tracking branch 'upstream/master' into add-more-tf-ops-2 2017-06-09 20:53:17 +02:00
Mike J Innes
358ba650ad more robust batches 2017-06-09 18:57:18 +01:00
Mike J Innes
65400f20ab nested batch tweaks 2017-06-09 18:55:21 +01:00
Mike J Innes
9c8dbb6b4b feedforward fix 2017-06-09 18:54:35 +01:00
Ali Hamdi
d80c1abf5e Merge remote-tracking branch 'upstream/master' into add-more-tf-ops-2 2017-06-09 17:55:00 +02:00
Mike J Innes
9b18fd639a mxarray ctx 2017-06-09 14:29:47 +01:00
Ali Hamdi
6b4db60f05 add length 2017-06-09 12:13:30 +02:00
Ali Hamdi
74b36b0094 add cat 2017-06-09 12:09:20 +02:00
Ali Hamdi
57c733af67 add permutedims 2017-06-09 11:55:26 +02:00
Ali Hamdi
d78963ab27 add transpose 2017-06-09 07:38:07 +02:00
Ali Hamdi
a098158ff5 Merge branch 'master' of https://github.com/MikeInnes/Flux.jl into add-more-tf-ops 2017-06-09 07:15:20 +02:00
Mike J Innes
1cc8100456 ctx methods for seq models 2017-06-09 01:35:07 +01:00
Mike J Innes
020ae616cc custom mxnet context 2017-06-09 00:56:52 +01:00
Mike J Innes
fe0bddd98d pass args correctly 2017-06-09 00:55:54 +01:00
Ali Hamdi
c350bfb672 Merge remote-tracking branch 'upstream/master' into add-more-tf-ops 2017-06-08 11:59:59 +02:00
Mike J Innes
4ccbbbb284 dup params fix 2017-06-08 10:49:39 +01:00
Mike J Innes
ab0f184d29 old import 2017-06-08 10:47:58 +01:00
Ali Hamdi
547ca64206 add det 2017-06-08 08:16:12 +02:00
Ali Hamdi
92616a8c3d add inv 2017-06-08 07:31:23 +02:00
Ali Hamdi
ee2e388228 add svd 2017-06-08 07:29:17 +02:00
Mike J Innes
dac80081ba these are probably the wrong abstraction 2017-06-06 18:03:36 +01:00
Mike J Innes
72e8e5c7f9 remove iterators 2017-06-06 18:03:14 +01:00
Mike J Innes
66c0403ffd seq rpad 2017-06-06 17:15:29 +01:00
Mike J Innes
e5df1c31dd batch vcat 2017-06-06 17:15:22 +01:00
Mike J Innes
3c52622896 more constructors 2017-06-06 16:58:57 +01:00
Mike J Innes
5186aa392f refactor 2017-06-06 15:59:10 +01:00
Mike J Innes
21fd79da16 fix 2017-06-05 22:51:08 +01:00
Mike J Innes
13f4af2492 generic and consistent conversions 2017-06-05 22:49:31 +01:00
Mike J Innes
bf3db99bc1 shared conversions 2017-06-05 19:04:14 +01:00
Mike J Innes
b2baf512e1 more code sharing 2017-06-05 18:46:36 +01:00
Mike J Innes
7505ee3a16 nicer display, share more code 2017-06-05 18:10:43 +01:00
Mike J Innes
ce6c96c2be rename 2017-06-05 18:00:44 +01:00
Mike J Innes
8e019e0f30 move batch and seq together 2017-06-05 17:51:30 +01:00
Mike J Innes
a7a46e3a82 that was what I wanted 2017-06-05 17:50:00 +01:00
Mike J Innes
957e23eb6b abstract batch type 2017-06-05 17:45:11 +01:00
Mike J Innes
da1697a257 fix juno import 2017-06-05 17:31:43 +01:00
Mike J Innes
1d7ac3ef3c tweak descriptions 2017-06-05 17:16:38 +01:00
Mike J Innes
2717ace397 split out core 2017-06-05 17:16:28 +01:00
Mike J Innes
9a460e12f2 make Batches submodule 2017-06-05 16:56:44 +01:00
Mike J Innes
cf8227c02f move @ Chain 2017-06-05 16:56:24 +01:00
Mike J Innes
099b9fbeb7 collect exports 2017-06-05 16:37:06 +01:00
Mike J Innes
415c5f6963 fix backend imports 2017-06-05 16:32:16 +01:00
Mike J Innes
ddcd576a74 give up and use AbstractArray 2017-06-05 16:09:06 +01:00
Mike J Innes
837173d65b model abstract is pretty useless 2017-06-05 16:08:23 +01:00
Mike J Innes
4685d2e672 strip down non-obvious exports 2017-06-05 15:47:26 +01:00
Mike J Innes
eafba7a55f graph for seqmodel 2017-06-03 15:52:43 +01:00
Mike J Innes
10abb64f4b fix stateful in backends 2017-06-02 16:28:31 +01:00
Mike J Innes
5232a3300c don't return hidden states 2017-06-02 16:22:55 +01:00
Mike J Innes
baaf9f2682 unrolled graphs only have one output 2017-06-02 16:22:39 +01:00
Mike J Innes
50bbb87674 stateless 2017-06-02 16:11:09 +01:00
Mike J Innes
d1f370a2f1 move stateful 2017-06-02 16:02:47 +01:00
Mike J Innes
2b85c76785 preserve original param states 2017-06-02 15:46:24 +01:00
Mike J Innes
af65b9200c mxnet repeated 2017-06-02 15:34:30 +01:00
Mike J Innes
4698cc0156 this might be a bit dirty 2017-06-02 15:22:23 +01:00
Mike J Innes
215e997540 broadcastto 2017-06-02 15:02:30 +01:00
Mike J Innes
edb1099cec more mxnet ops 2017-06-02 14:42:15 +01:00
Mike J Innes
e076bee00a mxnet broadcastto 2017-06-02 13:44:29 +01:00
Mike J Innes
4712568ac2 group tuple functions 2017-06-02 13:43:58 +01:00
Mike J Innes
4245f860e0 mxnet exp. 2017-06-02 13:42:59 +01:00
Mike J Innes
011449aa24 tuple sum 2017-06-02 13:40:38 +01:00
Mike J Innes
07c523a13d fix flatten/softmax batching behaviour 2017-06-01 19:28:02 +01:00
Mike J Innes
b54281bdea hadamard product 2017-06-01 19:27:46 +01:00
Mike J Innes
8cf5afdd79 add note 2017-06-01 18:37:20 +01:00
Mike J Innes
c7f8d86f9e fix mxnet 2017-06-01 16:57:39 +01:00
Mike J Innes
7a2a72a74a fix tensorflow 2017-06-01 16:56:48 +01:00
Mike J Innes
f7eb5179b1 fix basic interpreters 2017-06-01 16:55:48 +01:00
Mike J Innes
3532c7174f early throw on cyclic graphs 2017-06-01 16:52:49 +01:00
Mike J Innes
45c5502f90 obviate mapconst 2017-06-01 16:52:49 +01:00
Mike J Innes
c969d13306 mxnet vec 2017-05-31 18:23:33 +01:00
Mike J Innes
673abbcc1d mxnet hcat 2017-05-31 18:08:11 +01:00
Mike J Innes
033ed13f69 Merge pull request #38 from staticfloat/sf/act_on_your_feelings_young_one
Fix activation functions
2017-05-31 14:22:52 +01:00
Mike J Innes
b3e9dfa264 fix exec check 2017-05-30 18:04:31 +01:00
Mike J Innes
5654e15167 this is gone 2017-05-30 17:47:21 +01:00
Mike J Innes
790a58be1d support maps over tuples 2017-05-30 17:23:34 +01:00
Mike J Innes
d788cc8c54 remove old imap 2017-05-30 16:59:12 +01:00
Mike J Innes
5fa1eb4034 allow non-param states 2017-05-30 16:53:21 +01:00
Mike J Innes
b145b46cbb fix for recurrent anon models 2017-05-30 16:37:44 +01:00
Elliot Saba
dfa4dcccb5 Fix activation functions 2017-05-25 18:12:58 -07:00
Mike J Innes
e37973c3d5 Merge pull request #35 from oxinabox/patch-1
Replace deprecated `unpack` with `unstack`
2017-05-25 15:48:14 +01:00
Mike J Innes
fb8872b0b9 Merge pull request #24 from tkelman/nopiracy
Don't extend base functions on base types
2017-05-25 15:47:24 +01:00
Mike J Innes
9909af72a4 updates for new broadcasting approach 2017-05-24 12:02:03 +01:00
Lyndon White
d0fd9cd622 Replace deprecated unpack with unstack 2017-05-24 10:35:17 +08:00
Tony Kelman
41ea071f3a Use a package-local squeeze function instead of extending Base 2017-05-22 04:08:46 -04:00
Tony Kelman
5cbb47a13d Don't extend base functions on base types
better broadcast syntax
2017-05-22 04:05:57 -04:00
Mike J Innes
0ed4e65d2f refactor 2017-05-11 19:04:08 +01:00
ylxdzsw
1bd0a43b7d batch iterator 2017-05-11 19:03:53 +01:00
ylxdzsw
019e34194d catmat fix 2017-05-11 15:49:13 +01:00
Ali Hamdi
92d39f9ff7 dim defaults to nothing for reduction ops 2017-05-09 16:50:32 +02:00
Ali Hamdi
d5b073db74 add more basic math ops to tf backend 2017-05-09 14:39:10 +02:00
Ali Hamdi
eda5c2c776 add .^ and reduction ops for tf backend 2017-05-09 01:29:15 +02:00
Mike J Innes
bd97c0f93b strip away params 2017-05-04 17:01:10 +01:00
Mike J Innes
5be9ce45d8 support constant arrays in MXNet 2017-05-04 15:09:18 +01:00
Mike J Innes
a2db4b5319 factor out common tests 2017-05-04 13:52:31 +01:00
Mike J Innes
70286c0bf3 src docs 2017-05-04 13:17:21 +01:00
Mike J Innes
e04dcbd460 reorganise recurrent stuff 2017-05-04 10:45:44 +01:00
Mike J Innes
c025cddc73 runmodel no longer needed 2017-05-04 10:32:53 +01:00
Mike J Innes
51bf904179 better return value 2017-05-03 19:13:33 +01:00
Mike J Innes
c9dcc815dc add this for convenience 2017-05-03 18:33:23 +01:00
Mike J Innes
8c10a95bf4 more appropriate naming 2017-05-03 18:33:14 +01:00
Mike J Innes
d7ff193ad6 basic back pass 2017-05-01 19:44:58 +01:00
Mike J Innes
af30ee78d2 remove old code 2017-05-01 19:44:26 +01:00
Mike J Innes
b35f50571c use params instead of vars 2017-05-01 18:27:52 +01:00
Mike J Innes
796d7d7e99 recurrent models in tf 2017-05-01 18:05:17 +01:00
Mike J Innes
3998be2244 tuple i/o tests 2017-05-01 17:44:20 +01:00
Mike J Innes
2467ca4187 tuple inputs in tensorflow 2017-05-01 17:41:42 +01:00
Mike J Innes
357f989de5 pull out tuple utils 2017-05-01 16:57:51 +01:00
Mike J Innes
2934607115 multi-tuple output 2017-05-01 16:30:24 +01:00
Mike J Innes
f5b0f3e530 identity function 2017-05-01 16:28:39 +01:00
Mike J Innes
ba54552be5 remove special-cased training code
splits model and exec to allow multi inputs
2017-05-01 16:12:46 +01:00
Mike J Innes
d4ee8a6a2a use juno's info function 2017-05-01 15:14:29 +01:00
Mike J Innes
b19e31714d allow access to loop vars 2017-05-01 14:00:39 +01:00
Mike J Innes
33c6781c99 remove from training.jl 2017-05-01 13:47:08 +01:00
Mike J Innes
6778d00dbf this is no longer specific to training 2017-05-01 13:46:23 +01:00
Mike J Innes
d095c640c9 this should be a general util 2017-05-01 13:45:24 +01:00
Mike J Innes
eae13c533f training callbacks 2017-05-01 13:43:07 +01:00
Mike J Innes
5dce8df678 fix accuracy for batches 2017-05-01 13:40:11 +01:00
Mike J Innes
dba6bef245 this should be progress'd too 2017-05-01 12:46:02 +01:00
Mike J Innes
38852964f6 organise training and utils 2017-05-01 12:41:54 +01:00
Mike J Innes
0e6bb17709 import this in compiler 2017-05-01 12:31:00 +01:00
Mike J Innes
36f4103d7d cost is really a layer 2017-05-01 12:30:28 +01:00
Mike J Innes
7425584c91 more correct 2017-05-01 11:33:24 +01:00
Mike J Innes
7415e61287 remove mse!, export logloss 2017-05-01 11:28:41 +01:00
Mike J Innes
360d128b1a logloss 2017-04-28 17:14:27 +01:00
Mike J Innes
ef4ec5be4b customisable loss 2017-04-28 17:14:21 +01:00
Mike J Innes
63b328142a print epochs again 2017-04-27 17:43:38 +01:00
Mike J Innes
121af0579a update for rnn wrappers 2017-04-27 17:27:08 +01:00
Mike J Innes
f4acd286c8 fix tensorflow dep 2017-04-27 12:48:11 +01:00
Mike J Innes
52a7199d10 gradients for recurrent models 2017-04-26 17:42:47 +01:00
Mike J Innes
19cf3e2b62 split out runseq 2017-04-19 17:33:55 +01:00
Mike J Innes
edfb0211e6 better for nested batches 2017-04-19 17:18:40 +01:00
Mike J Innes
14afe54143 fixes for recurrent networks 2017-04-19 17:17:37 +01:00
Mike J Innes
358334a893 mxnet back! for multi outputs 2017-04-19 17:13:57 +01:00
Mike J Innes
42a8117704 seqmodel with raw arrays 2017-04-19 15:13:17 +01:00
Mike J Innes
f8a3b02c1d fix tf train 2017-04-19 14:48:10 +01:00
Mike J Innes
42688f8aa8 update training process, mnist example 2017-04-19 14:23:48 +01:00
Mike J Innes
f6334e7e96 still need batchone 2017-04-19 13:26:37 +01:00
Mike J Innes
5357b1e9f9 remove fake batching vestiges 2017-04-19 13:19:18 +01:00
Mike J Innes
228f7d487c remove fake batch semantics 2017-04-18 21:04:21 +01:00