Merge branch 'resnet' into neural-translation

Author: ilblackdragon

skflow/estimators/base.py

@@ -265,7 +265,7 @@ def predict(self, X, axis=1, batch_size=-1):
 
         Args:
             X: array-like matrix, [n_samples, n_features...] or iterator.
-            axis: Which axis to argmax for classification. 
+            axis: Which axis to argmax for classification.
                   By default axis 1 (next after batch) is used.
                   Use 2 for sequence predictions.
             batch_size: If test set is too big, use batch size to split

skflow/io/data_feeder.py

@@ -17,9 +17,10 @@
 from __future__ import division, print_function, absolute_import
 
 import itertools
+import math
+
 import six
 from six.moves import xrange   # pylint: disable=redefined-builtin
-import math
 
 import numpy as np
 from sklearn.utils import check_array