Change py_binary targets to py_strict_binary

teijeong · tensorflower-gardener · commit c59c33bf9923 · 2021-04-27T19:20:39.000-07:00
PiperOrigin-RevId: 370811583
diff --git a/tensorflow_model_optimization/BUILD b/tensorflow_model_optimization/BUILD
@@ -5,7 +5,7 @@
 #  used to optimize machine learning models for deployment and execution.
 #
 #  https://github.com/tensorflow/model-optimization
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary", "py_strict_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -24,11 +24,13 @@ py_strict_library(
     ],
 )
 
-py_binary(
+py_strict_binary(
     name = "build_docs",
     srcs = ["build_docs.py"],
     python_version = "PY3",
     deps = [
+        # absl:app dep1,
+        # absl/flags dep1,
         # tensorflow_docs/api_generator:generate_lib dep1,
         "//third_party/tensorflow_model_optimization",
     ],
diff --git a/tensorflow_model_optimization/python/examples/cluster_preserve_qat/keras/BUILD b/tensorflow_model_optimization/python/examples/cluster_preserve_qat/keras/BUILD
@@ -1,6 +1,8 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 licenses(["notice"])
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
@@ -10,7 +12,10 @@ py_binary(
         # absl:app dep1,
         # numpy dep1,
         # tensorflow dep1,
+        "//tensorflow_model_optimization/python/core/clustering/keras:cluster",
+        "//tensorflow_model_optimization/python/core/clustering/keras:cluster_config",
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize",
+        "//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/cluster_preserve:cluster_utils",
         "//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/cluster_preserve:default_8bit_cluster_preserve_quantize_scheme",
     ],
 )
diff --git a/tensorflow_model_optimization/python/examples/clustering/keras/mnist/BUILD b/tensorflow_model_optimization/python/examples/clustering/keras/mnist/BUILD
@@ -1,3 +1,5 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -9,7 +11,7 @@ filegroup(
     srcs = glob(["**"]),
 )
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
@@ -19,8 +21,6 @@ py_binary(
         # absl:app dep1,
         # absl/flags dep1,
         # tensorflow dep1,
-        # python/keras tensorflow dep2,
-        # python/keras/optimizer_v2 tensorflow dep2,
         "//tensorflow_model_optimization/python/core/clustering/keras:cluster",
         "//tensorflow_model_optimization/python/core/clustering/keras:cluster_config",
         "//tensorflow_model_optimization/python/core/clustering/keras:clustering_callbacks",
diff --git a/tensorflow_model_optimization/python/examples/quantization/keras/BUILD b/tensorflow_model_optimization/python/examples/quantization/keras/BUILD
@@ -1,20 +1,20 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 licenses(["notice"])  # Apache 2.0
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
     ],
     python_version = "PY3",
     deps = [
-        # numpy dep1,
         # tensorflow dep1,
-        # python/keras tensorflow dep2,
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize",
     ],
 )
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn_cont_quant",
     srcs = [
         "mnist_cnn_cont_quant.py",
@@ -23,7 +23,6 @@ py_binary(
     deps = [
         # numpy dep1,
         # tensorflow dep1,
-        # python/keras tensorflow dep2,
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize",
     ],
 )
diff --git a/tensorflow_model_optimization/python/examples/quantization_with_sparsity/keras/BUILD b/tensorflow_model_optimization/python/examples/quantization_with_sparsity/keras/BUILD
@@ -1,6 +1,8 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 licenses(["notice"])
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
@@ -12,6 +14,8 @@ py_binary(
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize",
         "//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/prune_preserve:default_8bit_prune_preserve_quantize_scheme",
-        "//tensorflow_model_optimization/python/core/sparsity/keras",
+        "//tensorflow_model_optimization/python/core/sparsity/keras:prune",
+        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_callbacks",
+        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_schedule",
     ],
 )
diff --git a/tensorflow_model_optimization/python/examples/sparsity/keras/imdb/BUILD b/tensorflow_model_optimization/python/examples/sparsity/keras/imdb/BUILD
@@ -1,3 +1,5 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -9,7 +11,7 @@ filegroup(
     srcs = glob(["**"]),
 )
 
-py_binary(
+py_strict_binary(
     name = "imdb_lstm",
     srcs = [
         "imdb_lstm.py",
diff --git a/tensorflow_model_optimization/python/examples/sparsity/keras/imdb/imdb_lstm.py b/tensorflow_model_optimization/python/examples/sparsity/keras/imdb/imdb_lstm.py
@@ -18,18 +18,17 @@
 compared to simpler, much faster methods such as TF-IDF+LogReg.
 """
 
-from __future__ import print_function
-# import g3
 import numpy as np
+import tensorflow as tf
 
-import tensorflow.keras as keras
-import tensorflow.keras.backend as K
-import tensorflow.keras.preprocessing.sequence as sequence
 from tensorflow_model_optimization.python.core.sparsity.keras import prune
 from tensorflow_model_optimization.python.core.sparsity.keras import pruning_callbacks
 from tensorflow_model_optimization.python.core.sparsity.keras import pruning_schedule
 from tensorflow_model_optimization.python.core.sparsity.keras import pruning_wrapper
 
+keras = tf.keras
+K = tf.keras.backend
+
 
 def print_model_sparsity(pruned_model):
   """Prints sparsity for the pruned layers in the model.
@@ -75,8 +74,8 @@ def _get_sparsity(weights):
 print(len(x_test), "test sequences")
 
 print("Pad sequences (samples x time)")
-x_train = sequence.pad_sequences(x_train, maxlen=maxlen)
-x_test = sequence.pad_sequences(x_test, maxlen=maxlen)
+x_train = keras.sequence.pad_sequences(x_train, maxlen=maxlen)
+x_test = keras.sequence.pad_sequences(x_test, maxlen=maxlen)
 print("x_train shape:", x_train.shape)
 print("x_test shape:", x_test.shape)
 
diff --git a/tensorflow_model_optimization/python/examples/sparsity/keras/mnist/BUILD b/tensorflow_model_optimization/python/examples/sparsity/keras/mnist/BUILD
@@ -1,3 +1,5 @@
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -9,7 +11,7 @@ filegroup(
     srcs = glob(["**"]),
 )
 
-py_binary(
+py_strict_binary(
     name = "mnist_estimator",
     srcs = [
         "dataset.py",
@@ -23,12 +25,14 @@ py_binary(
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/sparsity/keras:estimator_utils",
         "//tensorflow_model_optimization/python/core/sparsity/keras:prune",
-        "//third_party/tensorflow_models/official/r1/utils/logs",
+        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_schedule",
+        "//third_party/tensorflow_models/official/common:distribute_utils",
+        "//third_party/tensorflow_models/official/r1/utils/logs:hooks_helper",
         "//third_party/tensorflow_models/official/utils",
     ],
 )
 
-py_binary(
+py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
@@ -41,11 +45,10 @@ py_binary(
         "//tensorflow_model_optimization/python/core/sparsity/keras:prune",
         "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_callbacks",
         "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_schedule",
-        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_wrapper",
     ],
 )
 
-py_binary(
+py_strict_binary(
     name = "mnist_e2e",
     srcs = [
         "mnist_e2e.py",

-Original file line number
+Diff line change
@@ @@ -1,6 +1,8 @@ @@
 +load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")
++
 licenses(["notice"])
 -py_binary(
 +py_strict_binary(
     name = "mnist_cnn",
     srcs = [
         "mnist_cnn.py",
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize",
         "//tensorflow_model_optimization/python/core/quantization/keras/collaborative_optimizations/prune_preserve:default_8bit_prune_preserve_quantize_scheme",
 -        "//tensorflow_model_optimization/python/core/sparsity/keras",
 +        "//tensorflow_model_optimization/python/core/sparsity/keras:prune",
 +        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_callbacks",
 +        "//tensorflow_model_optimization/python/core/sparsity/keras:pruning_schedule",
     ],
+)
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary")`
	`2`	`+`
`1`	`3`	`package(`
`2`	`4`	`default_visibility = ["//visibility:public"],`
`3`	`5`	`)`
`@@ -9,7 +11,7 @@ filegroup(`
`9`	`11`	`srcs = glob(["**"]),`
`10`	`12`	`)`
`11`	`13`
`12`		`-py_binary(`
	`14`	`+py_strict_binary(`
`13`	`15`	`name = "imdb_lstm",`
`14`	`16`	`srcs = [`
`15`	`17`	`"imdb_lstm.py",`