Merge pull request #18 from Gifford47/master

fixed compiling for class100-s1
haverland · Dec 22, 2024 · c7a4e2b · c7a4e2b
2 parents 854d07e + 9ad5281
commit c7a4e2b
Show file tree

Hide file tree

Showing 3 changed files with 766 additions and 564 deletions.
diff --git a/b2n/data/tmnist.py b/b2n/data/tmnist.py
@@ -4,7 +4,7 @@
 import pandas as pd
 from sklearn.utils import shuffle
 from tensorflow import keras
-from keras.preprocessing.image import ImageDataGenerator
+from tensorflow.keras.preprocessing.image import ImageDataGenerator
 
 
 def tmnist_percentals(input_dir="datasets", max_count=28 ):

diff --git a/b2n/plotfunctions.py b/b2n/plotfunctions.py
@@ -28,7 +28,7 @@ def plot_dataset_it(data_iter, columns=9, rows=5, nb_classes=100, classdecoding=
     fig = plt.figure(figsize=(18, 11))
 
     for i in range(1, columns*rows +1):
-        img, label = data_iter.next()
+        img, label = next(data_iter)
         fig.add_subplot(rows, columns, i)
         plt.xticks([0.2, 0.4, 0.6, 0.8])
         plt.title(str(classdecoding(label[0].reshape(-1, nb_classes), nb_classes).reshape(-1)[0]))  # set title

diff --git a/dig_class100-s1.ipynb b/dig_class100-s1.ipynb