Merge pull request #159 from venkat2469/r0.41.0

Update 0.41.0 in version.py and RELEASE.md
tensorflow · Sep 8, 2022 · 4a20f57 · 4a20f57
2 parents 827ed8f + e24c84e
commit 4a20f57
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -209,7 +209,8 @@ combinations may also work.
 
 |tensorflow-model-analysis                                                            |apache-beam[gcp]|pyarrow   |tensorflow         |tensorflow-metadata |tfx-bsl   |
 |------------------------------------------------------------------------------------ |----------------|----------|-------------------|--------------------|----------|
-|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.38.0         | 5.0.0    | nightly (1.x/2.x) | 1.9.0              | 1.9.0    |
+|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.40.0         | 6.0.0    | nightly (1.x/2.x) | 1.10.0             | 1.10.1   |
+|[0.41.0](https://github.com/tensorflow/model-analysis/blob/v0.41.0/RELEASE.md)       | 2.40.0         | 6.0.0    | 1.15.5 / 2.9      | 1.10.0             | 1.10.1   |
 |[0.40.0](https://github.com/tensorflow/model-analysis/blob/v0.40.0/RELEASE.md)       | 2.38.0         | 5.0.0    | 1.15.5 / 2.9      | 1.9.0              | 1.9.0    |
 |[0.39.0](https://github.com/tensorflow/model-analysis/blob/v0.39.0/RELEASE.md)       | 2.38.0         | 5.0.0    | 1.15.5 / 2.8      | 1.8.0              | 1.8.0    |
 |[0.38.0](https://github.com/tensorflow/model-analysis/blob/v0.38.0/RELEASE.md)       | 2.36.0         | 5.0.0    | 1.15.5 / 2.8      | 1.7.0              | 1.7.0    |

diff --git a/RELEASE.md b/RELEASE.md
@@ -4,18 +4,28 @@
 
 ## Major Features and Improvements
 
+## Bug fixes and other Changes
+
+## Breaking Changes
+
+## Deprecations
+
+# Version 0.41.0
+
+## Major Features and Improvements
+
 *   Add COCO object detection metrics, object detection related utilities,
-    objection detection opitons in binary confusion matrix, PrecisionAtRecall,
-    Recall, and AUC. Add MaxRecall metric.
+    objection detection opitons in binary confusion matrix, Precision At Recall,
+    and AUC. Add MaxRecall metric.
 *   Add support for parsing sparse tensors with explicit tensor representations
     via TFXIO.
 
 ## Bug fixes and other Changes
 
 *   Add score_distribution_plot.
-*   Separate the PredictionsExtractor into two extractors.
+*   Separate the Predictions Extractor into two extractors.
 *   Update PredictionsExtractor to support backwards compatibility with the
-    MaterializedPredictionsExtractor.
+    Materialized Predictions Extractor.
 *   Depends on `apache-beam[gcp]>=2.40,<3`.
 *   Depends on `pyarrow>=6,<7`.
 *   Update merge_extracts with an option to skip squeezing one-dim arrays.
@@ -29,6 +39,8 @@
 
 ## Deprecations
 
+*   N/A
+
 # Version 0.40.0
 
 ## Major Features and Improvements

diff --git a/g3doc/install.md b/g3doc/install.md
@@ -152,7 +152,8 @@ combinations may also work.
 
 tensorflow-model-analysis                                                            | apache-beam[gcp] | pyarrow | tensorflow        | tensorflow-metadata | tfx-bsl
 ------------------------------------------------------------------------------------ | ---------------- | ------- | ----------------- | ------------------- | -------
-[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.38.0           | 5.0.0   | nightly (1.x/2.x) | 1.9.0               | 1.9.0
+[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.40.0           | 6.0.0   | nightly (1.x/2.x) | 1.10.0              | 1.10.1
+[0.41.0](https://github.com/tensorflow/model-analysis/blob/v0.41.0/RELEASE.md)       | 2.40.0           | 6.0.0   | 1.15 / 2.9        | 1.10.0              | 1.10.1
 [0.40.0](https://github.com/tensorflow/model-analysis/blob/v0.40.0/RELEASE.md)       | 2.38.0           | 5.0.0   | 1.15 / 2.9        | 1.9.0               | 1.9.0
 [0.39.0](https://github.com/tensorflow/model-analysis/blob/v0.39.0/RELEASE.md)       | 2.38.0           | 5.0.0   | 1.15 / 2.8        | 1.8.0               | 1.8.0
 [0.38.0](https://github.com/tensorflow/model-analysis/blob/v0.38.0/RELEASE.md)       | 2.36.0           | 5.0.0   | 1.15 / 2.8        | 1.7.0               | 1.7.0

diff --git a/setup.py b/setup.py
@@ -303,12 +303,12 @@ def select_constraint(default, nightly=None, git_master=None):
         'attrs>=19.3.0,<22',
         'tensorflow>=1.15.5,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,<3',
         'tensorflow-metadata' + select_constraint(
-            default='>=1.9.0,<1.10.0',
-            nightly='>=1.10.0.dev',
+            default='>=1.10.0,<1.11.0',
+            nightly='>=1.11.0.dev',
             git_master='@git+https://github.com/tensorflow/metadata@master'),
         'tfx-bsl' + select_constraint(
-            default='>=1.9.0,<1.10.0',
-            nightly='>=1.10.0.dev',
+            default='>=1.10.1,<1.11.0',
+            nightly='>=1.11.0.dev',
             git_master='@git+https://github.com/tensorflow/tfx-bsl@master'),
     ],
     'extras_require': {

diff --git a/tensorflow_model_analysis/extractors/tflite_predict_extractor_test.py b/tensorflow_model_analysis/extractors/tflite_predict_extractor_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 """Tests for tflite predict extractor."""
 
+import itertools
 import os
 import tempfile
 
@@ -31,22 +32,32 @@
 from google.protobuf import text_format
 from tensorflow_metadata.proto.v0 import schema_pb2
 
+_TF_MAJOR_VERSION = int(tf.version.VERSION.split('.')[0])
+
+_MULTI_MODEL_CASES = [False, True]
+_MULTI_OUTPUT_CASES = [False, True]
+# Equality op not supported in TF1. See b/242088810
+_BYTES_FEATURE_CASES = [False] if _TF_MAJOR_VERSION < 2 else [False, True]
+
 
 class TFLitePredictExtractorTest(testutil.TensorflowModelAnalysisTest,
                                  parameterized.TestCase):
 
-  @parameterized.named_parameters(('single_model_single_output', False, False),
-                                  ('single_model_multi_output', False, True),
-                                  ('multi_model_single_output', True, False),
-                                  ('multi_model_multi_output', True, True))
-  def testTFlitePredictExtractorWithKerasModel(self, multi_model, multi_output):
+  @parameterized.parameters(
+      itertools.product(_MULTI_MODEL_CASES, _MULTI_OUTPUT_CASES,
+                        _BYTES_FEATURE_CASES))
+  def testTFlitePredictExtractorWithKerasModel(self, multi_model, multi_output,
+                                               use_bytes_feature):
     input1 = tf.keras.layers.Input(shape=(1,), name='input1')
     input2 = tf.keras.layers.Input(shape=(1,), name='input2')
     input3 = tf.keras.layers.Input(shape=(1,), name='input3', dtype=tf.string)
     inputs = [input1, input2, input3]
-    input_layer = tf.keras.layers.concatenate(
-        [inputs[0], inputs[1],
-         tf.cast(inputs[2] == 'a', tf.float32)])
+    if use_bytes_feature:
+      input_layer = tf.keras.layers.concatenate(
+          [inputs[0], inputs[1],
+           tf.cast(inputs[2] == 'a', tf.float32)])
+    else:
+      input_layer = tf.keras.layers.concatenate([inputs[0], inputs[1]])
     output_layers = {}
     output_layers['output1'] = (
         tf.keras.layers.Dense(1, activation=tf.nn.sigmoid,

diff --git a/tensorflow_model_analysis/notebook/jupyter/js/package.json b/tensorflow_model_analysis/notebook/jupyter/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tensorflow_model_analysis",
-  "version": "0.41.0.dev",
+  "version": "0.41.0",
   "homepage": "https://github.com/tensorflow/model-analysis",
   "bugs": "https://github.com/tensorflow/model-analysis/issues",
   "license": "Apache-2.0",

diff --git a/tensorflow_model_analysis/version.py b/tensorflow_model_analysis/version.py
@@ -15,4 +15,4 @@
 
 # Version string for this release of TFMA.
 # Note that setup.py reads and uses this version.
-VERSION = '0.41.0.dev'
+VERSION = '0.41.0'