Add a "keras friends" target which contains Keras and its related pac…

…kages. PiperOrigin-RevId: 407429953
foxik · Nov 3, 2021 · 42bf997 · 42bf997
1 parent 593c06f
commit 42bf997
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 34 deletions.
diff --git a/keras/BUILD b/keras/BUILD
@@ -5,13 +5,21 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        ":__subpackages__",
+        ":friends",
         "//third_party/py/tensorflow:__subpackages__",
         "//third_party/tensorflow_estimator:__subpackages__",
     ],
     licenses = ["notice"],
 )
 
+# Keras code that doesn't live in core Keras directory, but still
+# need to directly access the keras code.
+# We shouldn't add any client side package to this list.
+package_group(
+    name = "friends",
+    packages = ["//keras/..."],
+)
+
 exports_files(["LICENSE"])
 
 config_setting(

diff --git a/keras/api/BUILD b/keras/api/BUILD
@@ -6,7 +6,7 @@ load("//keras/api:api_init_files.bzl", "KERAS_API_INIT_FILES", "KERAS_API_INIT_F
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/py/tensorflow:__subpackages__",
     ],
     licenses = ["notice"],  # Apache 2.0 License

diff --git a/keras/applications/BUILD b/keras/applications/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 package(
     default_visibility = [
         # Remove this deps to integration test.
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/benchmarks/BUILD b/keras/benchmarks/BUILD
@@ -37,7 +37,7 @@ py_library(
     name = "profiler_lib",
     srcs_version = "PY3",
     visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//learning/brain/contrib/keras_benchmark:__subpackages__",
     ],
 )

diff --git a/keras/benchmarks/layer_benchmarks/BUILD b/keras/benchmarks/layer_benchmarks/BUILD
@@ -35,14 +35,14 @@ py_library(
     name = "run_xprof",
     srcs = ["run_xprof.py"],
     srcs_version = "PY3",
-    visibility = ["//keras:__subpackages__"],
+    visibility = ["//keras:friends"],
 )
 
 py_library(
     name = "layer_benchmarks_test_base",
     srcs = ["layer_benchmarks_test_base.py"],
     srcs_version = "PY3",
-    visibility = ["//keras:__subpackages__"],
+    visibility = ["//keras:friends"],
     deps = [
         ":run_xprof",
         "//:expect_tensorflow_installed",

diff --git a/keras/datasets/BUILD b/keras/datasets/BUILD
@@ -3,7 +3,7 @@
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/distribute/BUILD b/keras/distribute/BUILD
@@ -9,7 +9,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")  # buildifier: disable=same-or
 package(
     # TODO(scottzhu): Remove this deps when distribute test are converted to integration test.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/distribute:__pkg__",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],

diff --git a/keras/engine/BUILD b/keras/engine/BUILD
@@ -10,7 +10,7 @@ load("@org_keras//keras:keras.bzl", "cuda_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python:__pkg__",
         "//third_party/tensorflow/python/feature_column:__pkg__",
     ],

diff --git a/keras/estimator/BUILD b/keras/estimator/BUILD
@@ -3,7 +3,7 @@
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/feature_column/BUILD b/keras/feature_column/BUILD
@@ -2,7 +2,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/feature_column:__subpackages__",
     ],
     licenses = ["notice"],

diff --git a/keras/initializers/BUILD b/keras/initializers/BUILD
@@ -5,8 +5,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
-        "//learning/brain/experimental/dtensor/python/keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/integration_test/BUILD b/keras/integration_test/BUILD
@@ -8,7 +8,7 @@ load("@org_keras//keras:keras.bzl", "distribute_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/layers/BUILD b/keras/layers/BUILD
@@ -7,7 +7,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/distribute:__pkg__",
         "//third_party/tensorflow/python/feature_column:__pkg__",
         "//third_party/tensorflow/python/training/tracking:__pkg__",

diff --git a/keras/layers/core/BUILD b/keras/layers/core/BUILD
@@ -4,7 +4,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/py/tensorflow_gnn:__subpackages__",
         "//third_party/tensorflow/python/distribute:__pkg__",
         "//third_party/tensorflow/python/feature_column:__pkg__",

diff --git a/keras/layers/legacy_rnn/BUILD b/keras/layers/legacy_rnn/BUILD
@@ -3,7 +3,7 @@
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow:__subpackages__",
     ],
     licenses = ["notice"],

diff --git a/keras/layers/normalization/BUILD b/keras/layers/normalization/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "cuda_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/distribute:__pkg__",
         "//third_party/tensorflow/python/feature_column:__pkg__",
         "//third_party/tensorflow/python/training/tracking:__pkg__",

diff --git a/keras/layers/preprocessing/BUILD b/keras/layers/preprocessing/BUILD
@@ -9,7 +9,7 @@ load("@org_keras//keras:keras.bzl", "distribute_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/layers/preprocessing/benchmarks/BUILD b/keras/layers/preprocessing/benchmarks/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/legacy_tf_layers/BUILD b/keras/legacy_tf_layers/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "cuda_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow:__subpackages__",
     ],
     licenses = ["notice"],

diff --git a/keras/mixed_precision/BUILD b/keras/mixed_precision/BUILD
@@ -23,7 +23,7 @@ package(
     default_visibility = [
         # TODO(scottzhu): Remove these two deps and convert the test to integration test.
         "//third_party/tensorflow/python/distribute:__pkg__",  # For collective_all_reduce_strategy_test
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/mixed_precision/testdata/BUILD b/keras/mixed_precision/testdata/BUILD
@@ -3,7 +3,7 @@
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/optimizer_experimental/BUILD b/keras/optimizer_experimental/BUILD
@@ -4,7 +4,7 @@ load("@org_keras//keras:keras.bzl", "distribute_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/optimizer_v2/BUILD b/keras/optimizer_v2/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "cuda_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python:__pkg__",
         "//third_party/tensorflow/python/distribute:__pkg__",
         "//third_party/tensorflow/python/training/tracking:__pkg__",

diff --git a/keras/premade/BUILD b/keras/premade/BUILD
@@ -4,7 +4,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/preprocessing/BUILD b/keras/preprocessing/BUILD
@@ -5,7 +5,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD
@@ -5,7 +5,7 @@ load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],  # Apache 2.0
 )

diff --git a/keras/saving/BUILD b/keras/saving/BUILD
@@ -6,7 +6,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/distribute:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/saving/utils_v1/BUILD b/keras/saving/utils_v1/BUILD
@@ -20,7 +20,7 @@
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
     ],
     licenses = ["notice"],
 )

diff --git a/keras/tests/BUILD b/keras/tests/BUILD
@@ -10,7 +10,7 @@ load("@org_keras//keras:keras.bzl", "tpu_py_test")
 
 package(
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],
     licenses = ["notice"],

diff --git a/keras/type/BUILD b/keras/type/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//keras:__subpackages__"],
+    default_visibility = ["//keras:friends"],
     licenses = ["notice"],
 )
 

diff --git a/keras/utils/BUILD b/keras/utils/BUILD
@@ -7,7 +7,7 @@ load("@org_keras//keras:keras.bzl", "tf_py_test")
 package(
     # TODO(scottzhu): Remove non-keras deps from TF.
     default_visibility = [
-        "//keras:__subpackages__",
+        "//keras:friends",
         "//third_party/tensorflow/python/feature_column:__pkg__",
         "//third_party/tensorflow/tools/pip_package:__pkg__",
     ],

diff --git a/keras/wrappers/BUILD b/keras/wrappers/BUILD
@@ -4,7 +4,7 @@
 load("@org_keras//keras:keras.bzl", "tf_py_test")
 
 package(
-    default_visibility = ["//keras:__subpackages__"],
+    default_visibility = ["//keras:friends"],
     licenses = ["notice"],
 )