Update to TF 2.16 and keras 2

examples/adaprive_softmax/text8/model.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import AdaptiveSoftmax, SampledSofmax
 
 

examples/adaprive_softmax/text8/text8_test.py

@@ -6,7 +6,7 @@
 import numpy as np
 import time
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import Text8Model
 from utils import data_generator
 

examples/adaprive_softmax/text8/utils.py

@@ -4,7 +4,7 @@
 
 import tensorflow as tf
 import observations
-from keras.preprocessing.text import Tokenizer
+from tf_keras.preprocessing.text import Tokenizer
 
 
 def data_generator(seq_length, batch_size):

examples/qrnn/imdb/imdb_test.py

@@ -6,7 +6,7 @@
 import numpy as np
 import time
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import ImdbModel
 from utils import data_generator
 

examples/qrnn/imdb/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import QRNN, ToDense, MapFlat
 
 

examples/qrnn/imdb/utils.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras.datasets import imdb
+from tf_keras.datasets import imdb
 
 
 def data_generator(batch_size):

examples/tcn/adding_problem/add_test.py

@@ -5,7 +5,7 @@
 import argparse
 import numpy as np
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import AddingModel
 from utils import data_generator
 

examples/tcn/adding_problem/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import TemporalConvNet
 
 

examples/tcn/char_cnn/char_test.py

@@ -5,7 +5,7 @@
 import argparse
 import numpy as np
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import CharModel
 from utils import data_generator
 

examples/tcn/char_cnn/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import TemporalConvNet
 
 

examples/tcn/char_cnn/utils.py

@@ -4,7 +4,7 @@
 
 import tensorflow as tf
 import observations
-from keras.preprocessing.text import Tokenizer
+from tf_keras.preprocessing.text import Tokenizer
 
 
 def data_generator(dataset, seq_length, batch_size):

examples/tcn/copy_memory/copy_test.py

@@ -5,7 +5,7 @@
 import argparse
 import numpy as np
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import CopyModel
 from utils import data_generator
 

examples/tcn/copy_memory/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import TemporalConvNet
 
 

examples/tcn/mnist_pixel/mnist_test.py

@@ -5,7 +5,7 @@
 import argparse
 import numpy as np
 from matplotlib import pyplot
-from keras import optimizers
+from tf_keras import optimizers
 from model import MnistModel
 from utils import data_generator
 

examples/tcn/mnist_pixel/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import TemporalConvNet
 
 

examples/tcn/mnist_pixel/utils.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import tensorflow as tf
-from keras.datasets import mnist
+from tf_keras.datasets import mnist
 
 
 def data_generator(permute, batch_size):

examples/weight_norm/cifar10/cifar10_test.py

@@ -5,8 +5,8 @@
 import argparse
 import numpy as np
 from matplotlib import pyplot
-from keras import backend as K, callbacks, optimizers
-from keras.saving import custom_object_scope
+from tf_keras import backend as K, callbacks, optimizers
+from tf_keras.saving import custom_object_scope
 from model import Cifar10Model
 from utils import data_generator
 

examples/weight_norm/cifar10/model.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from keras import layers, models
+from tf_keras import layers, models
 from tfmiss.keras.layers import WeightNorm
 
 

examples/weight_norm/cifar10/utils.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import tensorflow as tf
-from keras.datasets import cifar10
-from keras_preprocessing.image import ImageDataGenerator
+from tf_keras.datasets import cifar10
+from tf_keras_preprocessing.image import ImageDataGenerator
 
 
 def data_generator(batch_size):

tfmiss/image/conn_comp_test.py

@@ -5,7 +5,7 @@
 import cv2
 import numpy as np
 import tensorflow as tf
-from keras import utils
+from tf_keras import utils
 from tensorflow.python.framework import test_util
 from tfmiss.image.conn_comp import connected_components
 

tfmiss/image/euclidean_dist_test.py

@@ -5,7 +5,7 @@
 import numpy as np
 import tensorflow as tf
 from absl.testing import parameterized
-from keras import utils
+from tf_keras import utils
 from scipy.ndimage import distance_transform_edt
 from tensorflow.python.framework import test_util
 from tfmiss.image.euclidean_dist import euclidean_distance

tfmiss/keras/callbacks/lrfind.py

@@ -5,8 +5,8 @@
 import numpy as np
 import tensorflow as tf
 import tempfile
-from keras import backend, callbacks
-from keras.saving import register_keras_serializable
+from tf_keras import backend, callbacks
+from tf_keras.saving import register_keras_serializable
 
 
 @register_keras_serializable(package='Miss')

tfmiss/keras/callbacks/lrfind_test.py

@@ -5,8 +5,8 @@
 import os
 import numpy as np
 import tensorflow as tf
-from keras import layers
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import layers
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.callbacks.lrfind import LRFinder
 
 

tfmiss/keras/layers/attention.py

@@ -3,9 +3,9 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import backend, constraints, initializers, layers, regularizers
-from keras.saving import register_keras_serializable
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import backend, constraints, initializers, layers, regularizers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 
 
 @register_keras_serializable(package='Miss')

tfmiss/keras/layers/attention_test.py

@@ -3,8 +3,8 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import mixed_precision
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import mixed_precision
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.attention import SelfAttentionWithContext, MultiplicativeSelfAttention, AdditiveSelfAttention
 
 

tfmiss/keras/layers/dcnv2.py

@@ -1,9 +1,9 @@
 import numpy as np
 import tensorflow as tf
-from keras import layers, initializers
-from keras.saving import register_keras_serializable
-from keras.src.utils.conv_utils import normalize_tuple
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import layers, initializers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.conv_utils import normalize_tuple
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 from tfmiss.nn import modulated_deformable_column
 
 

tfmiss/keras/layers/dcnv2_test.py

@@ -3,8 +3,8 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import mixed_precision
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import mixed_precision
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.dcnv2 import DCNv2
 from tfmiss.keras.testing_utils import layer_multi_io_test
 

tfmiss/keras/layers/dropout.py

@@ -1,6 +1,6 @@
 import tensorflow as tf
-from keras.layers import Dropout, InputSpec
-from keras.saving import register_keras_serializable
+from tf_keras.layers import Dropout, InputSpec
+from tf_keras.saving import register_keras_serializable
 
 
 @register_keras_serializable(package='Miss')

tfmiss/keras/layers/dropout_test.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.dropout import TimestepDropout
 
 

tfmiss/keras/layers/embedding.py

@@ -3,9 +3,9 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import backend, constraints, initializers, layers, regularizers
-from keras.saving import register_keras_serializable
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import backend, constraints, initializers, layers, regularizers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 from tensorflow.python.distribute import sharded_variable
 from tfmiss.nn.embedding import adaptive_embedding_lookup
 

tfmiss/keras/layers/embedding_test.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import tensorflow as tf
-from keras import backend, layers, mixed_precision, models, optimizers
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import backend, layers, mixed_precision, models, optimizers
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.embedding import AdaptiveEmbedding
 
 

tfmiss/keras/layers/preprocessing.py

@@ -3,9 +3,9 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import layers
-from keras.saving import register_keras_serializable
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import layers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 from tfmiss.text import char_category, lower_case, title_case, upper_case
 
 

tfmiss/keras/layers/preprocessing_test.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import tensorflow as tf
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.preprocessing import WordShape
 
 

tfmiss/keras/layers/qrnn.py

@@ -3,10 +3,10 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import activations, backend, constraints, initializers, layers, regularizers
-from keras.saving import register_keras_serializable
-from keras.src.utils.control_flow_util import smart_cond
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import activations, backend, constraints, initializers, layers, regularizers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.control_flow_util import smart_cond
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 from tfmiss.nn import fo_pool
 
 

tfmiss/keras/layers/qrnn_test.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import tensorflow as tf
-from keras import layers, mixed_precision, models
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import layers, mixed_precision, models
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tensorflow.python.util import object_identity
 from tensorflow.python.checkpoint import checkpoint
 from tfmiss.keras.layers.qrnn import QRNN

tfmiss/keras/layers/reduction.py

@@ -3,9 +3,9 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import layers
-from keras.saving import register_keras_serializable
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import layers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 
 
 @register_keras_serializable(package='Miss')

tfmiss/keras/layers/reduction_test.py

@@ -5,8 +5,8 @@
 import numpy as np
 import tensorflow as tf
 from absl.testing import parameterized
-from keras import layers, models
-from keras.src.testing_infra import test_combinations, test_utils
+from tf_keras import layers, models
+from tf_keras.src.testing_infra import test_combinations, test_utils
 from tfmiss.keras.layers.reduction import Reduction
 
 

tfmiss/keras/layers/scale.py

@@ -3,9 +3,9 @@
 from __future__ import print_function
 
 import tensorflow as tf
-from keras import layers
-from keras.saving import register_keras_serializable
-from keras.src.utils.tf_utils import shape_type_conversion
+from tf_keras import layers
+from tf_keras.saving import register_keras_serializable
+from tf_keras.src.utils.tf_utils import shape_type_conversion
 
 
 @register_keras_serializable(package='Miss')