Make 3d namespacing consistent (#1288)

ianstenbit · web-flow · commit c3b01bea6cbf · 2023-01-18T13:11:40.000-07:00
diff --git a/keras_cv/datasets/waymo/transformer.py b/keras_cv/datasets/waymo/transformer.py
@@ -27,7 +27,7 @@
 from waymo_open_dataset.utils import transform_utils
 
 from keras_cv.datasets.waymo import struct
-from keras_cv.layers.object_detection3d import voxel_utils
+from keras_cv.layers.object_detection_3d import voxel_utils
 
 WOD_FRAME_OUTPUT_SIGNATURE = {
     "frame_id": tf.TensorSpec((), tf.int64),
diff --git a/keras_cv/layers/__init__.py b/keras_cv/layers/__init__.py
@@ -20,35 +20,14 @@
 from keras_cv.layers.feature_pyramid import FeaturePyramid
 from keras_cv.layers.fusedmbconv import FusedMBConvBlock
 from keras_cv.layers.mbconv import MBConvBlock
-from keras_cv.layers.object_detection3d.voxelization import DynamicVoxelization
 from keras_cv.layers.object_detection.anchor_generator import AnchorGenerator
 from keras_cv.layers.object_detection.multi_class_non_max_suppression import (
     MultiClassNonMaxSuppression,
 )
 from keras_cv.layers.object_detection.retina_net_label_encoder import (
     RetinaNetLabelEncoder,
 )
-from keras_cv.layers.preprocessing3d.frustum_random_dropping_points import (
-    FrustumRandomDroppingPoints,
-)
-from keras_cv.layers.preprocessing3d.frustum_random_point_feature_noise import (
-    FrustumRandomPointFeatureNoise,
-)
-from keras_cv.layers.preprocessing3d.global_random_dropping_points import (
-    GlobalRandomDroppingPoints,
-)
-from keras_cv.layers.preprocessing3d.global_random_flip_y import GlobalRandomFlipY
-from keras_cv.layers.preprocessing3d.global_random_rotation import GlobalRandomRotation
-from keras_cv.layers.preprocessing3d.global_random_scaling import GlobalRandomScaling
-from keras_cv.layers.preprocessing3d.global_random_translation import (
-    GlobalRandomTranslation,
-)
-from keras_cv.layers.preprocessing3d.group_points_by_bounding_boxes import (
-    GroupPointsByBoundingBoxes,
-)
-from keras_cv.layers.preprocessing3d.random_copy_paste import RandomCopyPaste
-from keras_cv.layers.preprocessing3d.random_drop_box import RandomDropBox
-from keras_cv.layers.preprocessing3d.swap_background import SwapBackground
+from keras_cv.layers.object_detection_3d.voxelization import DynamicVoxelization
 from keras_cv.layers.preprocessing.aug_mix import AugMix
 from keras_cv.layers.preprocessing.augmenter import Augmenter
 from keras_cv.layers.preprocessing.auto_contrast import AutoContrast
@@ -95,6 +74,27 @@
 from keras_cv.layers.preprocessing.rescaling import Rescaling
 from keras_cv.layers.preprocessing.resizing import Resizing
 from keras_cv.layers.preprocessing.solarization import Solarization
+from keras_cv.layers.preprocessing_3d.frustum_random_dropping_points import (
+    FrustumRandomDroppingPoints,
+)
+from keras_cv.layers.preprocessing_3d.frustum_random_point_feature_noise import (
+    FrustumRandomPointFeatureNoise,
+)
+from keras_cv.layers.preprocessing_3d.global_random_dropping_points import (
+    GlobalRandomDroppingPoints,
+)
+from keras_cv.layers.preprocessing_3d.global_random_flip_y import GlobalRandomFlipY
+from keras_cv.layers.preprocessing_3d.global_random_rotation import GlobalRandomRotation
+from keras_cv.layers.preprocessing_3d.global_random_scaling import GlobalRandomScaling
+from keras_cv.layers.preprocessing_3d.global_random_translation import (
+    GlobalRandomTranslation,
+)
+from keras_cv.layers.preprocessing_3d.group_points_by_bounding_boxes import (
+    GroupPointsByBoundingBoxes,
+)
+from keras_cv.layers.preprocessing_3d.random_copy_paste import RandomCopyPaste
+from keras_cv.layers.preprocessing_3d.random_drop_box import RandomDropBox
+from keras_cv.layers.preprocessing_3d.swap_background import SwapBackground
 from keras_cv.layers.regularization.drop_path import DropPath
 from keras_cv.layers.regularization.dropblock_2d import DropBlock2D
 from keras_cv.layers.regularization.squeeze_excite import SqueezeAndExcite2D
diff --git a/keras_cv/layers/object_detection_3d/__init__.py b/keras_cv/layers/object_detection_3d/__init__.py
diff --git a/keras_cv/layers/object_detection_3d/center_net_label_encoder.py b/keras_cv/layers/object_detection_3d/center_net_label_encoder.py
@@ -20,7 +20,7 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d import voxel_utils
+from keras_cv.layers.object_detection_3d import voxel_utils
 
 # Infinite voxel size.
 INF_VOXEL_SIZE = 100
diff --git a/keras_cv/layers/object_detection_3d/center_net_label_encoder_test.py b/keras_cv/layers/object_detection_3d/center_net_label_encoder_test.py
@@ -15,7 +15,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d.center_net_label_encoder import (
+from keras_cv.layers.object_detection_3d.center_net_label_encoder import (
     CenterNetLabelEncoder,
 )
 
diff --git a/keras_cv/layers/object_detection_3d/heatmap_decoder.py b/keras_cv/layers/object_detection_3d/heatmap_decoder.py
@@ -18,7 +18,7 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d import voxel_utils
+from keras_cv.layers.object_detection_3d import voxel_utils
 
 
 def decode_bin_heading(predictions: tf.Tensor, num_bin: int) -> tf.Tensor:
diff --git a/keras_cv/layers/object_detection_3d/voxel_utils.py b/keras_cv/layers/object_detection_3d/voxel_utils.py
diff --git a/keras_cv/layers/object_detection_3d/voxel_utils_test.py b/keras_cv/layers/object_detection_3d/voxel_utils_test.py
@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d import voxel_utils
+from keras_cv.layers.object_detection_3d import voxel_utils
 
 
 class PadOrTrimToTest(tf.test.TestCase):
diff --git a/keras_cv/layers/object_detection_3d/voxelization.py b/keras_cv/layers/object_detection_3d/voxelization.py
@@ -18,7 +18,7 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d import voxel_utils
+from keras_cv.layers.object_detection_3d import voxel_utils
 
 EPSILON = 1e-4
 VOXEL_FEATURE_MIN = -1000
diff --git a/keras_cv/layers/object_detection_3d/voxelization_test.py b/keras_cv/layers/object_detection_3d/voxelization_test.py
@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.object_detection3d.voxelization import DynamicVoxelization
+from keras_cv.layers.object_detection_3d.voxelization import DynamicVoxelization
 
 
 class VoxelizationTest(tf.test.TestCase):
diff --git a/keras_cv/layers/preprocessing3d/__init__.py b/keras_cv/layers/preprocessing3d/__init__.py
diff --git a/keras_cv/layers/preprocessing_3d/__init__.py b/keras_cv/layers/preprocessing_3d/__init__.py
@@ -0,0 +1,38 @@
+# Copyright 2022 The KerasCV Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from keras_cv.layers.preprocessing_3d.base_augmentation_layer_3d import (
+    BaseAugmentationLayer3D,
+)
+from keras_cv.layers.preprocessing_3d.frustum_random_dropping_points import (
+    FrustumRandomDroppingPoints,
+)
+from keras_cv.layers.preprocessing_3d.frustum_random_point_feature_noise import (
+    FrustumRandomPointFeatureNoise,
+)
+from keras_cv.layers.preprocessing_3d.global_random_dropping_points import (
+    GlobalRandomDroppingPoints,
+)
+from keras_cv.layers.preprocessing_3d.global_random_flip_y import GlobalRandomFlipY
+from keras_cv.layers.preprocessing_3d.global_random_rotation import GlobalRandomRotation
+from keras_cv.layers.preprocessing_3d.global_random_scaling import GlobalRandomScaling
+from keras_cv.layers.preprocessing_3d.global_random_translation import (
+    GlobalRandomTranslation,
+)
+from keras_cv.layers.preprocessing_3d.group_points_by_bounding_boxes import (
+    GroupPointsByBoundingBoxes,
+)
+from keras_cv.layers.preprocessing_3d.random_copy_paste import RandomCopyPaste
+from keras_cv.layers.preprocessing_3d.random_drop_box import RandomDropBox
+from keras_cv.layers.preprocessing_3d.swap_background import SwapBackground
diff --git a/keras_cv/layers/preprocessing_3d/base_augmentation_layer_3d.py b/keras_cv/layers/preprocessing_3d/base_augmentation_layer_3d.py
diff --git a/keras_cv/layers/preprocessing_3d/base_augmentation_layer_3d_test.py b/keras_cv/layers/preprocessing_3d/base_augmentation_layer_3d_test.py
@@ -14,7 +14,7 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/frustum_random_dropping_points.py b/keras_cv/layers/preprocessing_3d/frustum_random_dropping_points.py
@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops import point_cloud
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
diff --git a/keras_cv/layers/preprocessing_3d/frustum_random_dropping_points_test.py b/keras_cv/layers/preprocessing_3d/frustum_random_dropping_points_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.frustum_random_dropping_points import (
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.frustum_random_dropping_points import (
     FrustumRandomDroppingPoints,
 )
 
diff --git a/keras_cv/layers/preprocessing_3d/frustum_random_point_feature_noise.py b/keras_cv/layers/preprocessing_3d/frustum_random_point_feature_noise.py
@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops import point_cloud
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
diff --git a/keras_cv/layers/preprocessing_3d/frustum_random_point_feature_noise_test.py b/keras_cv/layers/preprocessing_3d/frustum_random_point_feature_noise_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.frustum_random_point_feature_noise import (
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.frustum_random_point_feature_noise import (
     FrustumRandomPointFeatureNoise,
 )
 
diff --git a/keras_cv/layers/preprocessing_3d/global_random_dropping_points.py b/keras_cv/layers/preprocessing_3d/global_random_dropping_points.py
@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/global_random_dropping_points_test.py b/keras_cv/layers/preprocessing_3d/global_random_dropping_points_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.global_random_dropping_points import (
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.global_random_dropping_points import (
     GlobalRandomDroppingPoints,
 )
 
diff --git a/keras_cv/layers/preprocessing_3d/global_random_flip_y.py b/keras_cv/layers/preprocessing_3d/global_random_flip_y.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops.point_cloud import wrap_angle_radians
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
diff --git a/keras_cv/layers/preprocessing_3d/global_random_flip_y_test.py b/keras_cv/layers/preprocessing_3d/global_random_flip_y_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.global_random_flip_y import GlobalRandomFlipY
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.global_random_flip_y import GlobalRandomFlipY
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/global_random_rotation.py b/keras_cv/layers/preprocessing_3d/global_random_rotation.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops.point_cloud import coordinate_transform
 from keras_cv.ops.point_cloud import wrap_angle_radians
 
diff --git a/keras_cv/layers/preprocessing_3d/global_random_rotation_test.py b/keras_cv/layers/preprocessing_3d/global_random_rotation_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.global_random_rotation import GlobalRandomRotation
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.global_random_rotation import GlobalRandomRotation
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/global_random_scaling.py b/keras_cv/layers/preprocessing_3d/global_random_scaling.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/global_random_scaling_test.py b/keras_cv/layers/preprocessing_3d/global_random_scaling_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.global_random_scaling import GlobalRandomScaling
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.global_random_scaling import GlobalRandomScaling
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/global_random_translation.py b/keras_cv/layers/preprocessing_3d/global_random_translation.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops.point_cloud import coordinate_transform
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
diff --git a/keras_cv/layers/preprocessing_3d/global_random_translation_test.py b/keras_cv/layers/preprocessing_3d/global_random_translation_test.py
@@ -14,8 +14,8 @@
 import numpy as np
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.global_random_translation import (
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.global_random_translation import (
     GlobalRandomTranslation,
 )
 
diff --git a/keras_cv/layers/preprocessing_3d/group_points_by_bounding_boxes.py b/keras_cv/layers/preprocessing_3d/group_points_by_bounding_boxes.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops.point_cloud import group_points_by_boxes
 from keras_cv.ops.point_cloud import is_within_box3d
 
diff --git a/keras_cv/layers/preprocessing_3d/group_points_by_bounding_boxes_test.py b/keras_cv/layers/preprocessing_3d/group_points_by_bounding_boxes_test.py
@@ -17,8 +17,8 @@
 import pytest
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.group_points_by_bounding_boxes import (
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.group_points_by_bounding_boxes import (
     GroupPointsByBoundingBoxes,
 )
 
diff --git a/keras_cv/layers/preprocessing_3d/random_copy_paste.py b/keras_cv/layers/preprocessing_3d/random_copy_paste.py
@@ -15,7 +15,7 @@
 import tensorflow as tf
 
 from keras_cv.bounding_box_3d import CENTER_XYZ_DXDYDZ_PHI
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
 from keras_cv.ops import iou_3d
 from keras_cv.ops.point_cloud import is_within_any_box3d
 
diff --git a/keras_cv/layers/preprocessing_3d/random_copy_paste_test.py b/keras_cv/layers/preprocessing_3d/random_copy_paste_test.py
@@ -17,8 +17,8 @@
 import pytest
 import tensorflow as tf
 
-from keras_cv.layers.preprocessing3d import base_augmentation_layer_3d
-from keras_cv.layers.preprocessing3d.random_copy_paste import RandomCopyPaste
+from keras_cv.layers.preprocessing_3d import base_augmentation_layer_3d
+from keras_cv.layers.preprocessing_3d.random_copy_paste import RandomCopyPaste
 
 POINT_CLOUDS = base_augmentation_layer_3d.POINT_CLOUDS
 BOUNDING_BOXES = base_augmentation_layer_3d.BOUNDING_BOXES
diff --git a/keras_cv/layers/preprocessing_3d/random_drop_box.py b/keras_cv/layers/preprocessing_3d/random_drop_box.py
diff --git a/keras_cv/layers/preprocessing_3d/random_drop_box_test.py b/keras_cv/layers/preprocessing_3d/random_drop_box_test.py
diff --git a/keras_cv/layers/preprocessing_3d/swap_background.py b/keras_cv/layers/preprocessing_3d/swap_background.py
diff --git a/keras_cv/layers/preprocessing_3d/swap_background_test.py b/keras_cv/layers/preprocessing_3d/swap_background_test.py
diff --git a/keras_cv/models/__init__.py b/keras_cv/models/__init__.py
diff --git a/keras_cv/models/object_detection_3d/__init__.py b/keras_cv/models/object_detection_3d/__init__.py
diff --git a/keras_cv/models/object_detection_3d/center_pillar.py b/keras_cv/models/object_detection_3d/center_pillar.py
diff --git a/keras_cv/models/object_detection_3d/center_pillar_test.py b/keras_cv/models/object_detection_3d/center_pillar_test.py

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`import tensorflow as tf`
`17`	`17`
`18`		`-from keras_cv.layers.object_detection3d.center_net_label_encoder import (`
	`18`	`+from keras_cv.layers.object_detection_3d.center_net_label_encoder import (`
`19`	`19`	`CenterNetLabelEncoder,`
`20`	`20`	`)`
`21`	`21`