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 1aca10c9..8a5a1335 100644 --- a/tensorflow_model_optimization/python/BUILD +++ b/tensorflow_model_optimization/python/BUILD @@ -7,7 +7,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 3d15a666..d5319b8c 100644 --- a/tensorflow_model_optimization/python/core/BUILD +++ b/tensorflow_model_optimization/python/core/BUILD @@ -7,7 +7,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 @@ -21,5 +21,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 d1505853..2b0567ae 100644 --- a/tensorflow_model_optimization/python/core/api/BUILD +++ b/tensorflow_model_optimization/python/core/api/BUILD @@ -27,7 +27,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 894c0606..8b454b56 100644 --- a/tensorflow_model_optimization/python/core/clustering/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/BUILD @@ -7,7 +7,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 e5537a18..7e950cb0 100644 --- a/tensorflow_model_optimization/python/core/clustering/keras/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/keras/BUILD @@ -13,7 +13,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster", # buildcleaner: keep ":clustering_callbacks", # buildcleaner: keep @@ -24,7 +24,7 @@ py_library( py_library( name = "cluster", srcs = ["cluster.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -38,14 +38,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", @@ -58,7 +58,7 @@ py_library( py_library( name = "clusterable_layer", srcs = ["clusterable_layer.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -68,7 +68,7 @@ py_library( py_library( name = "clustering_centroids", srcs = ["clustering_centroids.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -82,7 +82,7 @@ py_library( py_library( name = "cluster_wrapper", srcs = ["cluster_wrapper.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":cluster_config", @@ -97,7 +97,7 @@ py_library( py_library( name = "clustering_algorithm", srcs = ["clustering_algorithm.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -109,7 +109,7 @@ py_library( py_library( name = "clustering_callbacks", srcs = ["clustering_callbacks.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -121,7 +121,7 @@ py_test( name = "cluster_test", size = "medium", srcs = ["cluster_test.py"], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ ":cluster", @@ -190,7 +190,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 78798b08..fda9c22b 100644 --- a/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD +++ b/tensorflow_model_optimization/python/core/clustering/keras/experimental/BUILD @@ -11,7 +11,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster", # buildcleaner: keep ], @@ -20,7 +20,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 caaa8ccc..06e9458e 100644 --- a/tensorflow_model_optimization/python/core/internal/BUILD +++ b/tensorflow_model_optimization/python/core/internal/BUILD @@ -7,7 +7,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 4f420a23..df106f8b 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/BUILD @@ -7,7 +7,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 36dd5110..bbffaa64 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/core/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "core", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":core_encoder", @@ -23,7 +23,7 @@ py_library( py_library( name = "core_encoder", srcs = ["core_encoder.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":encoding_stage", # six dep1, @@ -49,7 +49,7 @@ py_strict_test( py_library( name = "encoding_stage", srcs = ["encoding_stage.py"], - strict_deps = True, + # strict_deps = True, deps = [ # six dep1, # tensorflow dep1, @@ -74,7 +74,7 @@ py_strict_test( py_library( name = "gather_encoder", srcs = ["gather_encoder.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":core_encoder", # tensorflow dep1, @@ -102,7 +102,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 47cedc23..f3c9ab79 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/encoders/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "encoders", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":common_encoders", @@ -20,7 +20,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 954113fc..3421db86 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/stages/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "stages", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":stages_impl", @@ -21,7 +21,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 69530287..7bb3c984 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 @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "research", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":clipping", @@ -23,7 +23,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", @@ -47,7 +47,7 @@ py_strict_test( py_library( name = "kashin", srcs = ["kashin.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # tensorflow dep1, @@ -73,7 +73,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", @@ -98,7 +98,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 fd2c830f..2138c2f8 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/testing/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "testing", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":test_utils", @@ -20,7 +20,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 08fbbfd6..23f02e14 100644 --- a/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD +++ b/tensorflow_model_optimization/python/core/internal/tensor_encoding/utils/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "utils", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":py_utils", @@ -21,7 +21,7 @@ py_library( py_library( name = "py_utils", srcs = ["py_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ # numpy dep1, # six dep1, @@ -46,7 +46,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 faab2735..5eeace9e 100644 --- a/tensorflow_model_optimization/python/core/keras/BUILD +++ b/tensorflow_model_optimization/python/core/keras/BUILD @@ -10,7 +10,7 @@ licenses(["notice"]) py_library( name = "keras", srcs = ["__init__.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":compat", ":utils", @@ -21,7 +21,7 @@ py_library( py_library( name = "test_utils", srcs = ["test_utils.py"], - strict_deps = True, + # strict_deps = True, deps = [ ":compat", # numpy dep1, @@ -32,7 +32,7 @@ py_library( py_library( name = "compat", srcs = ["compat.py"], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, ], @@ -41,7 +41,7 @@ py_library( py_library( name = "utils", srcs = ["utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -53,7 +53,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 212c0e8c..b212d43c 100644 --- a/tensorflow_model_optimization/python/core/keras/testing/BUILD +++ b/tensorflow_model_optimization/python/core/keras/testing/BUILD @@ -10,7 +10,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 a649c0c9..b08f1c59 100644 --- a/tensorflow_model_optimization/python/core/quantization/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/BUILD @@ -7,7 +7,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 c1a5adbc..b711f5a0 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/BUILD @@ -13,7 +13,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. @@ -28,7 +28,7 @@ py_library( py_library( name = "quant_ops", srcs = ["quant_ops.py"], - strict_deps = True, + # strict_deps = True, deps = [ # absl/logging dep1, # tensorflow dep1, @@ -54,7 +54,7 @@ py_library( srcs = [ "quantizers.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quant_ops", @@ -86,7 +86,7 @@ py_library( srcs = [ "quantize_config.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantizers", @@ -101,7 +101,7 @@ py_library( srcs = [ "quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -113,7 +113,7 @@ py_library( srcs = [ "quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -125,7 +125,7 @@ py_library( srcs = [ "quantize_annotate.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":utils", @@ -155,7 +155,7 @@ py_library( srcs = [ "quantize_aware_activation.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":utils", @@ -188,7 +188,7 @@ py_library( srcs = [ "quantize_layer.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantizers", @@ -220,7 +220,7 @@ py_library( srcs = [ "quantize_wrapper.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantize_aware_activation", @@ -256,7 +256,7 @@ py_library( srcs = [ "quantize.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":quantize_annotate", @@ -350,7 +350,7 @@ py_library( srcs = [ "utils.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -363,7 +363,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 389110ad..84fea557 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/BUILD @@ -7,7 +7,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 8e1f107b..71125041 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 @@ -12,7 +12,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_cluster_preserve_quantize_scheme", # buildcleaner: keep ], @@ -23,7 +23,7 @@ py_library( srcs = [ "cluster_utils.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/keras:compat", @@ -35,7 +35,7 @@ py_library( srcs = [ "cluster_preserve_quantize_registry.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":cluster_utils", # tensorflow dep1, @@ -54,7 +54,7 @@ py_test( srcs = [ "cluster_preserve_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:private"], deps = [ ":cluster_preserve_quantize_registry", @@ -73,7 +73,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 = [ @@ -93,7 +93,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", @@ -105,7 +105,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 8c6fc879..0846a748 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 @@ -12,7 +12,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_prune_preserve_quantize_scheme", # buildcleaner: keep ], @@ -23,7 +23,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", @@ -39,7 +39,7 @@ py_test( srcs = [ "prune_preserve_quantize_registry_test.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:private"], deps = [ ":prune_preserve_quantize_registry", @@ -57,7 +57,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 ab421f14..b75ddfe0 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD @@ -13,7 +13,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -22,7 +22,7 @@ py_library( srcs = [ "default_8bit_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_8bit_quantizers_test.py", ], - strict_deps = False, + # strict_deps = False, deps = [ ":default_8bit_quantizers", # absl/testing:parameterized dep1, @@ -51,7 +51,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", @@ -63,7 +63,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", @@ -81,7 +81,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, @@ -99,7 +99,7 @@ py_library( srcs = [ "default_8bit_transforms.py", ], - strict_deps = False, + # strict_deps = False, deps = [ # numpy dep1, # tensorflow dep1, @@ -142,7 +142,7 @@ py_library( srcs = [ "default_8bit_quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_8bit_transforms", # tensorflow dep1, @@ -157,7 +157,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 @@ -174,7 +174,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 a3dc2ca5..7ce10ccd 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD @@ -11,7 +11,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":quantization", # buildcleaner: keep ], @@ -20,7 +20,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 1d705f9d..abf7e53c 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 @@ -11,7 +11,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -20,7 +20,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", @@ -33,7 +33,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, @@ -48,7 +48,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", @@ -60,7 +60,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", @@ -77,7 +77,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, @@ -94,7 +94,7 @@ py_library( srcs = [ "default_n_bit_transforms.py", ], - strict_deps = False, + # strict_deps = False, visibility = ["//visibility:public"], deps = [ # numpy dep1, @@ -114,7 +114,7 @@ py_library( srcs = [ "default_n_bit_quantize_layout_transform.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":default_n_bit_transforms", # tensorflow dep1, @@ -152,7 +152,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 af02209a..ef158019 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD @@ -12,7 +12,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [], ) @@ -21,7 +21,7 @@ py_library( srcs = [ "transforms.py", ], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -46,7 +46,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 31360ab2..94989761 100644 --- a/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD +++ b/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD @@ -11,14 +11,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", @@ -28,7 +28,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 36f28dcc..125f066e 100644 --- a/tensorflow_model_optimization/python/core/sparsity/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/BUILD @@ -7,7 +7,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 e02f73a8..059cdd0e 100644 --- a/tensorflow_model_optimization/python/core/sparsity/keras/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/keras/BUILD @@ -13,7 +13,7 @@ py_library( srcs = [ "__init__.py", ], - strict_deps = True, + # strict_deps = True, deps = [ ":prunable_layer", # buildcleaner: keep ":prune", # buildcleaner: keep @@ -26,7 +26,7 @@ py_library( py_library( name = "prune", srcs = ["prune.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_schedule", @@ -40,7 +40,7 @@ py_library( py_library( name = "prunable_layer", srcs = ["prunable_layer.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -50,7 +50,7 @@ py_library( py_library( name = "prune_registry", srcs = ["prune_registry.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prunable_layer", @@ -62,7 +62,7 @@ py_library( py_library( name = "pruning_policy", srcs = ["pruning_policy.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -75,7 +75,7 @@ py_library( py_library( name = "pruning_schedule", srcs = ["pruning_schedule.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # six dep1, @@ -101,7 +101,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", @@ -120,7 +120,7 @@ py_library( py_library( name = "pruning_callbacks", srcs = ["pruning_callbacks.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -151,7 +151,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", @@ -163,7 +163,7 @@ py_library( py_library( name = "pruning_utils", srcs = ["pruning_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # numpy dep1, @@ -174,7 +174,7 @@ py_library( py_library( name = "estimator_utils", srcs = ["estimator_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":pruning_wrapper", @@ -188,7 +188,7 @@ py_library( name = "test_utils", testonly = 1, srcs = ["test_utils.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ ":prune", @@ -325,7 +325,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 f0504eaf..55f0566e 100644 --- a/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD +++ b/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD @@ -11,7 +11,7 @@ licenses(["notice"]) py_library( name = "sparsity_tooling", srcs = ["sparsity_tooling.py"], - strict_deps = True, + # strict_deps = True, visibility = ["//visibility:public"], deps = [ # tensorflow dep1, @@ -27,7 +27,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", @@ -42,7 +42,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 @@ -55,7 +55,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 c041a1e6..bb146bca 100644 --- a/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD +++ b/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD @@ -17,7 +17,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, @@ -32,7 +32,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, @@ -47,7 +47,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, @@ -62,7 +62,7 @@ py_library( srcs = [ "imdb_utils.py", ], - strict_deps = True, + # strict_deps = True, deps = [ # tensorflow dep1, "//tensorflow_model_optimization/python/core/clustering/keras:cluster", @@ -76,7 +76,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