diff options
| author | Marco Scoffier <github@metm.org> | 2011-09-28 01:22:28 +0400 |
|---|---|---|
| committer | Marco Scoffier <github@metm.org> | 2011-09-28 01:22:28 +0400 |
| commit | 34b00a01025e59942867c31012788c31da60760a (patch) | |
| tree | f455290b2f9584179d89902bbae9a0dc6067b837 | |
| parent | 31b97b114f144aa286493c9a83acfd2b8ed32ff7 (diff) | |
still merge
| -rw-r--r-- | BatchOptimization.lua | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/BatchOptimization.lua b/BatchOptimization.lua index 5255e57..f25cdc9 100644 --- a/BatchOptimization.lua +++ b/BatchOptimization.lua @@ -130,10 +130,6 @@ function Batch:forward_mapreduce(inputs, targets, options) self.children[t]:send(targets) self.children[t]:send(options) end -<<<<<<< HEAD -======= - ->>>>>>> genetic else -- (0b) divide input/target batch into N batches, based on speed -- of each worker |