upper limit tensorflow 2.13 (other in new PR)

haverland · Dec 22, 2024 · 17ae76c · 17ae76c
1 parent e597a1d
commit 17ae76c
Show file tree

Hide file tree

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

diff --git a/b2n/data/ziffer.py b/b2n/data/ziffer.py
@@ -1,7 +1,7 @@
 import os
 import shutil
 from PIL import Image 
-from tensorflow import keras
+#from tensorflow import keras
 import numpy as np
 
 

diff --git a/b2n/encodings/class_encoding.py b/b2n/encodings/class_encoding.py
@@ -1,5 +1,3 @@
-import tensorflow.keras as keras
-import math
 import numpy as np
 
 def class_encoding(y_train, nb_classes):

diff --git a/b2n/plotfunctions.py b/b2n/plotfunctions.py
@@ -3,8 +3,7 @@
 import pandas as pd
 from b2n.encodings.class_encoding import class_decoding
 import tensorflow as tf
-from PIL import Image 
-import os
+
 
 def plot_dataset(images, labels, columns=10, rows=5, figsize=(18, 10)):
 

diff --git a/dig-class100-s2.ipynb b/dig-class100-s2.ipynb
diff --git a/output/dig-class100-s2_20241222-102213_q_neu.tflite b/output/dig-class100-s2_20241222-102213_q_neu.tflite
diff --git a/requirements.txt b/requirements.txt
@@ -5,10 +5,10 @@ lxml_html_clean
 scipy
 scikit-learn
 pandas
-tensorflow>=2.12.1; sys_platform != 'darwin'
-tensorflow-macos>=2.12.1; sys_platform == 'darwin'
-tensorflow-metal==0.8; sys_platform == 'darwin'
-tensorflow-model-optimization
+tensorflow>=2.13.0, < 2.14.0; sys_platform != 'darwin'
+tensorflow-macos>=2.13.0, < 2.14.0; sys_platform == 'darwin'
+#tensorflow-metal==0.8; sys_platform == 'darwin'
+#tensorflow-model-optimization
 opencv-python
 notebook
 jupyter