Merge branch 'develop'

CHANGELOG.md

@@ -6,6 +6,19 @@ Most recent releases are shown at the top. Each release shows:
 - **Changed**: Additional parameters, changes to inputs or outputs, etc
 - **Fixed**: Bug fixes that don't change documented behaviour
 
+## 0.2.3 (2019-08-18)
+
+### New:
+- N/A
+
+### Changed:
+-
+
+### Fixed:
+- Fixed issue with ```learner.validate``` and ```learner.predict``` failing when validation data is in 
+  the form of an Iterator (e.g., DirectoryIterator).
+
+
 ## 0.2.2 (2019-08-16)
 
 ### New:

ktrain/core.py

@@ -851,7 +851,8 @@ def predict(self, val_data=None):
             val = self.val_data
         if val is None: raise Exception('val_data must be supplied to get_learner or predict')
         if U.is_iter(val):
-            return self.model.predict_generator(val)
+            steps = np.ceil(U.nsamples_from_data(val)/val.batch_size)
+            return self.model.predict_generator(val, steps=steps)
         else:
             return self.model.predict(val[0])
 
@@ -1105,16 +1106,6 @@ def layer_output(self, layer_id, example_id=0, batch_id=0, use_val=False):
         return layer_out
 
 
-    def predict(self):
-        """
-        Makes predictions on validation set
-        """
-        if self.val_data is None:
-            raise Exception('val_data is None')
-        return self.model.predict_generator(self.val_data)
-
-
-
 def get_predictor(model, preproc):
     """
     Returns a Predictor instance that can be used to make predictions on

ktrain/version.py

@@ -1,2 +1,2 @@
 __all__ = ['__version__']
-__version__ = '0.2.2'
+__version__ = '0.2.3'

tutorial-03-image-classification.ipynb

@@ -499,7 +499,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "loss, acc = learner.model.evaluate_generator(learner.val_data)"
+    "loss, acc = learner.model.evaluate_generator(learner.val_data, \n",
+    "                                             steps=len(learner.val_data))"
    ]
   },
   {