diff --git a/RELEASE.md b/RELEASE.md index 565e20c2..fbb64645 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -32,6 +32,14 @@ Keras pruning API: # TensorFlow Model Optimization next release TBD +# TensorFlow Model Optimization 0.8.1 + +TFMOT 0.8.1 improves compatibility with numpy v2 and dependencies. + * Fix keras importing failures at the colab. + * Add required packages to setup.py to match requirements.txt. + * Relax absl-py requirements for tensorflow_model_optimization. + * Mark compatibility with numpy v2. + # TensorFlow Model Optimization 0.8.0 TFMOT 0.8.0 forces users to use the keras v2 version. diff --git a/pip_pkg.sh b/pip_pkg.sh index faa00893..d4f769b4 100755 --- a/pip_pkg.sh +++ b/pip_pkg.sh @@ -34,7 +34,7 @@ mkdir -p "$1" DEST=$(dirname "${1}/does_not_exist") DEST=$(cd "$DEST" && pwd) -cd bazel-bin/pip_pkg.runfiles/_main +cd bazel-bin/pip_pkg.runfiles/tensorflow_model_optimization # Pass through remaining arguments (following the first argument, which # specifies the output dir) to setup.py, e.g., diff --git a/requirements.txt b/requirements.txt index 41967f8b..b7682df6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -absl-py>=1.2.0 -numpy~=1.23.0 +absl-py~=1.2 +numpy>=1.23 six~=1.14 scipy -enum34~=1.1 -mock +enum34~=1.1;python_version<"3.4" dm-tree~=0.1.1 +mock tf-keras>=2.14.1 diff --git a/tensorflow_model_optimization/BUILD b/tensorflow_model_optimization/BUILD index 8c1a2239..d001fda6 100644 --- a/tensorflow_model_optimization/BUILD +++ b/tensorflow_model_optimization/BUILD @@ -1,3 +1,6 @@ +# Placeholder: load py_library +load("@rules_license//rules:license.bzl", "license") + # Description: # # TensorFlow Optimization is a repository for the training-time @@ -7,15 +10,15 @@ # https://github.com/tensorflow/model-optimization load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_binary") -# Placeholder: load py_library -load("//tools/build_defs/license:license.bzl", "license") - package( default_applicable_licenses = [":license"], default_visibility = ["//visibility:public"], ) -license(name = "license") +license( + name = "license", + license_kinds = ["@rules_license//licenses/spdx:Apache-2.0"], +) licenses(["notice"]) @@ -24,7 +27,7 @@ exports_files(["LICENSE"]) py_library( name = "tensorflow_model_optimization", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ # distutils dep1, "//tensorflow_model_optimization/python", # buildcleaner: keep diff --git a/tensorflow_model_optimization/python/BUILD b/tensorflow_model_optimization/python/BUILD index f90d4da8..b65c779e 100644 --- a/tensorflow_model_optimization/python/BUILD +++ b/tensorflow_model_optimization/python/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "python", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core", # buildcleaner: keep ], diff --git a/tensorflow_model_optimization/python/core/BUILD b/tensorflow_model_optimization/python/core/BUILD index bff897de..1536d6f4 100644 --- a/tensorflow_model_optimization/python/core/BUILD +++ b/tensorflow_model_optimization/python/core/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "core", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/api", # buildcleaner: keep "//tensorflow_model_optimization/python/core/clustering", # buildcleaner: keep @@ -24,5 +24,5 @@ py_library( py_library( name = "version", srcs = ["version.py"], - strict_deps = True, + # strict_deps = True, ) diff --git a/tensorflow_model_optimization/python/core/api/BUILD b/tensorflow_model_optimization/python/core/api/BUILD index a140c97f..7601e52c 100644 --- a/tensorflow_model_optimization/python/core/api/BUILD +++ b/tensorflow_model_optimization/python/core/api/BUILD @@ -30,7 +30,7 @@ py_library( "sparsity/__init__.py", "sparsity/keras/__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/clustering/keras:cluster", "//tensorflow_model_optimization/python/core/clustering/keras:cluster_config", diff --git a/tensorflow_model_optimization/python/core/clustering/BUILD b/tensorflow_model_optimization/python/core/clustering/BUILD index f8956f9d..fa32471c 100644 --- a/tensorflow_model_optimization/python/core/clustering/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "clustering", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/clustering/keras", # buildcleaner: keep ], diff --git a/tensorflow_model_optimization/python/core/clustering/keras/BUILD b/tensorflow_model_optimization/python/core/clustering/keras/BUILD index 1b3ba563..5497fcf3 100644 --- a/tensorflow_model_optimization/python/core/clustering/keras/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/keras/BUILD @@ -16,7 +16,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster", # buildcleaner: keep ":clustering_callbacks", # buildcleaner: keep @@ -27,7 +27,7 @@ py_library( py_library( name = "cluster", srcs = ["cluster.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -41,14 +41,14 @@ py_library( py_library( name = "cluster_config", srcs = ["cluster_config.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], ) py_library( name = "clustering_registry", srcs = ["clustering_registry.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":clusterable_layer", @@ -61,7 +61,7 @@ py_library( py_library( name = "clusterable_layer", srcs = ["clusterable_layer.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -71,7 +71,7 @@ py_library( py_library( name = "clustering_centroids", srcs = ["clustering_centroids.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -85,7 +85,7 @@ py_library( py_library( name = "cluster_wrapper", srcs = ["cluster_wrapper.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -100,7 +100,7 @@ py_library( py_library( name = "clustering_algorithm", srcs = ["clustering_algorithm.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -112,7 +112,7 @@ py_library( py_library( name = "clustering_callbacks", srcs = ["clustering_callbacks.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -124,7 +124,7 @@ py_test( name = "cluster_test", size = "medium", srcs = ["cluster_test.py"], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ ":cluster", @@ -193,7 +193,7 @@ py_test( name = "cluster_integration_test", size = "medium", srcs = ["cluster_integration_test.py"], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ ":cluster", diff --git a/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD b/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD index 3e368470..793669e5 100644 --- a/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD @@ -14,7 +14,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster", # buildcleaner: keep ], @@ -23,7 +23,7 @@ py_library( py_library( name = "cluster", srcs = ["cluster.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ "//tensorflow_model_optimization/python/core/clustering/keras:cluster", diff --git a/tensorflow_model_optimization/python/core/internal/BUILD b/tensorflow_model_optimization/python/core/internal/BUILD index dfa20467..95f13b4e 100644 --- a/tensorflow_model_optimization/python/core/internal/BUILD +++ b/tensorflow_model_optimization/python/core/internal/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "internal", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/internal/tensor_encoding", ], diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD index 9170acd7..761e05b0 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "tensor_encoding", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/internal/tensor_encoding/core", "//tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders", diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD index 0503ff5c..0bfad37a 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "core", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":core_encoder", @@ -26,7 +26,7 @@ py_library( py_library( name = "core_encoder", srcs = ["core_encoder.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":encoding_stage", # six dep1, @@ -52,7 +52,7 @@ py_strict_test( py_library( name = "encoding_stage", srcs = ["encoding_stage.py"], - strict_deps = True, + # strict_deps = True, deps = [ # six dep1, # tensorflow dep1, @@ -77,7 +77,7 @@ py_strict_test( py_library( name = "gather_encoder", srcs = ["gather_encoder.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":core_encoder", # tensorflow dep1, @@ -105,7 +105,7 @@ py_strict_test( py_library( name = "simple_encoder", srcs = ["simple_encoder.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":core_encoder", # tensorflow dep1, diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD index 480c97e5..3f6b477c 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "encoders", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":common_encoders", @@ -23,7 +23,7 @@ py_library( py_library( name = "common_encoders", srcs = ["common_encoders.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/internal/tensor_encoding/core:core_encoder", diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD index 06b6ef75..5b00df8d 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "stages", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":stages_impl", @@ -24,7 +24,7 @@ py_library( py_library( name = "stages_impl", srcs = ["stages_impl.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # tensorflow dep1, diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/research/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/research/BUILD index 1c7b3c0d..93fd0900 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/research/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/research/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "research", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":clipping", @@ -26,7 +26,7 @@ py_library( py_library( name = "clipping", srcs = ["clipping.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/internal/tensor_encoding/core:encoding_stage", @@ -50,7 +50,7 @@ py_strict_test( py_library( name = "kashin", srcs = ["kashin.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # tensorflow dep1, @@ -76,7 +76,7 @@ py_strict_test( py_library( name = "quantization", srcs = ["quantization.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/internal/tensor_encoding/core:encoding_stage", @@ -101,7 +101,7 @@ py_strict_test( py_library( name = "misc", srcs = ["misc.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/internal/tensor_encoding/core:encoding_stage", diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD index 0ac8f762..76b4c8d0 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "testing", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":test_utils", @@ -23,7 +23,7 @@ py_library( py_library( name = "test_utils", srcs = ["test_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # absl/testing:parameterized dep1, # numpy dep1, diff --git a/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD b/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD index 878c90d4..0614d337 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "utils", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":py_utils", @@ -24,7 +24,7 @@ py_library( py_library( name = "py_utils", srcs = ["py_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # six dep1, @@ -49,7 +49,7 @@ py_strict_test( py_library( name = "tf_utils", srcs = ["tf_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # tensorflow dep1, diff --git a/tensorflow_model_optimization/python/core/keras/BUILD b/tensorflow_model_optimization/python/core/keras/BUILD index 1f4d2a01..e94f46c0 100644 --- a/tensorflow_model_optimization/python/core/keras/BUILD +++ b/tensorflow_model_optimization/python/core/keras/BUILD @@ -13,7 +13,7 @@ licenses(["notice"]) py_library( name = "keras", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":compat", ":utils", @@ -24,7 +24,7 @@ py_library( py_library( name = "test_utils", srcs = ["test_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":compat", # numpy dep1, @@ -35,7 +35,7 @@ py_library( py_library( name = "compat", srcs = ["compat.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, ], @@ -44,7 +44,7 @@ py_library( py_library( name = "utils", srcs = ["utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -56,7 +56,7 @@ py_library( py_library( name = "metrics", srcs = ["metrics.py"], - strict_deps = True, + # strict_deps = True, deps = [ # python/eager:monitoring tensorflow dep2, ], diff --git a/tensorflow_model_optimization/python/core/keras/testing/BUILD b/tensorflow_model_optimization/python/core/keras/testing/BUILD index 0094d379..84eef676 100644 --- a/tensorflow_model_optimization/python/core/keras/testing/BUILD +++ b/tensorflow_model_optimization/python/core/keras/testing/BUILD @@ -13,7 +13,7 @@ py_library( name = "test_utils_mnist", testonly = 1, srcs = ["test_utils_mnist.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # numpy dep1, diff --git a/tensorflow_model_optimization/python/core/quantization/BUILD b/tensorflow_model_optimization/python/core/quantization/BUILD index 7c2c06ce..88fa20ce 100644 --- a/tensorflow_model_optimization/python/core/quantization/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "quantization", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/quantization/keras", # buildcleaner: keep ], diff --git a/tensorflow_model_optimization/python/core/quantization/keras/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/BUILD index 823be38d..32942e49 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/BUILD @@ -16,7 +16,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":quantize", # build-cleaner: keep # APIs are not exposed, but still needed for internal imports. @@ -31,7 +31,7 @@ py_library( py_library( name = "quant_ops", srcs = ["quant_ops.py"], - strict_deps = True, + # strict_deps = True, deps = [ # absl/logging dep1, # tensorflow dep1, @@ -57,7 +57,7 @@ py_library( srcs = [ "quantizers.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quant_ops", @@ -89,7 +89,7 @@ py_library( srcs = [ "quantize_config.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantizers", @@ -104,7 +104,7 @@ py_library( srcs = [ "quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -116,7 +116,7 @@ py_library( srcs = [ "quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -128,7 +128,7 @@ py_library( srcs = [ "quantize_annotate.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":utils", @@ -158,7 +158,7 @@ py_library( srcs = [ "quantize_aware_activation.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":utils", @@ -191,7 +191,7 @@ py_library( srcs = [ "quantize_layer.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantizers", @@ -223,7 +223,7 @@ py_library( srcs = [ "quantize_wrapper.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantize_aware_activation", @@ -259,7 +259,7 @@ py_library( srcs = [ "quantize.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantize_annotate", @@ -353,7 +353,7 @@ py_library( srcs = [ "utils.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -366,7 +366,7 @@ py_library( srcs = [ "quantize_scheme.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, diff --git a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD index 7595318f..b6c6a76b 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "collab_opts", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/quantization/keras/collab_opts/cluster_preserve", # buildcleaner: keep "//tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve", # buildcleaner: keep diff --git a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/cluster_preserve/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/cluster_preserve/BUILD index 2ad88a52..de110a96 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/cluster_preserve/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/cluster_preserve/BUILD @@ -15,7 +15,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_cluster_preserve_quantize_scheme", # buildcleaner: keep ], @@ -26,7 +26,7 @@ py_library( srcs = [ "cluster_utils.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -38,7 +38,7 @@ py_library( srcs = [ "cluster_preserve_quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster_utils", # tensorflow dep1, @@ -57,7 +57,7 @@ py_test( srcs = [ "cluster_preserve_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:private"], deps = [ ":cluster_preserve_quantize_registry", @@ -76,7 +76,7 @@ py_test( srcs = [ "mnist_prune_cluster_preserve_qat_test.py", ], - strict_deps = False, + # strict_deps = False, tags = ["requires-net:external"], visibility = ["//visibility:private"], deps = [ @@ -96,7 +96,7 @@ py_library( srcs = [ "default_8bit_cluster_preserve_quantize_scheme.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster_preserve_quantize_registry", "//tensorflow_model_optimization/python/core/quantization/keras/default_8bit:default_8bit_quantize_scheme", @@ -108,7 +108,7 @@ py_test( srcs = [ "cluster_preserve_integration_test.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:private"], deps = [ ":default_8bit_cluster_preserve_quantize_scheme", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD index e6934273..690ba36e 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD @@ -15,7 +15,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_prune_preserve_quantize_scheme", # buildcleaner: keep ], @@ -26,7 +26,7 @@ py_library( srcs = [ "prune_preserve_quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -42,7 +42,7 @@ py_test( srcs = [ "prune_preserve_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:private"], deps = [ ":prune_preserve_quantize_registry", @@ -60,7 +60,7 @@ py_library( srcs = [ "default_8bit_prune_preserve_quantize_scheme.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prune_preserve_quantize_registry", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD index bffcc15a..3285e91b 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD @@ -16,7 +16,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -25,7 +25,7 @@ py_library( srcs = [ "default_8bit_quantizers.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -39,7 +39,7 @@ py_test( srcs = [ "default_8bit_quantizers_test.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":default_8bit_quantizers", # absl/testing:parameterized dep1, @@ -54,7 +54,7 @@ py_library( srcs = [ "default_8bit_quantize_configs.py", ], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/quantization/keras:quantize_config", "//tensorflow_model_optimization/python/core/quantization/keras:quantizers", @@ -66,7 +66,7 @@ py_library( srcs = [ "default_8bit_quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -84,7 +84,7 @@ py_test( srcs = [ "default_8bit_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":default_8bit_quantize_registry", # absl/testing:parameterized dep1, @@ -102,7 +102,7 @@ py_library( srcs = [ "default_8bit_transforms.py", ], - strict_deps = False, + # strict_deps = False, deps = [ # numpy dep1, # tensorflow dep1, @@ -145,7 +145,7 @@ py_library( srcs = [ "default_8bit_quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_transforms", # tensorflow dep1, @@ -160,7 +160,7 @@ py_test( name = "quantize_numerical_test", size = "large", srcs = ["quantize_numerical_test.py"], - strict_deps = False, + # strict_deps = False, deps = [ # absl/testing:parameterized dep1, # google/protobuf:use_fast_cpp_protos dep1, # Automatically added @@ -177,7 +177,7 @@ py_library( srcs = [ "default_8bit_quantize_scheme.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_quantize_layout_transform", ":default_8bit_quantize_registry", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/default_8bit_transforms_test.py b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/default_8bit_transforms_test.py index 2c5ed815..f77e3853 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/default_8bit_transforms_test.py +++ b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/default_8bit_transforms_test.py @@ -304,9 +304,9 @@ def testDenseBatchNormActivationQuantize(self, layer_type, 'bias_constraint': keras.constraints.unit_norm(), }, ), - ('activation_relu', {'activation': 'relu'}), # TODO(pulkitb): Temporarily disabling due to numerical errors resulting # from caching of activation logits in TF code. + # ('activation_relu', {'activation': 'relu'}), # ('activation_softmax', {'activation': 'softmax'}), ) def testSeparableConv1DQuantize_(self, kwargs): diff --git a/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD index 62edbbd1..9042ce8a 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD @@ -14,7 +14,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":quantization", # buildcleaner: keep ], @@ -23,7 +23,7 @@ py_library( py_library( name = "quantization", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/quantization/keras", # buildcleaner: keep ], diff --git a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD index e436b3f3..72dc8eca 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD @@ -14,7 +14,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -23,7 +23,7 @@ py_library( srcs = [ "default_n_bit_quantizers.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -36,7 +36,7 @@ py_test( srcs = [ "default_n_bit_quantizers_test.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":default_n_bit_quantizers", # absl/testing:parameterized dep1, @@ -51,7 +51,7 @@ py_library( srcs = [ "default_n_bit_quantize_configs.py", ], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/quantization/keras:quantize_config", "//tensorflow_model_optimization/python/core/quantization/keras:quantizers", @@ -63,7 +63,7 @@ py_library( srcs = [ "default_n_bit_quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -80,7 +80,7 @@ py_test( srcs = [ "default_n_bit_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":default_n_bit_quantize_registry", # absl/testing:parameterized dep1, @@ -97,7 +97,7 @@ py_library( srcs = [ "default_n_bit_transforms.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ # numpy dep1, @@ -117,7 +117,7 @@ py_library( srcs = [ "default_n_bit_quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_n_bit_transforms", # tensorflow dep1, @@ -155,7 +155,7 @@ py_library( srcs = [ "default_n_bit_quantize_scheme.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":default_n_bit_quantize_layout_transform", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/default_n_bit_transforms_test.py b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/default_n_bit_transforms_test.py index 2f710751..c6806121 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/default_n_bit_transforms_test.py +++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/default_n_bit_transforms_test.py @@ -305,9 +305,9 @@ def testDenseBatchNormActivationQuantize(self, layer_type, 'bias_constraint': keras.constraints.unit_norm(), }, ), - ('activation_relu', {'activation': 'relu'}), # TODO(pulkitb): Temporarily disabling due to numerical errors resulting # from caching of activation logits in TF code. + # ('activation_relu', {'activation': 'relu'}), # ('activation_softmax', {'activation': 'softmax'}), ) def testSeparableConv1DQuantize_(self, kwargs): diff --git a/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD index d33a9099..09a796a3 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD @@ -15,7 +15,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -24,7 +24,7 @@ py_library( srcs = [ "transforms.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -49,7 +49,7 @@ py_library( srcs = [ "model_transformer.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":transforms", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD index 5a3d0b95..d67470f2 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD @@ -14,14 +14,14 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) py_library( name = "conv_batchnorm_test_utils", srcs = ["conv_batchnorm_test_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -31,7 +31,7 @@ py_library( py_library( name = "dense_batchnorm_test_utils", srcs = ["dense_batchnorm_test_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", diff --git a/tensorflow_model_optimization/python/core/quantization/keras/quantize_models_test.py b/tensorflow_model_optimization/python/core/quantization/keras/quantize_models_test.py index 55d0c1f2..149ebc8b 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/quantize_models_test.py +++ b/tensorflow_model_optimization/python/core/quantization/keras/quantize_models_test.py @@ -44,15 +44,18 @@ class QuantizeModelsTest(tf.test.TestCase, parameterized.TestCase): 'MobileNetV2', # 'NASNetLarge', # 'NASNetMobile', - 'ResNet101', # 'ResNet101V2', - 'ResNet152', # 'ResNet152V2', - 'ResNet50', # 'ResNet50V2', # 'VGG16', # 'VGG19', # 'Xception' + + # TODO(tfmot): RuntimeError: failed to create XNNPACK runtimeNode number + # XX (TfLiteXNNPackDelegate) failed to prepare. + # 'ResNet101', + # 'ResNet152', + # 'ResNet50', ] _MODEL_INPUT_SHAPES = { diff --git a/tensorflow_model_optimization/python/core/sparsity/BUILD b/tensorflow_model_optimization/python/core/sparsity/BUILD index f3c8d8a8..584b45b6 100644 --- a/tensorflow_model_optimization/python/core/sparsity/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "sparsity", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ "//tensorflow_model_optimization/python/core/sparsity/keras", # buildcleaner: keep ], diff --git a/tensorflow_model_optimization/python/core/sparsity/keras/BUILD b/tensorflow_model_optimization/python/core/sparsity/keras/BUILD index 6879bedc..0baa55bc 100644 --- a/tensorflow_model_optimization/python/core/sparsity/keras/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/keras/BUILD @@ -16,7 +16,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":prunable_layer", # buildcleaner: keep ":prune", # buildcleaner: keep @@ -29,7 +29,7 @@ py_library( py_library( name = "prune", srcs = ["prune.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_schedule", @@ -43,7 +43,7 @@ py_library( py_library( name = "prunable_layer", srcs = ["prunable_layer.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -53,7 +53,7 @@ py_library( py_library( name = "prune_registry", srcs = ["prune_registry.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prunable_layer", @@ -65,7 +65,7 @@ py_library( py_library( name = "pruning_policy", srcs = ["pruning_policy.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -78,7 +78,7 @@ py_library( py_library( name = "pruning_schedule", srcs = ["pruning_schedule.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -104,7 +104,7 @@ py_strict_test( py_library( name = "pruning_wrapper", srcs = ["pruning_wrapper.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prunable_layer", @@ -123,7 +123,7 @@ py_library( py_library( name = "pruning_callbacks", srcs = ["pruning_callbacks.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -154,7 +154,7 @@ py_strict_test( py_library( name = "pruning_impl", srcs = ["pruning_impl.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_utils", @@ -166,7 +166,7 @@ py_library( py_library( name = "pruning_utils", srcs = ["pruning_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # numpy dep1, @@ -177,7 +177,7 @@ py_library( py_library( name = "estimator_utils", srcs = ["estimator_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -191,7 +191,7 @@ py_library( name = "test_utils", testonly = 1, srcs = ["test_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prune", @@ -328,7 +328,7 @@ py_test( name = "pruning_policy_test", size = "medium", srcs = ["pruning_policy_test.py"], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ ":prune", diff --git a/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD b/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD index 0777b376..22d3d329 100644 --- a/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) py_library( name = "sparsity_tooling", srcs = ["sparsity_tooling.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -30,7 +30,7 @@ py_test( name = "sparsity_tooling_test", size = "medium", srcs = ["sparsity_tooling_test.py"], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ ":sparsity_tooling", @@ -45,7 +45,7 @@ py_test( py_binary( name = "evaluate_pruning", srcs = ["evaluate_pruning.py"], - strict_deps = False, + # strict_deps = False, deps = [ ":sparsity_tooling", # google/protobuf:use_fast_cpp_protos dep1, # Automatically added @@ -58,7 +58,7 @@ py_binary( py_library( name = "check_sparsity_m_by_n", srcs = ["check_sparsity_m_by_n.py"], - strict_deps = True, + # strict_deps = True, deps = [ # absl:app dep1, # absl/flags dep1, diff --git a/tensorflow_model_optimization/python/core/version.py b/tensorflow_model_optimization/python/core/version.py index 1b00ef21..57b5dc42 100644 --- a/tensorflow_model_optimization/python/core/version.py +++ b/tensorflow_model_optimization/python/core/version.py @@ -17,7 +17,7 @@ # We follow Semantic Versioning (https://semver.org/) _MAJOR_VERSION = '0' _MINOR_VERSION = '8' -_PATCH_VERSION = '0' +_PATCH_VERSION = '1' # When building releases, we can update this value on the release branch to # reflect the current release candidate ('rc0', 'rc1') or, finally, the official diff --git a/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD b/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD index 65cce5fb..3687979a 100644 --- a/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD +++ b/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD @@ -18,7 +18,7 @@ py_binary( srcs = [ "imdb_lstm.py", ], - strict_deps = False, + # strict_deps = False, deps = [ # google/protobuf:use_fast_cpp_protos dep1, # Automatically added # numpy dep1, @@ -33,7 +33,7 @@ py_binary( srcs = [ "imdb_rnn.py", ], - strict_deps = False, + # strict_deps = False, deps = [ # google/protobuf:use_fast_cpp_protos dep1, # Automatically added # numpy dep1, @@ -48,7 +48,7 @@ py_binary( srcs = [ "imdb_gru.py", ], - strict_deps = False, + # strict_deps = False, deps = [ # google/protobuf:use_fast_cpp_protos dep1, # Automatically added # numpy dep1, @@ -63,7 +63,7 @@ py_library( srcs = [ "imdb_utils.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/clustering/keras:cluster", @@ -77,7 +77,7 @@ py_binary( srcs = [ "imdb_multiple_cells.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":imdb_utils", # google/protobuf:use_fast_cpp_protos dep1, # Automatically added