lmjohns3 / theanets

Neural network toolkit for Python
http://theanets.rtfd.org
MIT License
328 stars 73 forks source link

if batch generator has len(), then use it to specify iteration_size for Dataset #46

Closed majidaldo closed 9 years ago

majidaldo commented 9 years ago

not sure how generally useful this is but it reduces the amount of code the user writes (at least in my case)

lmjohns3 commented 9 years ago

I'd love to merge this PR, but based on the title I'm guessing that you just meant to include change 9419fab2? It looks to me like a bunch of merges and doc updates got included in this PR somehow. I'm not enough of a git expert to know how to fix this, unfortunately. Is there any way you can send another PR with just change 9419fab2?

majidaldo commented 9 years ago

yea sorry for the mess from my side. the "diff" on the PR shows only one file is changed so i assumed that would be the only file changed on your master. i was forcing things on my fork to make the PR only diff on this one thing.

let me see if i can rebase. i hate git sometimes.

lmjohns3 commented 9 years ago

Ah, you're right -- the overall PR diff just shows the one file as being changed. I'll see what happens if I merge it in a copy on my machine ...