Skip to content

Commit 2068ab3

Browse files
teijeongtensorflower-gardener
authored andcommitted
Fix dependencies for __init__.py files related to python module imports and quantization/keras/collaborative_optimizations
PiperOrigin-RevId: 370621369
1 parent db8f756 commit 2068ab3

File tree

9 files changed

+61
-28
lines changed

9 files changed

+61
-28
lines changed

tensorflow_model_optimization/BUILD

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,22 @@
55
# used to optimize machine learning models for deployment and execution.
66
#
77
# https://github.com/tensorflow/model-optimization
8+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
89

910
package(default_visibility = ["//visibility:public"])
1011

1112
licenses(["notice"])
1213

1314
exports_files(["LICENSE"])
1415

15-
py_library(
16+
py_strict_library(
1617
name = "tensorflow_model_optimization",
1718
srcs = ["__init__.py"],
1819
srcs_version = "PY3",
1920
deps = [
20-
"//tensorflow_model_optimization/python",
21+
"//tensorflow_model_optimization/python", # buildcleaner: keep
22+
"//tensorflow_model_optimization/python/core:version",
2123
"//tensorflow_model_optimization/python/core/api",
22-
"//tensorflow_model_optimization/python/core/clustering",
23-
"//tensorflow_model_optimization/python/core/keras:compat",
24-
"//tensorflow_model_optimization/python/core/quantization",
25-
"//tensorflow_model_optimization/python/core/sparsity",
2624
],
2725
)
2826

tensorflow_model_optimization/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ def _ensure_tf_install(): # pylint: disable=g-statement-before-imports
8282
# To ensure users only access the expected public API, the API structure is
8383
# created in the `api` directory. Import all api modules.
8484
from tensorflow_model_optimization.python.core import version
85-
# pylint: disable=wildcard-import
86-
from tensorflow_model_optimization.python.core.api import *
87-
# pylint: enable=wildcard-import
85+
86+
from tensorflow_model_optimization.python.core.api import clustering
87+
from tensorflow_model_optimization.python.core.api import experimental
88+
from tensorflow_model_optimization.python.core.api import quantization
89+
from tensorflow_model_optimization.python.core.api import sparsity
8890

8991

9092
# Use sparsity module to fetch the path for the `api` directory.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
licenses(["notice"]) # Apache 2.0
46

5-
py_library(
7+
py_strict_library(
68
name = "python",
79
srcs = ["__init__.py"],
810
srcs_version = "PY3",
911
deps = [
10-
"//tensorflow_model_optimization/python/core",
12+
"//tensorflow_model_optimization/python/core", # buildcleaner: keep
1113
],
1214
)

tensorflow_model_optimization/python/core/BUILD

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
licenses(["notice"]) # Apache 2.0
46

5-
py_library(
7+
py_strict_library(
68
name = "core",
79
srcs = ["__init__.py"],
810
srcs_version = "PY3",
911
deps = [
10-
":version",
11-
"//tensorflow_model_optimization/python/core/clustering",
12-
"//tensorflow_model_optimization/python/core/internal",
13-
"//tensorflow_model_optimization/python/core/keras",
14-
"//tensorflow_model_optimization/python/core/quantization",
15-
"//tensorflow_model_optimization/python/core/sparsity",
12+
"//tensorflow_model_optimization/python/core/api", # buildcleaner: keep
13+
"//tensorflow_model_optimization/python/core/clustering", # buildcleaner: keep
14+
"//tensorflow_model_optimization/python/core/internal", # buildcleaner: keep
15+
"//tensorflow_model_optimization/python/core/keras", # buildcleaner: keep
16+
"//tensorflow_model_optimization/python/core/quantization", # buildcleaner: keep
17+
"//tensorflow_model_optimization/python/core/sparsity", # buildcleaner: keep
1618
],
1719
)
1820

19-
py_library(
21+
py_strict_library(
2022
name = "version",
2123
srcs = ["version.py"],
2224
srcs_version = "PY3",

tensorflow_model_optimization/python/core/api/BUILD

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
licenses(["notice"]) # Apache 2.0
46

5-
py_library(
7+
py_strict_library(
68
name = "api",
79
srcs = [
810
"__init__.py",
@@ -23,8 +25,31 @@ py_library(
2325
],
2426
srcs_version = "PY3",
2527
deps = [
26-
"//tensorflow_model_optimization/python/core/clustering/keras",
27-
"//tensorflow_model_optimization/python/core/quantization/keras",
28-
"//tensorflow_model_optimization/python/core/sparsity/keras",
28+
"//tensorflow_model_optimization/python/core/clustering/keras:cluster",
29+
"//tensorflow_model_optimization/python/core/clustering/keras:cluster_config",
30+
"//tensorflow_model_optimization/python/core/clustering/keras:clusterable_layer",
31+
"//tensorflow_model_optimization/python/core/clustering/keras:clustering_algorithm",
32+
"//tensorflow_model_optimization/python/core/clustering/keras:clustering_callbacks",
33+
"//tensorflow_model_optimization/python/core/clustering/keras/experimental",
34+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize",
35+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize_config",
36+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize_layout_transform",
37+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize_registry",
38+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize_scheme",
39+
"//tensorflow_model_optimization/python/core/quantization/keras:quantize_wrapper",
40+
"//tensorflow_model_optimization/python/core/quantization/keras:quantizers",
41+
"//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/cluster_preserve:cluster_utils",
42+
"//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/cluster_preserve:default_8bit_cluster_preserve_quantize_scheme",
43+
"//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/prune_preserve:default_8bit_prune_preserve_quantize_scheme",
44+
"//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_quantize_layout_transform",
45+
"//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_quantize_registry",
46+
"//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_quantize_scheme",
47+
"//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_transforms",
48+
"//tensorflow_model_optimization/python/core/quantization/keras/graph_transformations:model_transformer",
49+
"//tensorflow_model_optimization/python/core/quantization/keras/graph_transformations:transforms",
50+
"//tensorflow_model_optimization/python/core/sparsity/keras:prunable_layer",
51+
"//tensorflow_model_optimization/python/core/sparsity/keras:prune",
52+
"//tensorflow_model_optimization/python/core/sparsity/keras:pruning_callbacks",
53+
"//tensorflow_model_optimization/python/core/sparsity/keras:pruning_schedule",
2954
],
3055
)

tensorflow_model_optimization/python/core/keras/BUILD

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# buildifier: disable=same-origin-load
12
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
23

4+
# buildifier: disable=same-origin-load
5+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_test")
6+
37
package(default_visibility = [
48
"//tensorflow_model_optimization:__subpackages__",
59
])
@@ -55,13 +59,14 @@ py_strict_library(
5559
],
5660
)
5761

58-
py_test(
62+
py_strict_test(
5963
name = "metrics_test",
6064
srcs = ["metrics_test.py"],
6165
python_version = "PY3",
6266
deps = [
6367
":metrics",
6468
# mock dep1,
6569
# tensorflow dep1,
70+
# python/eager:monitoring tensorflow dep2,
6671
],
6772
)

tensorflow_model_optimization/python/core/keras/testing/BUILD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
2+
13
package(default_visibility = [
24
"//tensorflow_model_optimization:__subpackages__",
35
])
46

57
licenses(["notice"]) # Apache 2.0
68

7-
py_library(
9+
py_strict_library(
810
name = "test_utils_mnist",
911
testonly = 1,
1012
srcs = ["test_utils_mnist.py"],

tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/cluster_preserve/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ py_library(
2121
"cluster_utils.py",
2222
],
2323
srcs_version = "PY3",
24-
visibility = ["//visibility:private"],
2524
deps = [
2625
# tensorflow dep1,
2726
"//tensorflow_model_optimization/python/core/clustering/keras:clustering_registry",
@@ -34,7 +33,6 @@ py_library(
3433
"cluster_preserve_quantize_registry.py",
3534
],
3635
srcs_version = "PY3",
37-
visibility = ["//visibility:private"],
3836
deps = [
3937
":cluster_utils",
4038
# tensorflow dep1,

tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/prune_preserve/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ py_library(
2121
"prune_preserve_quantize_registry.py",
2222
],
2323
srcs_version = "PY3",
24-
visibility = ["//visibility:private"],
2524
deps = [
2625
# tensorflow dep1,
2726
"//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_quantize_registry",

0 commit comments

Comments
 (0)