From 40bf38bc35dc36273d9d2274630b84cf485e7074 Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Tue, 5 Dec 2023 00:04:41 +0000 Subject: [PATCH 1/6] tensorflow.keras --- benchmarks/vectorization_strategy_benchmark.py | 4 ++-- examples/layers/preprocessing/segmentation/demo_utils.py | 3 ++- examples/training/contrastive/imagenet/simclr_training.py | 8 ++++---- keras_cv/backend/keras.py | 3 ++- keras_cv/callbacks/pycoco_callback.py | 2 +- keras_cv/callbacks/waymo_evaluation_callback.py | 2 +- keras_cv/datasets/imagenet/load.py | 2 +- keras_cv/layers/__init__.py | 7 +++---- keras_cv/layers/preprocessing/__init__.py | 7 +++---- keras_cv/layers/preprocessing/random_zoom.py | 2 +- keras_cv/layers/regularization/dropblock_2d.py | 2 +- keras_cv/layers/transformer_encoder.py | 2 +- keras_cv/layers/vit_layers.py | 2 +- keras_cv/metrics/object_detection/box_coco_metrics.py | 2 +- keras_cv/models/legacy/convmixer.py | 2 +- keras_cv/models/legacy/convnext.py | 4 ++-- keras_cv/models/legacy/darknet.py | 2 +- keras_cv/models/legacy/mlp_mixer.py | 4 ++-- keras_cv/models/legacy/models_test.py | 3 ++- .../object_detection/faster_rcnn/faster_rcnn_test.py | 2 +- keras_cv/models/legacy/regnet.py | 4 ++-- keras_cv/models/legacy/utils.py | 3 ++- keras_cv/models/legacy/utils_test.py | 2 +- keras_cv/models/legacy/vgg16.py | 2 +- keras_cv/models/legacy/vgg19.py | 2 +- keras_cv/models/legacy/vit.py | 2 +- keras_cv/models/legacy/weights.py | 3 ++- .../object_detection/yolox/layers/yolox_label_encoder.py | 2 +- keras_cv/models/stable_diffusion/stable_diffusion_test.py | 2 +- keras_cv/models/utils_test.py | 3 +-- keras_cv/training/contrastive/contrastive_trainer_test.py | 6 +++--- keras_cv/training/contrastive/simclr_trainer.py | 2 +- keras_cv/training/contrastive/simclr_trainer_test.py | 4 ++-- keras_cv/utils/preprocessing.py | 2 +- 34 files changed, 53 insertions(+), 51 deletions(-) diff --git a/benchmarks/vectorization_strategy_benchmark.py b/benchmarks/vectorization_strategy_benchmark.py index 18e9c52fb4..86e43cbe3a 100644 --- a/benchmarks/vectorization_strategy_benchmark.py +++ b/benchmarks/vectorization_strategy_benchmark.py @@ -18,10 +18,10 @@ import matplotlib.pyplot as plt import tensorflow as tf -import tensorflow.keras.layers as layers from tensorflow import keras -from tensorflow.keras import backend +import keras_cv.backend.keras.layers as layers +from keras_cv.backend.keras import backend from keras_cv.utils import bounding_box from keras_cv.utils import fill_utils diff --git a/examples/layers/preprocessing/segmentation/demo_utils.py b/examples/layers/preprocessing/segmentation/demo_utils.py index d9611d7912..80e3e58e80 100644 --- a/examples/layers/preprocessing/segmentation/demo_utils.py +++ b/examples/layers/preprocessing/segmentation/demo_utils.py @@ -16,7 +16,8 @@ import matplotlib.pyplot as plt import tensorflow as tf import tensorflow_datasets as tfds -from tensorflow.keras import backend + +from keras_cv.backend.keras import backend image_size = 512 BATCH_SIZE = 32 diff --git a/examples/training/contrastive/imagenet/simclr_training.py b/examples/training/contrastive/imagenet/simclr_training.py index 8b0f982d24..105b604147 100644 --- a/examples/training/contrastive/imagenet/simclr_training.py +++ b/examples/training/contrastive/imagenet/simclr_training.py @@ -17,14 +17,14 @@ import tensorflow as tf from absl import flags from tensorflow import keras -from tensorflow.keras import callbacks -from tensorflow.keras import layers -from tensorflow.keras import metrics -from tensorflow.keras import optimizers from keras_cv import losses from keras_cv import models from keras_cv import training +from keras_cv.backend.keras import callbacks +from keras_cv.backend.keras import layers +from keras_cv.backend.keras import metrics +from keras_cv.backend.keras import optimizers from keras_cv.datasets import imagenet flags.DEFINE_string( diff --git a/keras_cv/backend/keras.py b/keras_cv/backend/keras.py index 340efad3b1..77c58deccf 100644 --- a/keras_cv/backend/keras.py +++ b/keras_cv/backend/keras.py @@ -33,7 +33,8 @@ keras.backend.name_scope = keras.name_scope else: from tensorflow import keras # noqa: F403, F401 - from tensorflow.keras import * # noqa: F403, F401 + + from keras_cv.backend.keras import * # noqa: F403, F401 if not hasattr(keras, "saving"): keras.saving = types.SimpleNamespace() diff --git a/keras_cv/callbacks/pycoco_callback.py b/keras_cv/callbacks/pycoco_callback.py index f0f33ea2a6..c7c73d9470 100644 --- a/keras_cv/callbacks/pycoco_callback.py +++ b/keras_cv/callbacks/pycoco_callback.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. import numpy as np -from tensorflow.keras.callbacks import Callback from keras_cv import bounding_box from keras_cv.api_export import keras_cv_export 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 diff --git a/keras_cv/callbacks/waymo_evaluation_callback.py b/keras_cv/callbacks/waymo_evaluation_callback.py index d2be6241f9..a20706a2eb 100644 --- a/keras_cv/callbacks/waymo_evaluation_callback.py +++ b/keras_cv/callbacks/waymo_evaluation_callback.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import tensorflow as tf -from tensorflow.keras.callbacks import Callback from keras_cv.api_export import keras_cv_export +from keras_cv.backend.keras.callbacks import Callback from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI from keras_cv.utils import assert_waymo_open_dataset_installed diff --git a/keras_cv/datasets/imagenet/load.py b/keras_cv/datasets/imagenet/load.py index 547bb51ab6..893fa6e56d 100644 --- a/keras_cv/datasets/imagenet/load.py +++ b/keras_cv/datasets/imagenet/load.py @@ -13,9 +13,9 @@ # limitations under the License. import tensorflow as tf -from tensorflow.keras import layers from keras_cv.api_export import keras_cv_export +from keras_cv.backend.keras import layers def parse_imagenet_example(img_size, crop_to_aspect_ratio): diff --git a/keras_cv/layers/__init__.py b/keras_cv/layers/__init__.py index 0bfa2aa8ec..42ed4ae2fb 100644 --- a/keras_cv/layers/__init__.py +++ b/keras_cv/layers/__init__.py @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tensorflow.keras.layers import CenterCrop -from tensorflow.keras.layers import RandomHeight -from tensorflow.keras.layers import RandomWidth - +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 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 index 0736035232..59c67f84b6 100644 --- a/keras_cv/layers/preprocessing/__init__.py +++ b/keras_cv/layers/preprocessing/__init__.py @@ -15,10 +15,9 @@ # Also export the image KPLs from core keras, so that user can import all the # image KPLs from one place. -from tensorflow.keras.layers import CenterCrop -from tensorflow.keras.layers import RandomHeight -from tensorflow.keras.layers import RandomWidth - +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 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/layers/preprocessing/random_zoom.py b/keras_cv/layers/preprocessing/random_zoom.py index 089a9922dc..3e75e7dd6f 100644 --- a/keras_cv/layers/preprocessing/random_zoom.py +++ b/keras_cv/layers/preprocessing/random_zoom.py @@ -14,9 +14,9 @@ import tensorflow as tf -from tensorflow.keras import backend from keras_cv.api_export import keras_cv_export +from keras_cv.backend.keras import backend from keras_cv.layers.preprocessing.vectorized_base_image_augmentation_layer import ( # noqa: E501 VectorizedBaseImageAugmentationLayer, ) diff --git a/keras_cv/layers/regularization/dropblock_2d.py b/keras_cv/layers/regularization/dropblock_2d.py index abef5b17d1..675b18430d 100644 --- a/keras_cv/layers/regularization/dropblock_2d.py +++ b/keras_cv/layers/regularization/dropblock_2d.py @@ -19,7 +19,7 @@ if config.keras_3(): base_layer = tf.keras.layers.Layer else: - from tensorflow.keras.__internal__.layers import BaseRandomLayer + from keras_cv.backend.keras.__internal__.layers import BaseRandomLayer base_layer = BaseRandomLayer diff --git a/keras_cv/layers/transformer_encoder.py b/keras_cv/layers/transformer_encoder.py index 152fe354f8..060f6bee5f 100644 --- a/keras_cv/layers/transformer_encoder.py +++ b/keras_cv/layers/transformer_encoder.py @@ -13,9 +13,9 @@ # limitations under the License. from tensorflow import keras -from tensorflow.keras import layers from keras_cv.api_export import keras_cv_export +from keras_cv.backend.keras import layers @keras_cv_export("keras_cv.layers.TransformerEncoder") diff --git a/keras_cv/layers/vit_layers.py b/keras_cv/layers/vit_layers.py index 53d4f51562..f40eae4d0e 100644 --- a/keras_cv/layers/vit_layers.py +++ b/keras_cv/layers/vit_layers.py @@ -15,9 +15,9 @@ import math import tensorflow as tf -from tensorflow.keras import layers from keras_cv.api_export import keras_cv_export +from keras_cv.backend.keras import layers @keras_cv_export("keras_cv.layers.PatchingAndEmbedding") diff --git a/keras_cv/metrics/object_detection/box_coco_metrics.py b/keras_cv/metrics/object_detection/box_coco_metrics.py index a59af8c767..ba88e0526d 100644 --- a/keras_cv/metrics/object_detection/box_coco_metrics.py +++ b/keras_cv/metrics/object_detection/box_coco_metrics.py @@ -17,8 +17,8 @@ import numpy as np import tensorflow as tf -import tensorflow.keras as keras +import keras_cv.backend.keras as keras from keras_cv import bounding_box from keras_cv.api_export import keras_cv_export from keras_cv.backend import ops diff --git a/keras_cv/models/legacy/convmixer.py b/keras_cv/models/legacy/convmixer.py index 89a96f56d3..0522835a56 100644 --- a/keras_cv/models/legacy/convmixer.py +++ b/keras_cv/models/legacy/convmixer.py @@ -21,8 +21,8 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.models.legacy.weights import parse_weights diff --git a/keras_cv/models/legacy/convnext.py b/keras_cv/models/legacy/convnext.py index aae5cafb34..b15cd7de01 100644 --- a/keras_cv/models/legacy/convnext.py +++ b/keras_cv/models/legacy/convnext.py @@ -20,9 +20,9 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import backend -from tensorflow.keras import layers +from keras_cv.backend.keras import backend +from keras_cv.backend.keras import layers from keras_cv.layers.regularization import StochasticDepth from keras_cv.models.legacy import utils diff --git a/keras_cv/models/legacy/darknet.py b/keras_cv/models/legacy/darknet.py index ea7fd429f2..471c9c5c26 100644 --- a/keras_cv/models/legacy/darknet.py +++ b/keras_cv/models/legacy/darknet.py @@ -20,8 +20,8 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.models.backbones.csp_darknet.csp_darknet_utils import ( DarknetConvBlock, ) diff --git a/keras_cv/models/legacy/mlp_mixer.py b/keras_cv/models/legacy/mlp_mixer.py index a48544f905..55a9812362 100644 --- a/keras_cv/models/legacy/mlp_mixer.py +++ b/keras_cv/models/legacy/mlp_mixer.py @@ -20,9 +20,9 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import backend -from tensorflow.keras import layers +from keras_cv.backend.keras import backend +from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils MODEL_CONFIGS = { diff --git a/keras_cv/models/legacy/models_test.py b/keras_cv/models/legacy/models_test.py index 203ac4625e..4f2d4fcf4f 100644 --- a/keras_cv/models/legacy/models_test.py +++ b/keras_cv/models/legacy/models_test.py @@ -18,7 +18,8 @@ import pytest import tensorflow as tf from tensorflow import keras -from tensorflow.keras import backend + +from keras_cv.backend.keras import backend class ModelsTest: diff --git a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py index b8930af944..58db021639 100644 --- a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py +++ b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py @@ -16,8 +16,8 @@ import tensorflow as tf from absl.testing import parameterized from tensorflow import keras -from tensorflow.keras import optimizers +from keras_cv.backend.keras import optimizers from keras_cv.models import ResNet18V2Backbone from keras_cv.models.legacy.object_detection.faster_rcnn.faster_rcnn import ( FasterRCNN, diff --git a/keras_cv/models/legacy/regnet.py b/keras_cv/models/legacy/regnet.py index bf8b7b9123..b5371ec330 100644 --- a/keras_cv/models/legacy/regnet.py +++ b/keras_cv/models/legacy/regnet.py @@ -19,9 +19,9 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import backend -from tensorflow.keras import layers +from keras_cv.backend.keras import backend +from keras_cv.backend.keras import layers from keras_cv.layers import SqueezeAndExcite2D from keras_cv.models.legacy import utils from keras_cv.models.legacy.weights import parse_weights diff --git a/keras_cv/models/legacy/utils.py b/keras_cv/models/legacy/utils.py index df11081a95..bc89d8fbc0 100644 --- a/keras_cv/models/legacy/utils.py +++ b/keras_cv/models/legacy/utils.py @@ -15,7 +15,8 @@ """Utility functions for models""" from tensorflow import keras -from tensorflow.keras import layers + +from keras_cv.backend.keras import layers def parse_model_inputs(input_shape, input_tensor): diff --git a/keras_cv/models/legacy/utils_test.py b/keras_cv/models/legacy/utils_test.py index 497d573fce..f4a4ce7f1f 100644 --- a/keras_cv/models/legacy/utils_test.py +++ b/keras_cv/models/legacy/utils_test.py @@ -14,8 +14,8 @@ """Tests for KerasCV model utils.""" from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/legacy/vgg16.py b/keras_cv/models/legacy/vgg16.py index ffc67a79a2..2c03f73776 100644 --- a/keras_cv/models/legacy/vgg16.py +++ b/keras_cv/models/legacy/vgg16.py @@ -21,8 +21,8 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils diff --git a/keras_cv/models/legacy/vgg19.py b/keras_cv/models/legacy/vgg19.py index e8912b2b81..869584414e 100644 --- a/keras_cv/models/legacy/vgg19.py +++ b/keras_cv/models/legacy/vgg19.py @@ -20,8 +20,8 @@ """ # noqa: E501 import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.models.legacy.vgg16 import apply_vgg_block diff --git a/keras_cv/models/legacy/vit.py b/keras_cv/models/legacy/vit.py index dc5143b986..bf53418b8f 100644 --- a/keras_cv/models/legacy/vit.py +++ b/keras_cv/models/legacy/vit.py @@ -21,8 +21,8 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.layers import TransformerEncoder from keras_cv.layers.vit_layers import PatchingAndEmbedding from keras_cv.models.legacy import utils diff --git a/keras_cv/models/legacy/weights.py b/keras_cv/models/legacy/weights.py index 5f93d1ba97..3737a676e1 100644 --- a/keras_cv/models/legacy/weights.py +++ b/keras_cv/models/legacy/weights.py @@ -11,7 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and import tensorflow as tf -from tensorflow.keras import utils + +from keras_cv.backend.keras import utils def parse_weights(weights, include_top, model_type): diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_label_encoder.py b/keras_cv/models/object_detection/yolox/layers/yolox_label_encoder.py index 36068e3573..7fe2cb1eff 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_label_encoder.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_label_encoder.py @@ -14,9 +14,9 @@ import tensorflow as tf -from tensorflow.keras import layers from keras_cv import bounding_box +from keras_cv.backend.keras import layers class YoloXLabelEncoder(layers.Layer): diff --git a/keras_cv/models/stable_diffusion/stable_diffusion_test.py b/keras_cv/models/stable_diffusion/stable_diffusion_test.py index 895b7b341d..8b97712793 100644 --- a/keras_cv/models/stable_diffusion/stable_diffusion_test.py +++ b/keras_cv/models/stable_diffusion/stable_diffusion_test.py @@ -13,10 +13,10 @@ # limitations under the License. import pytest -from tensorflow.keras import mixed_precision from keras_cv.backend import ops from keras_cv.backend import random +from keras_cv.backend.keras import mixed_precision from keras_cv.models import StableDiffusion from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/utils_test.py b/keras_cv/models/utils_test.py index cc6c1ac596..e89155df91 100644 --- a/keras_cv/models/utils_test.py +++ b/keras_cv/models/utils_test.py @@ -13,8 +13,7 @@ # limitations under the License. """Tests for KerasCV model utils.""" -from tensorflow.keras import layers - +from keras_cv.backend.keras import layers from keras_cv.models import utils from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/training/contrastive/contrastive_trainer_test.py b/keras_cv/training/contrastive/contrastive_trainer_test.py index 2a0d9e23fc..6dd7772ac7 100644 --- a/keras_cv/training/contrastive/contrastive_trainer_test.py +++ b/keras_cv/training/contrastive/contrastive_trainer_test.py @@ -16,10 +16,10 @@ import pytest import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers -from tensorflow.keras import metrics -from tensorflow.keras import optimizers +from keras_cv.backend.keras import layers +from keras_cv.backend.keras import metrics +from keras_cv.backend.keras import optimizers from keras_cv.layers import preprocessing from keras_cv.losses import SimCLRLoss from keras_cv.models import DenseNet121Backbone diff --git a/keras_cv/training/contrastive/simclr_trainer.py b/keras_cv/training/contrastive/simclr_trainer.py index ae2188d8b5..e9d8388807 100644 --- a/keras_cv/training/contrastive/simclr_trainer.py +++ b/keras_cv/training/contrastive/simclr_trainer.py @@ -13,8 +13,8 @@ # limitations under the License. from tensorflow import keras -from tensorflow.keras import layers +from keras_cv.backend.keras import layers from keras_cv.layers import preprocessing from keras_cv.training import ContrastiveTrainer diff --git a/keras_cv/training/contrastive/simclr_trainer_test.py b/keras_cv/training/contrastive/simclr_trainer_test.py index f974cae064..573368466c 100644 --- a/keras_cv/training/contrastive/simclr_trainer_test.py +++ b/keras_cv/training/contrastive/simclr_trainer_test.py @@ -15,9 +15,9 @@ import pytest import tensorflow as tf from tensorflow import keras -from tensorflow.keras import layers -from tensorflow.keras import optimizers +from keras_cv.backend.keras import layers +from keras_cv.backend.keras import optimizers from keras_cv.losses import SimCLRLoss from keras_cv.models import ResNet50V2Backbone from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/utils/preprocessing.py b/keras_cv/utils/preprocessing.py index 8b2b1075c1..878e1dc242 100644 --- a/keras_cv/utils/preprocessing.py +++ b/keras_cv/utils/preprocessing.py @@ -14,10 +14,10 @@ import tensorflow as tf from tensorflow import keras -from tensorflow.keras import backend from keras_cv import core from keras_cv.backend import ops +from keras_cv.backend.keras import backend _TF_INTERPOLATION_METHODS = { "bilinear": tf.image.ResizeMethod.BILINEAR, From 37309bb7662dfca2142089185d69ed474632f898 Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Mon, 18 Dec 2023 20:43:17 +0000 Subject: [PATCH 2/6] update "from tensorflow import keras" --- keras_cv/layers/feature_pyramid.py | 3 +-- keras_cv/layers/feature_pyramid_test.py | 2 +- .../waymo/frustum_random_point_feature_noise_test.py | 2 +- keras_cv/layers/regularization/stochastic_depth.py | 3 +-- keras_cv/layers/serialization_test.py | 2 +- keras_cv/models/legacy/utils_test.py | 3 +-- keras_cv/models/object_detection/yolox/layers/yolox_head.py | 3 +-- keras_cv/models/object_detection/yolox/layers/yolox_pafpn.py | 3 +-- keras_cv/training/contrastive/simclr_trainer.py | 2 +- keras_cv/utils/test_utils.py | 3 +-- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/keras_cv/layers/feature_pyramid.py b/keras_cv/layers/feature_pyramid.py index 8fbb5d461c..e4d102e013 100644 --- a/keras_cv/layers/feature_pyramid.py +++ b/keras_cv/layers/feature_pyramid.py @@ -12,9 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tensorflow import keras - from keras_cv.api_export import keras_cv_export +from keras_cv.backend import keras @keras_cv_export("keras_cv.layers.FeaturePyramid") diff --git a/keras_cv/layers/feature_pyramid_test.py b/keras_cv/layers/feature_pyramid_test.py index b3118d8e2f..a4ce513e0e 100644 --- a/keras_cv/layers/feature_pyramid_test.py +++ b/keras_cv/layers/feature_pyramid_test.py @@ -13,8 +13,8 @@ # limitations under the License. import numpy as np -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.layers import FeaturePyramid from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py index f2aaacb993..141f35195b 100644 --- a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py +++ b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py @@ -4,8 +4,8 @@ import numpy as np import pytest -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.config import keras_3 from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d from keras_cv.layers.preprocessing_3d.waymo.frustum_random_point_feature_noise import ( # noqa: E501 diff --git a/keras_cv/layers/regularization/stochastic_depth.py b/keras_cv/layers/regularization/stochastic_depth.py index 2c45613ed0..8c67c3d392 100644 --- a/keras_cv/layers/regularization/stochastic_depth.py +++ b/keras_cv/layers/regularization/stochastic_depth.py @@ -12,9 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tensorflow import keras - from keras_cv.api_export import keras_cv_export +from keras_cv.backend import keras @keras_cv_export("keras_cv.layers.StochasticDepth") diff --git a/keras_cv/layers/serialization_test.py b/keras_cv/layers/serialization_test.py index e216378a0a..92528fccd4 100644 --- a/keras_cv/layers/serialization_test.py +++ b/keras_cv/layers/serialization_test.py @@ -15,9 +15,9 @@ import inspect from absl.testing import parameterized -from tensorflow import keras from keras_cv import layers as cv_layers +from keras_cv.backend import keras from keras_cv.backend.config import keras_3 from keras_cv.layers.vit_layers import PatchingAndEmbedding from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/legacy/utils_test.py b/keras_cv/models/legacy/utils_test.py index f4a4ce7f1f..db91d26e5d 100644 --- a/keras_cv/models/legacy/utils_test.py +++ b/keras_cv/models/legacy/utils_test.py @@ -13,8 +13,7 @@ # limitations under the License. """Tests for KerasCV model utils.""" -from tensorflow import keras - +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_head.py b/keras_cv/models/object_detection/yolox/layers/yolox_head.py index 6e19cd7859..af5f842701 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_head.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_head.py @@ -13,8 +13,7 @@ # limitations under the License. -from tensorflow import keras - +from keras_cv.backend import keras from keras_cv.models.backbones.csp_darknet.csp_darknet_utils import ( DarknetConvBlock, ) diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_pafpn.py b/keras_cv/models/object_detection/yolox/layers/yolox_pafpn.py index e37513f8ee..39b4019987 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_pafpn.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_pafpn.py @@ -13,8 +13,7 @@ # limitations under the License. -from tensorflow import keras - +from keras_cv.backend import keras from keras_cv.models.backbones.csp_darknet.csp_darknet_utils import ( CrossStagePartial, ) diff --git a/keras_cv/training/contrastive/simclr_trainer.py b/keras_cv/training/contrastive/simclr_trainer.py index e9d8388807..1a0b5a45cf 100644 --- 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 tensorflow import keras +from keras_Cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.layers import preprocessing diff --git a/keras_cv/utils/test_utils.py b/keras_cv/utils/test_utils.py index 1ee9a1652c..043220d494 100644 --- a/keras_cv/utils/test_utils.py +++ b/keras_cv/utils/test_utils.py @@ -14,9 +14,8 @@ import inspect -from tensorflow import keras - from keras_cv import core +from keras_cv.backend import keras def exhaustive_compare(obj1, obj2): From 0bc562283e21198bab5b0029964a1b6452343810 Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Mon, 18 Dec 2023 20:45:21 +0000 Subject: [PATCH 3/6] reolve conflicts --- .../waymo/frustum_random_point_feature_noise_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py index 859e98a883..1c77a902f8 100644 --- a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py +++ b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py @@ -3,7 +3,7 @@ # Licensed under the terms in https://github.com/keras-team/keras-cv/blob/master/keras_cv/layers/preprocessing_3d/waymo/LICENSE # noqa: E501 import numpy as np -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d from keras_cv.layers.preprocessing_3d.waymo.frustum_random_point_feature_noise import ( # noqa: E501 From ba37f07f7b2bf7fe92ae16d959311d363ac02eb9 Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Mon, 18 Dec 2023 20:47:00 +0000 Subject: [PATCH 4/6] update imports --- keras_cv/benchmarks/classification_training_benchmark_test.py | 2 +- keras_cv/callbacks/waymo_evaluation_callback_test.py | 2 +- keras_cv/datasets/pascal_voc/segmentation.py | 2 +- keras_cv/layers/fusedmbconv_test.py | 2 +- keras_cv/layers/mbconv_test.py | 2 +- keras_cv/layers/object_detection/roi_align.py | 2 +- keras_cv/layers/object_detection/roi_generator.py | 2 +- keras_cv/layers/object_detection/roi_pool.py | 2 +- keras_cv/layers/object_detection/roi_sampler.py | 2 +- keras_cv/layers/object_detection/rpn_label_encoder.py | 2 +- keras_cv/layers/object_detection_3d/centernet_label_encoder.py | 2 +- keras_cv/layers/preprocessing_3d/waymo/random_drop_box_test.py | 2 +- keras_cv/layers/transformer_encoder.py | 3 +-- keras_cv/losses/numerical_tests/focal_loss_numerical_test.py | 2 +- keras_cv/models/legacy/convmixer.py | 2 +- keras_cv/models/legacy/convnext.py | 2 +- keras_cv/models/legacy/darknet.py | 2 +- keras_cv/models/legacy/mlp_mixer.py | 2 +- keras_cv/models/legacy/models_test.py | 2 +- .../models/legacy/object_detection/faster_rcnn/faster_rcnn.py | 2 +- .../legacy/object_detection/faster_rcnn/faster_rcnn_test.py | 2 +- keras_cv/models/legacy/regnet.py | 2 +- keras_cv/models/legacy/utils.py | 3 +-- keras_cv/models/legacy/vgg16.py | 2 +- keras_cv/models/legacy/vgg19.py | 2 +- keras_cv/models/legacy/vit.py | 2 +- keras_cv/models/object_detection/yolox/binary_crossentropy.py | 3 ++- keras_cv/models/object_detection/yolox/layers/yolox_decoder.py | 2 +- .../models/object_detection/yolox/layers/yolox_head_test.py | 2 +- .../models/object_detection/yolox/layers/yolox_pafpn_test.py | 2 +- keras_cv/training/contrastive/contrastive_trainer.py | 2 +- keras_cv/training/contrastive/contrastive_trainer_test.py | 2 +- keras_cv/training/contrastive/simclr_trainer_test.py | 2 +- keras_cv/utils/preprocessing.py | 2 +- 34 files changed, 35 insertions(+), 36 deletions(-) diff --git a/keras_cv/benchmarks/classification_training_benchmark_test.py b/keras_cv/benchmarks/classification_training_benchmark_test.py index 358b4a32f0..b9dd6c555d 100644 --- a/keras_cv/benchmarks/classification_training_benchmark_test.py +++ b/keras_cv/benchmarks/classification_training_benchmark_test.py @@ -17,9 +17,9 @@ import tensorflow.compat.v2 as tf import tensorflow_datasets as tfds -from tensorflow import keras from keras_cv import models +from keras_cv.backend import keras from keras_cv.models.classification import image_classifier # isort: off diff --git a/keras_cv/callbacks/waymo_evaluation_callback_test.py b/keras_cv/callbacks/waymo_evaluation_callback_test.py index 7b2fd3adf7..fa6edd9bbf 100644 --- a/keras_cv/callbacks/waymo_evaluation_callback_test.py +++ b/keras_cv/callbacks/waymo_evaluation_callback_test.py @@ -15,8 +15,8 @@ import numpy as np import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.callbacks import WaymoEvaluationCallback from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/datasets/pascal_voc/segmentation.py b/keras_cv/datasets/pascal_voc/segmentation.py index d367c50c12..1bd7ca098d 100644 --- a/keras_cv/datasets/pascal_voc/segmentation.py +++ b/keras_cv/datasets/pascal_voc/segmentation.py @@ -45,9 +45,9 @@ class and instance segmentation masks. import numpy as np import tensorflow as tf import tensorflow_datasets as tfds -from tensorflow import keras from keras_cv.api_export import keras_cv_export +from keras_cv.backend import keras VOC_URL = "https://host.robots.ox.ac.uk/pascal/VOC/voc2012/VOCtrainval_11-May-2012.tar" # noqa: E501 diff --git a/keras_cv/layers/fusedmbconv_test.py b/keras_cv/layers/fusedmbconv_test.py index 63832e05b0..7224471953 100644 --- a/keras_cv/layers/fusedmbconv_test.py +++ b/keras_cv/layers/fusedmbconv_test.py @@ -14,8 +14,8 @@ import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.layers.fusedmbconv import FusedMBConvBlock from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/layers/mbconv_test.py b/keras_cv/layers/mbconv_test.py index d2c79ac0f6..cba99d62aa 100644 --- a/keras_cv/layers/mbconv_test.py +++ b/keras_cv/layers/mbconv_test.py @@ -14,8 +14,8 @@ import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.layers.mbconv import MBConvBlock from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/layers/object_detection/roi_align.py b/keras_cv/layers/object_detection/roi_align.py index 2c45060147..a07c461737 100644 --- a/keras_cv/layers/object_detection/roi_align.py +++ b/keras_cv/layers/object_detection/roi_align.py @@ -18,10 +18,10 @@ from typing import Tuple import tensorflow as tf -from tensorflow import keras from keras_cv import bounding_box from keras_cv.backend import assert_tf_keras +from keras_cv.backend import keras def _feature_bilinear_interpolation( diff --git a/keras_cv/layers/object_detection/roi_generator.py b/keras_cv/layers/object_detection/roi_generator.py index db779f8d3f..bd14ef01ba 100644 --- a/keras_cv/layers/object_detection/roi_generator.py +++ b/keras_cv/layers/object_detection/roi_generator.py @@ -18,11 +18,11 @@ from typing import Union import tensorflow as tf -from tensorflow import keras from keras_cv import bounding_box from keras_cv.api_export import keras_cv_export from keras_cv.backend import assert_tf_keras +from keras_cv.backend import keras @keras_cv_export("keras_cv.layers.ROIGenerator") diff --git a/keras_cv/layers/object_detection/roi_pool.py b/keras_cv/layers/object_detection/roi_pool.py index e9774e3e15..2a04f62909 100644 --- a/keras_cv/layers/object_detection/roi_pool.py +++ b/keras_cv/layers/object_detection/roi_pool.py @@ -13,11 +13,11 @@ # limitations under the License. import tensorflow as tf -from tensorflow import keras from keras_cv import bounding_box from keras_cv.api_export import keras_cv_export from keras_cv.backend import assert_tf_keras +from keras_cv.backend import keras @keras_cv_export("keras_cv.layers.ROIPooler") diff --git a/keras_cv/layers/object_detection/roi_sampler.py b/keras_cv/layers/object_detection/roi_sampler.py index fe63e31ba9..8439a13915 100644 --- a/keras_cv/layers/object_detection/roi_sampler.py +++ b/keras_cv/layers/object_detection/roi_sampler.py @@ -13,10 +13,10 @@ # limitations under the License. import tensorflow as tf -from tensorflow import keras from keras_cv import bounding_box from keras_cv.backend import assert_tf_keras +from keras_cv.backend import keras from keras_cv.bounding_box import iou from keras_cv.layers.object_detection import box_matcher from keras_cv.layers.object_detection import sampling diff --git a/keras_cv/layers/object_detection/rpn_label_encoder.py b/keras_cv/layers/object_detection/rpn_label_encoder.py index 5cd9d88415..3ab5d698e2 100644 --- a/keras_cv/layers/object_detection/rpn_label_encoder.py +++ b/keras_cv/layers/object_detection/rpn_label_encoder.py @@ -15,10 +15,10 @@ from typing import Mapping import tensorflow as tf -from tensorflow import keras from keras_cv import bounding_box from keras_cv.backend import assert_tf_keras +from keras_cv.backend import keras from keras_cv.bounding_box import iou from keras_cv.layers.object_detection import box_matcher from keras_cv.layers.object_detection import sampling diff --git a/keras_cv/layers/object_detection_3d/centernet_label_encoder.py b/keras_cv/layers/object_detection_3d/centernet_label_encoder.py index 7988b44f4a..68e2a9c3b6 100644 --- a/keras_cv/layers/object_detection_3d/centernet_label_encoder.py +++ b/keras_cv/layers/object_detection_3d/centernet_label_encoder.py @@ -19,9 +19,9 @@ import numpy as np import tensorflow as tf -from tensorflow import keras 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 import scope from keras_cv.backend.scope import tf_data diff --git a/keras_cv/layers/preprocessing_3d/waymo/random_drop_box_test.py b/keras_cv/layers/preprocessing_3d/waymo/random_drop_box_test.py index d10c61c85e..d633ae4bbd 100644 --- a/keras_cv/layers/preprocessing_3d/waymo/random_drop_box_test.py +++ b/keras_cv/layers/preprocessing_3d/waymo/random_drop_box_test.py @@ -3,8 +3,8 @@ # Licensed under the terms in https://github.com/keras-team/keras-cv/blob/master/keras_cv/layers/preprocessing_3d/waymo/LICENSE # noqa: E501 import numpy as np -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d from keras_cv.layers.preprocessing_3d.waymo.random_drop_box import RandomDropBox from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/layers/transformer_encoder.py b/keras_cv/layers/transformer_encoder.py index 060f6bee5f..0845ad05eb 100644 --- a/keras_cv/layers/transformer_encoder.py +++ b/keras_cv/layers/transformer_encoder.py @@ -12,9 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tensorflow import keras - from keras_cv.api_export import keras_cv_export +from keras_cv.backend import keras from keras_cv.backend.keras import layers diff --git a/keras_cv/losses/numerical_tests/focal_loss_numerical_test.py b/keras_cv/losses/numerical_tests/focal_loss_numerical_test.py index e9f1088ece..e4a064a65e 100644 --- a/keras_cv/losses/numerical_tests/focal_loss_numerical_test.py +++ b/keras_cv/losses/numerical_tests/focal_loss_numerical_test.py @@ -15,8 +15,8 @@ import numpy as np import tensorflow as tf from absl.testing import parameterized -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend import ops from keras_cv.losses import FocalLoss from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/legacy/convmixer.py b/keras_cv/models/legacy/convmixer.py index 0522835a56..8b619a87bc 100644 --- a/keras_cv/models/legacy/convmixer.py +++ b/keras_cv/models/legacy/convmixer.py @@ -20,8 +20,8 @@ """ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.models.legacy.weights import parse_weights diff --git a/keras_cv/models/legacy/convnext.py b/keras_cv/models/legacy/convnext.py index b15cd7de01..55c392b8a4 100644 --- a/keras_cv/models/legacy/convnext.py +++ b/keras_cv/models/legacy/convnext.py @@ -19,8 +19,8 @@ """ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import backend from keras_cv.backend.keras import layers from keras_cv.layers.regularization import StochasticDepth diff --git a/keras_cv/models/legacy/darknet.py b/keras_cv/models/legacy/darknet.py index 471c9c5c26..aeb110fb4f 100644 --- a/keras_cv/models/legacy/darknet.py +++ b/keras_cv/models/legacy/darknet.py @@ -19,8 +19,8 @@ """ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.models.backbones.csp_darknet.csp_darknet_utils import ( DarknetConvBlock, diff --git a/keras_cv/models/legacy/mlp_mixer.py b/keras_cv/models/legacy/mlp_mixer.py index 55a9812362..e02863c77f 100644 --- a/keras_cv/models/legacy/mlp_mixer.py +++ b/keras_cv/models/legacy/mlp_mixer.py @@ -19,8 +19,8 @@ """ # noqa: E501 import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import backend from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils diff --git a/keras_cv/models/legacy/models_test.py b/keras_cv/models/legacy/models_test.py index 4f2d4fcf4f..1eae9b60c7 100644 --- a/keras_cv/models/legacy/models_test.py +++ b/keras_cv/models/legacy/models_test.py @@ -17,8 +17,8 @@ import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import backend diff --git a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn.py b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn.py index f4c2543e75..4b56d06f70 100644 --- a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn.py +++ b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn.py @@ -14,11 +14,11 @@ import tensorflow as tf from absl import logging -from tensorflow import keras from keras_cv import bounding_box from keras_cv import layers as cv_layers from keras_cv import models +from keras_cv.backend import keras from keras_cv.bounding_box.converters import _decode_deltas_to_boxes from keras_cv.bounding_box.utils import _clip_boxes from keras_cv.layers.object_detection.anchor_generator import AnchorGenerator diff --git a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py index 58db021639..29e88a7474 100644 --- a/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py +++ b/keras_cv/models/legacy/object_detection/faster_rcnn/faster_rcnn_test.py @@ -15,8 +15,8 @@ import pytest import tensorflow as tf from absl.testing import parameterized -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import optimizers from keras_cv.models import ResNet18V2Backbone from keras_cv.models.legacy.object_detection.faster_rcnn.faster_rcnn import ( diff --git a/keras_cv/models/legacy/regnet.py b/keras_cv/models/legacy/regnet.py index b5371ec330..5c0f857d50 100644 --- a/keras_cv/models/legacy/regnet.py +++ b/keras_cv/models/legacy/regnet.py @@ -18,8 +18,8 @@ """ # noqa: E501 import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import backend from keras_cv.backend.keras import layers from keras_cv.layers import SqueezeAndExcite2D diff --git a/keras_cv/models/legacy/utils.py b/keras_cv/models/legacy/utils.py index bc89d8fbc0..d9ac7ce044 100644 --- a/keras_cv/models/legacy/utils.py +++ b/keras_cv/models/legacy/utils.py @@ -14,8 +14,7 @@ # ============================================================================== """Utility functions for models""" -from tensorflow import keras - +from keras_cv.backend import keras from keras_cv.backend.keras import layers diff --git a/keras_cv/models/legacy/vgg16.py b/keras_cv/models/legacy/vgg16.py index 2c03f73776..b6c325c360 100644 --- a/keras_cv/models/legacy/vgg16.py +++ b/keras_cv/models/legacy/vgg16.py @@ -20,8 +20,8 @@ """ # noqa: E501 import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils diff --git a/keras_cv/models/legacy/vgg19.py b/keras_cv/models/legacy/vgg19.py index 869584414e..13f9be7df7 100644 --- a/keras_cv/models/legacy/vgg19.py +++ b/keras_cv/models/legacy/vgg19.py @@ -19,8 +19,8 @@ (ICLR 2015) """ # noqa: E501 import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.models.legacy import utils from keras_cv.models.legacy.vgg16 import apply_vgg_block diff --git a/keras_cv/models/legacy/vit.py b/keras_cv/models/legacy/vit.py index bf53418b8f..38f24f93f7 100644 --- a/keras_cv/models/legacy/vit.py +++ b/keras_cv/models/legacy/vit.py @@ -20,8 +20,8 @@ """ # noqa: E501 import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.layers import TransformerEncoder from keras_cv.layers.vit_layers import PatchingAndEmbedding diff --git a/keras_cv/models/object_detection/yolox/binary_crossentropy.py b/keras_cv/models/object_detection/yolox/binary_crossentropy.py index dcc2b3b79b..dd78671623 100644 --- a/keras_cv/models/object_detection/yolox/binary_crossentropy.py +++ b/keras_cv/models/object_detection/yolox/binary_crossentropy.py @@ -16,7 +16,8 @@ import warnings import tensorflow as tf -from tensorflow import keras + +from keras_cv.backend import keras class BinaryCrossentropy(keras.losses.Loss): diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_decoder.py b/keras_cv/models/object_detection/yolox/layers/yolox_decoder.py index de8f3b7665..6e787a6088 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_decoder.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_decoder.py @@ -14,10 +14,10 @@ import tensorflow as tf -from tensorflow import keras import keras_cv.layers as cv_layers from keras_cv import bounding_box +from keras_cv.backend import keras class YoloXPredictionDecoder(keras.layers.Layer): diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_head_test.py b/keras_cv/models/object_detection/yolox/layers/yolox_head_test.py index da42491b78..664cb9c2d9 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_head_test.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_head_test.py @@ -14,8 +14,8 @@ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.models.object_detection.yolox.layers import YoloXHead from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/models/object_detection/yolox/layers/yolox_pafpn_test.py b/keras_cv/models/object_detection/yolox/layers/yolox_pafpn_test.py index c7977f42aa..49cbc683b5 100644 --- a/keras_cv/models/object_detection/yolox/layers/yolox_pafpn_test.py +++ b/keras_cv/models/object_detection/yolox/layers/yolox_pafpn_test.py @@ -14,8 +14,8 @@ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.models.object_detection.yolox.layers import YoloXPAFPN from keras_cv.tests.test_case import TestCase diff --git a/keras_cv/training/contrastive/contrastive_trainer.py b/keras_cv/training/contrastive/contrastive_trainer.py index e97435a7f6..ab9297e83e 100644 --- a/keras_cv/training/contrastive/contrastive_trainer.py +++ b/keras_cv/training/contrastive/contrastive_trainer.py @@ -14,8 +14,8 @@ import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.utils.train import convert_inputs_to_tf_dataset diff --git a/keras_cv/training/contrastive/contrastive_trainer_test.py b/keras_cv/training/contrastive/contrastive_trainer_test.py index 6dd7772ac7..dfa7c7cfe1 100644 --- a/keras_cv/training/contrastive/contrastive_trainer_test.py +++ b/keras_cv/training/contrastive/contrastive_trainer_test.py @@ -15,8 +15,8 @@ import numpy as np import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.backend.keras import metrics from keras_cv.backend.keras import optimizers diff --git a/keras_cv/training/contrastive/simclr_trainer_test.py b/keras_cv/training/contrastive/simclr_trainer_test.py index 573368466c..71c085dfb0 100644 --- a/keras_cv/training/contrastive/simclr_trainer_test.py +++ b/keras_cv/training/contrastive/simclr_trainer_test.py @@ -14,8 +14,8 @@ import pytest import tensorflow as tf -from tensorflow import keras +from keras_cv.backend import keras from keras_cv.backend.keras import layers from keras_cv.backend.keras import optimizers from keras_cv.losses import SimCLRLoss diff --git a/keras_cv/utils/preprocessing.py b/keras_cv/utils/preprocessing.py index 878e1dc242..ff1fabd0c4 100644 --- a/keras_cv/utils/preprocessing.py +++ b/keras_cv/utils/preprocessing.py @@ -13,9 +13,9 @@ # limitations under the License. import tensorflow as tf -from tensorflow import keras from keras_cv import core +from keras_cv.backend import keras from keras_cv.backend import ops from keras_cv.backend.keras import backend From 821a3a1d102d623d9d0ee69bcea89d95af8b9de3 Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Mon, 18 Dec 2023 20:47:59 +0000 Subject: [PATCH 5/6] code reformatted --- .../waymo/frustum_random_point_feature_noise_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py index 1c77a902f8..59e9836efb 100644 --- a/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py +++ b/keras_cv/layers/preprocessing_3d/waymo/frustum_random_point_feature_noise_test.py @@ -3,8 +3,8 @@ # Licensed under the terms in https://github.com/keras-team/keras-cv/blob/master/keras_cv/layers/preprocessing_3d/waymo/LICENSE # noqa: E501 import numpy as np -from keras_cv.backend import keras +from keras_cv.backend import keras from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d from keras_cv.layers.preprocessing_3d.waymo.frustum_random_point_feature_noise import ( # noqa: E501 FrustumRandomPointFeatureNoise, From 0a6c635dcfba192c765b14e4570094208c6625bf Mon Sep 17 00:00:00 2001 From: divyashreepathihalli Date: Mon, 18 Dec 2023 21:37:09 +0000 Subject: [PATCH 6/6] revert changes --- keras_cv/callbacks/pycoco_callback.py | 4 ++-- keras_cv/callbacks/waymo_evaluation_callback.py | 4 ++-- keras_cv/layers/__init__.py | 6 +++--- keras_cv/layers/preprocessing/__init__.py | 7 ++++--- keras_cv/training/contrastive/simclr_trainer.py | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/keras_cv/callbacks/pycoco_callback.py b/keras_cv/callbacks/pycoco_callback.py index c7c73d9470..4b54559a01 100644 --- 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 index a20706a2eb..5c2ba8c519 100644 --- 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 index 42ed4ae2fb..57c7fe0d40 100644 --- 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 index 59c67f84b6..0736035232 100644 --- 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 index 1a0b5a45cf..e43fa19377 100644 --- 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