Rename keras to tf2 to avoid conflict Fix #1073 (#1081)

mingxingtan · web-flow · commit be5340b61e84 · 2021-08-26T17:08:51.000-07:00
diff --git a/efficientdet/coco_metric.py b/efficientdet/coco_metric.py
@@ -24,7 +24,7 @@
 import numpy as np
 import tensorflow as tf
 
-from keras import label_util
+from tf2 import label_util
 
 try:
 # pylint: disable=g-import-not-at-top
diff --git a/efficientdet/dataloader.py b/efficientdet/dataloader.py
@@ -17,7 +17,7 @@
 import tensorflow as tf
 
 import utils
-from keras import anchors
+from tf2 import anchors
 from object_detection import preprocessor
 from object_detection import tf_example_decoder
 
diff --git a/efficientdet/dataloader_test.py b/efficientdet/dataloader_test.py
@@ -20,7 +20,7 @@
 import hparams_config
 import test_util
 
-from keras import anchors
+from tf2 import anchors
 from object_detection import tf_example_decoder
 
 
diff --git a/efficientdet/det_model_fn.py b/efficientdet/det_model_fn.py
@@ -23,9 +23,9 @@
 import hparams_config
 import nms_np
 import utils
-from keras import anchors
-from keras import efficientdet_keras
-from keras import postprocess
+from tf2 import anchors
+from tf2 import efficientdet_keras
+from tf2 import postprocess
 
 _DEFAULT_BATCH_SIZE = 64
 
diff --git a/efficientdet/efficientdet_arch.py b/efficientdet/efficientdet_arch.py
@@ -29,7 +29,7 @@
 import utils
 from backbone import backbone_factory
 from backbone import efficientnet_builder
-from keras import fpn_configs
+from tf2 import fpn_configs
 
 
 ################################################################################
diff --git a/efficientdet/inference.py b/efficientdet/inference.py
@@ -27,9 +27,9 @@
 import det_model_fn
 import hparams_config
 import utils
-from keras import efficientdet_keras
-from keras import label_util
-from keras import postprocess
+from tf2 import efficientdet_keras
+from tf2 import label_util
+from tf2 import postprocess
 from visualize import vis_utils
 from tensorflow.python.client import timeline  # pylint: disable=g-direct-tensorflow-import
 
diff --git a/efficientdet/tf2/README.md b/efficientdet/tf2/README.md
diff --git a/efficientdet/tf2/__init__.py b/efficientdet/tf2/__init__.py
diff --git a/efficientdet/tf2/anchors.py b/efficientdet/tf2/anchors.py
diff --git a/efficientdet/tf2/efficientdet_keras.py b/efficientdet/tf2/efficientdet_keras.py
@@ -23,10 +23,10 @@
 import utils
 from backbone import backbone_factory
 from backbone import efficientnet_builder
-from keras import fpn_configs
-from keras import postprocess
-from keras import tfmot
-from keras import util_keras
+from tf2 import fpn_configs
+from tf2 import postprocess
+from tf2 import tfmot
+from tf2 import util_keras
 
 
 def add_n(nodes):
diff --git a/efficientdet/tf2/efficientdet_keras_test.py b/efficientdet/tf2/efficientdet_keras_test.py
@@ -19,7 +19,7 @@
 import tensorflow.compat.v1 as tf
 import efficientdet_arch as legacy_arch
 import hparams_config
-from keras import efficientdet_keras
+from tf2 import efficientdet_keras
 
 SEED = 111111
 
diff --git a/efficientdet/tf2/eval.py b/efficientdet/tf2/eval.py
@@ -22,11 +22,11 @@
 import dataloader
 import hparams_config
 import utils
-from keras import anchors
-from keras import efficientdet_keras
-from keras import label_util
-from keras import postprocess
-from keras import util_keras
+from tf2 import anchors
+from tf2 import efficientdet_keras
+from tf2 import label_util
+from tf2 import postprocess
+from tf2 import util_keras
 
 # Cloud TPU Cluster Resolvers
 flags.DEFINE_string('tpu', None, 'The Cloud TPU name.')
diff --git a/efficientdet/tf2/eval_tflite.py b/efficientdet/tf2/eval_tflite.py
@@ -24,9 +24,9 @@
 import hparams_config
 import utils
 
-from keras import anchors
-from keras import label_util
-from keras import postprocess
+from tf2 import anchors
+from tf2 import label_util
+from tf2 import postprocess
 
 FLAGS = flags.FLAGS
 
diff --git a/efficientdet/tf2/fpn_configs.py b/efficientdet/tf2/fpn_configs.py
diff --git a/efficientdet/tf2/fpn_configs_test.py b/efficientdet/tf2/fpn_configs_test.py
@@ -15,7 +15,7 @@
 """Tests for fpn_configs."""
 from absl import logging
 import tensorflow as tf
-from keras import fpn_configs
+from tf2 import fpn_configs
 
 
 class FpnConfigTest(tf.test.TestCase):
diff --git a/efficientdet/tf2/infer.py b/efficientdet/tf2/infer.py
@@ -23,7 +23,7 @@
 
 import hparams_config
 import inference
-from keras import efficientdet_keras
+from tf2 import efficientdet_keras
 
 flags.DEFINE_string('image_path', None, 'Location of test image.')
 flags.DEFINE_string('output_dir', None, 'Directory of annotated output images.')
diff --git a/efficientdet/tf2/infer_lib.py b/efficientdet/tf2/infer_lib.py
@@ -24,9 +24,9 @@
 import dataloader
 import hparams_config
 import utils
-from keras import efficientdet_keras
-from keras import label_util
-from keras import util_keras
+from tf2 import efficientdet_keras
+from tf2 import label_util
+from tf2 import util_keras
 from visualize import vis_utils
 
 
diff --git a/efficientdet/tf2/infer_lib_test.py b/efficientdet/tf2/infer_lib_test.py
@@ -18,8 +18,8 @@
 from absl import logging
 import tensorflow as tf
 import test_util
-from keras import efficientdet_keras
-from keras import infer_lib
+from tf2 import efficientdet_keras
+from tf2 import infer_lib
 
 
 class InferenceTest(tf.test.TestCase):
diff --git a/efficientdet/tf2/inspector.py b/efficientdet/tf2/inspector.py
@@ -25,7 +25,7 @@
 
 import hparams_config
 import utils
-from keras import infer_lib
+from tf2 import infer_lib
 
 flags.DEFINE_string('model_name', 'efficientdet-d0', 'Model.')
 flags.DEFINE_enum('mode', 'infer',
diff --git a/efficientdet/tf2/inspector_test.py b/efficientdet/tf2/inspector_test.py
@@ -23,7 +23,7 @@
 from PIL import Image
 import tensorflow as tf
 
-from keras import inspector
+from tf2 import inspector
 FLAGS = flags.FLAGS
 
 
diff --git a/efficientdet/tf2/label_util.py b/efficientdet/tf2/label_util.py
diff --git a/efficientdet/tf2/postprocess.py b/efficientdet/tf2/postprocess.py
@@ -21,7 +21,7 @@
 
 import nms_np
 import utils
-from keras import anchors
+from tf2 import anchors
 T = tf.Tensor  # a shortcut for typing check.
 CLASS_OFFSET = 1
 # TFLite-specific constants.
diff --git a/efficientdet/tf2/postprocess_test.py b/efficientdet/tf2/postprocess_test.py
@@ -16,7 +16,7 @@
 from absl import logging
 import tensorflow as tf
 
-from keras import postprocess
+from tf2 import postprocess
 
 
 class PostprocessTest(tf.test.TestCase):
diff --git a/efficientdet/tf2/segmentation.py b/efficientdet/tf2/segmentation.py
@@ -19,7 +19,7 @@
 import tensorflow_datasets as tfds
 
 import hparams_config
-from keras import efficientdet_keras
+from tf2 import efficientdet_keras
 
 
 def create_mask(pred_mask):
diff --git a/efficientdet/tf2/tfmot.py b/efficientdet/tf2/tfmot.py
diff --git a/efficientdet/tf2/train.py b/efficientdet/tf2/train.py
@@ -23,9 +23,9 @@
 import dataloader
 import hparams_config
 import utils
-from keras import tfmot
-from keras import train_lib
-from keras import util_keras
+from tf2 import tfmot
+from tf2 import train_lib
+from tf2 import util_keras
 
 FLAGS = flags.FLAGS
 
diff --git a/efficientdet/tf2/train_lib.py b/efficientdet/tf2/train_lib.py
@@ -28,11 +28,11 @@
 import inference
 import iou_utils
 import utils
-from keras import anchors
-from keras import efficientdet_keras
-from keras import label_util
-from keras import postprocess
-from keras import util_keras
+from tf2 import anchors
+from tf2 import efficientdet_keras
+from tf2 import label_util
+from tf2 import postprocess
+from tf2 import util_keras
 from tensorflow_model_optimization.python.core.sparsity.keras import pruning_wrapper
 
 
diff --git a/efficientdet/tf2/train_lib_test.py b/efficientdet/tf2/train_lib_test.py
@@ -19,7 +19,7 @@
 
 import det_model_fn as legacy_fn
 import hparams_config
-from keras import train_lib
+from tf2 import train_lib
 
 
 class TrainLibTest(tf.test.TestCase):
diff --git a/efficientdet/tf2/util_keras.py b/efficientdet/tf2/util_keras.py
@@ -20,7 +20,7 @@
 import tensorflow as tf
 import utils
 
-# Prefix variable name mapping from keras model to the hub module checkpoint.
+# Prefix variable name mapping from tf2 model to the hub module checkpoint.
 HUB_CPT_NAME = collections.OrderedDict([('class_net/class-predict/', 'classes'),
                                         ('box_net/box-predict/', 'boxes'),
                                         ('', 'base_model')])
diff --git a/efficientdet/tf2/util_keras_test.py b/efficientdet/tf2/util_keras_test.py
@@ -17,7 +17,7 @@
 import tensorflow as tf
 
 import utils
-from keras import util_keras
+from tf2 import util_keras
 
 
 class KerasUtilTest(tf.test.TestCase, parameterized.TestCase):
diff --git a/efficientdet/tf2/wbf.py b/efficientdet/tf2/wbf.py
diff --git a/efficientdet/tf2/wbf_test.py b/efficientdet/tf2/wbf_test.py
@@ -16,7 +16,7 @@
 from absl import logging
 import tensorflow as tf
 
-from keras import wbf
+from tf2 import wbf
 
 
 class WbfTest(tf.test.TestCase):
diff --git a/efficientdet/utils.py b/efficientdet/utils.py
@@ -653,7 +653,7 @@ def _recompute_grad(f):
   Warning: If `f` was originally a tf.keras Model or Layer object, `g` will not
   be able to access the member variables of that object, because `g` returns
   through the wrapper function `inner`.  When recomputing gradients through
-  objects that inherit from keras, we suggest keeping a reference to the
+  objects that inherit from tf2, we suggest keeping a reference to the
   underlying object around for the purpose of accessing these variables.
 
   Args:
