Update BUILD files for preprocess layers.

PiperOrigin-RevId: 289364907
Change-Id: I3be7aa48d98ccd57f88bbff1066882af28215c33

tensorflow/python/keras/BUILD

@@ -378,12 +378,6 @@ py_library(
         "layers/normalization.py",
         "layers/normalization_v2.py",
         "layers/pooling.py",
-        "layers/preprocessing/categorical.py",
-        "layers/preprocessing/image_preprocessing.py",
-        "layers/preprocessing/normalization.py",
-        "layers/preprocessing/normalization_v1.py",
-        "layers/preprocessing/text_vectorization.py",
-        "layers/preprocessing/text_vectorization_v1.py",
         "layers/recurrent.py",
         "layers/recurrent_v2.py",
         "layers/rnn_cell_wrapper_v2.py",
@@ -409,6 +403,7 @@ py_library(
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
         "//tensorflow/python/distribute:distribute_lib",
+        "//tensorflow/python/keras/layers/preprocessing",
         "//tensorflow/python/keras/utils:generic_utils",
         "//tensorflow/python/keras/utils:layer_utils",
         "//tensorflow/python/keras/utils:tf_utils",
@@ -416,17 +411,6 @@ py_library(
     ],
 )
 
-py_library(
-    name = "preprocessing_test_utils",
-    srcs = ["layers/preprocessing/preprocessing_test_utils.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":keras",
-        "//tensorflow/python:client_testlib",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
 py_library(
     name = "layers",
     srcs = [
@@ -691,45 +675,6 @@ cuda_py_test(
     ],
 )
 
-filegroup(
-    name = "vocabulary_testdata",
-    srcs = [
-        "layers/preprocessing/testdata/wire_vocabulary.txt",
-    ],
-)
-
-cuda_py_test(
-    name = "categorical_test",
-    size = "medium",
-    srcs = ["layers/preprocessing/categorical_test.py"],
-    data = [":vocabulary_testdata"],
-    python_version = "PY3",
-    shard_count = 4,
-    tags = [
-        "no_oss",
-    ],
-    deps = [
-        ":keras",
-        "//tensorflow/python:client_testlib",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-cuda_py_test(
-    name = "image_preprocessing_test",
-    size = "medium",
-    srcs = ["layers/preprocessing/image_preprocessing_test.py"],
-    python_version = "PY3",
-    shard_count = 4,
-    deps = [
-        ":keras",
-        "//tensorflow/python:client_testlib",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
 cuda_py_test(
     name = "convolutional_transpose_test",
     size = "medium",
@@ -902,36 +847,6 @@ cuda_py_test(
     ],
 )
 
-tf_py_test(
-    name = "preprocessing_normalization_test",
-    size = "small",
-    srcs = ["layers/preprocessing/normalization_test.py"],
-    main = "normalization_test.py",
-    python_version = "PY3",
-    deps = [
-        ":keras",
-        ":preprocessing_test_utils",
-        "//tensorflow/python:client_testlib",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "preprocessing_text_vectorization_test",
-    size = "medium",
-    srcs = ["layers/preprocessing/text_vectorization_test.py"],
-    main = "text_vectorization_test.py",
-    python_version = "PY3",
-    deps = [
-        ":keras",
-        ":preprocessing_test_utils",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/keras/utils:generic_utils",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
 tf_py_test(
     name = "simplernn_test",
     size = "medium",

tensorflow/python/keras/layers/preprocessing/BUILD

@@ -0,0 +1,189 @@
+# Description:
+#   Contains the Keras preprocess layers (internal TensorFlow version).
+
+load("//tensorflow:tensorflow.bzl", "tf_py_test")
+load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+
+package(
+    default_visibility = ["//visibility:public"],
+    licenses = ["notice"],  # Apache 2.0
+)
+
+exports_files(["LICENSE"])
+
+py_library(
+    name = "preprocessing",
+    srcs = [
+        "__init__.py",
+    ],
+    data = [":vocabulary_testdata"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":categorical",
+        ":image_preprocessing",
+        ":normalization",
+        ":preprocessing_test_utils",
+        ":text_vectorization",
+    ],
+)
+
+py_library(
+    name = "categorical",
+    srcs = [
+        "categorical.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:lookup_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:tensor_spec",
+        "//tensorflow/python/keras:base_layer",
+    ],
+)
+
+py_library(
+    name = "image_preprocessing",
+    srcs = [
+        "image_preprocessing.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:image_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:stateful_random_ops",
+        "//tensorflow/python:stateless_random_ops",
+        "//tensorflow/python:tensor_shape",
+        "//tensorflow/python/keras:backend",
+        "//tensorflow/python/keras:base_layer",
+        "//tensorflow/python/keras/utils:tf_utils",
+    ],
+)
+
+py_library(
+    name = "normalization",
+    srcs = [
+        "normalization.py",
+        "normalization_v1.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:util",
+        "//tensorflow/python/keras:backend",
+        "//tensorflow/python/keras:base_preprocessing_layer",
+    ],
+)
+
+py_library(
+    name = "text_vectorization",
+    srcs = [
+        "text_vectorization.py",
+        "text_vectorization_v1.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:lookup_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:tensor_shape",
+        "//tensorflow/python:tensor_spec",
+        "//tensorflow/python:util",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/keras:backend",
+        "//tensorflow/python/keras:base_preprocessing_layer",
+        "//tensorflow/python/ops/ragged",
+    ],
+)
+
+py_library(
+    name = "preprocessing_test_utils",
+    srcs = ["preprocessing_test_utils.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:client_testlib",
+    ],
+)
+
+filegroup(
+    name = "vocabulary_testdata",
+    srcs = [
+        "testdata/wire_vocabulary.txt",
+    ],
+)
+
+cuda_py_test(
+    name = "categorical_test",
+    size = "medium",
+    srcs = ["categorical_test.py"],
+    data = [":vocabulary_testdata"],
+    python_version = "PY3",
+    shard_count = 4,
+    tags = [
+        "no_oss",
+    ],
+    deps = [
+        ":categorical",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+cuda_py_test(
+    name = "image_preprocessing_test",
+    size = "medium",
+    srcs = ["image_preprocessing_test.py"],
+    python_version = "PY3",
+    shard_count = 4,
+    deps = [
+        ":image_preprocessing",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "preprocessing_normalization_test",
+    size = "small",
+    srcs = ["normalization_test.py"],
+    main = "normalization_test.py",
+    python_version = "PY3",
+    deps = [
+        ":normalization",
+        ":preprocessing_test_utils",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "preprocessing_text_vectorization_test",
+    size = "medium",
+    srcs = ["text_vectorization_test.py"],
+    main = "text_vectorization_test.py",
+    python_version = "PY3",
+    deps = [
+        ":preprocessing_test_utils",
+        ":text_vectorization",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/keras",
+        "//tensorflow/python/keras/utils:generic_utils",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)

tensorflow/tools/pip_package/BUILD

@@ -83,7 +83,7 @@ COMMON_PIP_DEPS = [
     "//tensorflow/python/distribute:multi_process_runner",
     "//tensorflow/python/eager:eager_pip",
     "//tensorflow/python/keras:model_subclassing_test_util",
-    "//tensorflow/python/keras:preprocessing_test_utils",
+    "//tensorflow/python/keras/layers/preprocessing:preprocessing_test_utils",
     "//tensorflow/python/keras/distribute:distribute_strategy_test_lib",
     "//tensorflow/python/keras/distribute:multi_worker_testing_utils",
     "//tensorflow/python/keras/mixed_precision/experimental:test_util",