revert changes

keras-team · Dec 18, 2023 · 0a6c635 · 0a6c635
1 parent 821a3a1
commit 0a6c635
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/keras_cv/callbacks/pycoco_callback.py b/keras_cv/callbacks/pycoco_callback.py
@@ -15,15 +15,15 @@
 
 from keras_cv import bounding_box
 from keras_cv.api_export import keras_cv_export
+from keras_cv.backend import keras
 from keras_cv.backend import ops
-from keras_cv.backend.keras.callbacks import Callback
 from keras_cv.metrics.coco import compute_pycoco_metrics
 from keras_cv.models.object_detection.__internal__ import unpack_input
 from keras_cv.utils.conditional_imports import assert_pycocotools_installed
 
 
 @keras_cv_export("keras_cv.callbacks.PyCOCOCallback")
-class PyCOCOCallback(Callback):
+class PyCOCOCallback(keras.callbacks.Callback):
     def __init__(
         self, validation_data, bounding_box_format, cache=True, **kwargs
     ):

diff --git a/keras_cv/callbacks/waymo_evaluation_callback.py b/keras_cv/callbacks/waymo_evaluation_callback.py
@@ -14,7 +14,7 @@
 import tensorflow as tf
 
 from keras_cv.api_export import keras_cv_export
-from keras_cv.backend.keras.callbacks import Callback
+from keras_cv.backend import keras
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
 from keras_cv.utils import assert_waymo_open_dataset_installed
 
@@ -30,7 +30,7 @@
 
 
 @keras_cv_export("keras_cv.callbacks.WaymoEvaluationCallback")
-class WaymoEvaluationCallback(Callback):
+class WaymoEvaluationCallback(keras.callbacks.Callback):
     def __init__(self, validation_data, config=None, **kwargs):
         """Creates a callback to evaluate Waymo Open Dataset (WOD) metrics on a
         validation dataset.

diff --git a/keras_cv/layers/__init__.py b/keras_cv/layers/__init__.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keras_cv.backend.keras.layers import CenterCrop
-from keras_cv.backend.keras.layers import RandomHeight
-from keras_cv.backend.keras.layers import RandomWidth
+from tensorflow.keras.layers import CenterCrop
+from tensorflow.keras.layers import RandomHeight
+from tensorflow.keras.layers import RandomWidth
 from keras_cv.layers.augmenter import Augmenter
 from keras_cv.layers.feature_pyramid import FeaturePyramid
 from keras_cv.layers.fusedmbconv import FusedMBConvBlock

diff --git a/keras_cv/layers/preprocessing/__init__.py b/keras_cv/layers/preprocessing/__init__.py
@@ -15,9 +15,10 @@
 # Also export the image KPLs from core keras, so that user can import all the
 # image KPLs from one place.
 
-from keras_cv.backend.keras.layers import CenterCrop
-from keras_cv.backend.keras.layers import RandomHeight
-from keras_cv.backend.keras.layers import RandomWidth
+from tensorflow.keras.layers import CenterCrop
+from tensorflow.keras.layers import RandomHeight
+from tensorflow.keras.layers import RandomWidth
+
 from keras_cv.layers.preprocessing.aug_mix import AugMix
 from keras_cv.layers.preprocessing.auto_contrast import AutoContrast
 from keras_cv.layers.preprocessing.base_image_augmentation_layer import (

diff --git a/keras_cv/training/contrastive/simclr_trainer.py b/keras_cv/training/contrastive/simclr_trainer.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keras_Cv.backend import keras
+from keras_cv.backend import keras
 
 from keras_cv.backend.keras import layers
 from keras_cv.layers import preprocessing