Skip to content

Commit 4a20f57

Browse files
embrembr
authored
Merge pull request #159 from venkat2469/r0.41.0
Update 0.41.0 in version.py and RELEASE.md
2 parents 827ed8f + e24c84e commit 4a20f57

File tree

7 files changed

+45
-20
lines changed

7 files changed

+45
-20
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ combinations may also work.
209209

210210
|tensorflow-model-analysis |apache-beam[gcp]|pyarrow |tensorflow |tensorflow-metadata |tfx-bsl |
211211
|------------------------------------------------------------------------------------ |----------------|----------|-------------------|--------------------|----------|
212-
|[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 |
212+
|[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 |
213+
|[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 |
213214
|[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 |
214215
|[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 |
215216
|[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 |

‎RELEASE.md‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,28 @@
44

55
## Major Features and Improvements
66

7+
## Bug fixes and other Changes
8+
9+
## Breaking Changes
10+
11+
## Deprecations
12+
13+
# Version 0.41.0
14+
15+
## Major Features and Improvements
16+
717
* Add COCO object detection metrics, object detection related utilities,
8-
objection detection opitons in binary confusion matrix, PrecisionAtRecall,
9-
Recall, and AUC. Add MaxRecall metric.
18+
objection detection opitons in binary confusion matrix, Precision At Recall,
19+
and AUC. Add MaxRecall metric.
1020
* Add support for parsing sparse tensors with explicit tensor representations
1121
via TFXIO.
1222

1323
## Bug fixes and other Changes
1424

1525
* Add score_distribution_plot.
16-
* Separate the PredictionsExtractor into two extractors.
26+
* Separate the Predictions Extractor into two extractors.
1727
* Update PredictionsExtractor to support backwards compatibility with the
18-
MaterializedPredictionsExtractor.
28+
Materialized Predictions Extractor.
1929
* Depends on `apache-beam[gcp]>=2.40,<3`.
2030
* Depends on `pyarrow>=6,<7`.
2131
* Update merge_extracts with an option to skip squeezing one-dim arrays.
@@ -29,6 +39,8 @@
2939

3040
## Deprecations
3141

42+
* N/A
43+
3244
# Version 0.40.0
3345

3446
## Major Features and Improvements

‎g3doc/install.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ combinations may also work.
152152

153153
tensorflow-model-analysis | apache-beam[gcp] | pyarrow | tensorflow | tensorflow-metadata | tfx-bsl
154154
------------------------------------------------------------------------------------ | ---------------- | ------- | ----------------- | ------------------- | -------
155-
[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
155+
[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
156+
[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
156157
[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
157158
[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
158159
[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

‎setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,12 @@ def select_constraint(default, nightly=None, git_master=None):
303303
'attrs>=19.3.0,<22',
304304
'tensorflow>=1.15.5,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,<3',
305305
'tensorflow-metadata' + select_constraint(
306-
default='>=1.9.0,<1.10.0',
307-
nightly='>=1.10.0.dev',
306+
default='>=1.10.0,<1.11.0',
307+
nightly='>=1.11.0.dev',
308308
git_master='@git+https://github.com/tensorflow/metadata@master'),
309309
'tfx-bsl' + select_constraint(
310-
default='>=1.9.0,<1.10.0',
311-
nightly='>=1.10.0.dev',
310+
default='>=1.10.1,<1.11.0',
311+
nightly='>=1.11.0.dev',
312312
git_master='@git+https://github.com/tensorflow/tfx-bsl@master'),
313313
],
314314
'extras_require': {

‎tensorflow_model_analysis/extractors/tflite_predict_extractor_test.py‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414
"""Tests for tflite predict extractor."""
1515

16+
import itertools
1617
import os
1718
import tempfile
1819

@@ -31,22 +32,32 @@
3132
from google.protobuf import text_format
3233
from tensorflow_metadata.proto.v0 import schema_pb2
3334

35+
_TF_MAJOR_VERSION = int(tf.version.VERSION.split('.')[0])
36+
37+
_MULTI_MODEL_CASES = [False, True]
38+
_MULTI_OUTPUT_CASES = [False, True]
39+
# Equality op not supported in TF1. See b/242088810
40+
_BYTES_FEATURE_CASES = [False] if _TF_MAJOR_VERSION < 2 else [False, True]
41+
3442

3543
class TFLitePredictExtractorTest(testutil.TensorflowModelAnalysisTest,
3644
parameterized.TestCase):
3745

38-
@parameterized.named_parameters(('single_model_single_output', False, False),
39-
('single_model_multi_output', False, True),
40-
('multi_model_single_output', True, False),
41-
('multi_model_multi_output', True, True))
42-
def testTFlitePredictExtractorWithKerasModel(self, multi_model, multi_output):
46+
@parameterized.parameters(
47+
itertools.product(_MULTI_MODEL_CASES, _MULTI_OUTPUT_CASES,
48+
_BYTES_FEATURE_CASES))
49+
def testTFlitePredictExtractorWithKerasModel(self, multi_model, multi_output,
50+
use_bytes_feature):
4351
input1 = tf.keras.layers.Input(shape=(1,), name='input1')
4452
input2 = tf.keras.layers.Input(shape=(1,), name='input2')
4553
input3 = tf.keras.layers.Input(shape=(1,), name='input3', dtype=tf.string)
4654
inputs = [input1, input2, input3]
47-
input_layer = tf.keras.layers.concatenate(
48-
[inputs[0], inputs[1],
49-
tf.cast(inputs[2] == 'a', tf.float32)])
55+
if use_bytes_feature:
56+
input_layer = tf.keras.layers.concatenate(
57+
[inputs[0], inputs[1],
58+
tf.cast(inputs[2] == 'a', tf.float32)])
59+
else:
60+
input_layer = tf.keras.layers.concatenate([inputs[0], inputs[1]])
5061
output_layers = {}
5162
output_layers['output1'] = (
5263
tf.keras.layers.Dense(1, activation=tf.nn.sigmoid,

‎tensorflow_model_analysis/notebook/jupyter/js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tensorflow_model_analysis",
3-
"version": "0.41.0.dev",
3+
"version": "0.41.0",
44
"homepage": "https://github.com/tensorflow/model-analysis",
55
"bugs": "https://github.com/tensorflow/model-analysis/issues",
66
"license": "Apache-2.0",

‎tensorflow_model_analysis/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
# Version string for this release of TFMA.
1717
# Note that setup.py reads and uses this version.
18-
VERSION = '0.41.0.dev'
18+
VERSION = '0.41.0'

0 commit comments

Comments
 (0)