Merge 4f28eafff5 into aedaa82d22

fawkes/differentiator.py

@@ -9,7 +9,7 @@ import time
 import numpy as np
 import tensorflow as tf
 from fawkes.utils import preprocess, reverse_preprocess
-from keras.utils import Progbar
+from tensorflow.keras.utils import Progbar
 
 
 class FawkesMaskGeneration:

fawkes/utils.py

@@ -21,7 +21,7 @@ import zipfile
 import PIL
 import pkg_resources
 import six
-from keras.utils import Progbar
+from tensorflow.keras.utils import Progbar
 from six.moves.urllib.error import HTTPError, URLError
 
 stderr = sys.stderr