Merge branch 'tensorflow:master' into exp_pr2

7a45b513 · Vishnu Banna · GitHub · 54115e16 · 12bbefce · 7a45b513
Unverified Commit 7a45b513 authored Oct 25, 2021 by Vishnu Banna Committed by GitHub Oct 25, 2021
20 changed files
--- a/official/projects/edgetpu/vision/serving/export_tflite_test.py
+++ b/official/projects/edgetpu/vision/serving/export_tflite_test.py
--- a/official/projects/edgetpu/vision/serving/export_util.py
+++ b/official/projects/edgetpu/vision/serving/export_util.py
--- a/official/projects/edgetpu/vision/serving/inference_visualization_tool.ipynb
+++ b/official/projects/edgetpu/vision/serving/inference_visualization_tool.ipynb
--- a/official/projects/edgetpu/vision/serving/testdata/ADE_val_00000557.jpg
+++ b/official/projects/edgetpu/vision/serving/testdata/ADE_val_00000557.jpg
--- a/official/projects/edgetpu/vision/serving/testdata/ADE_val_00001471.jpg
+++ b/official/projects/edgetpu/vision/serving/testdata/ADE_val_00001471.jpg
--- a/official/projects/edgetpu/vision/serving/testdata/ADE_val_00001626.jpg
+++ b/official/projects/edgetpu/vision/serving/testdata/ADE_val_00001626.jpg
--- a/official/projects/edgetpu/vision/serving/tflite_imagenet_evaluator.py
+++ b/official/projects/edgetpu/vision/serving/tflite_imagenet_evaluator.py
--- a/official/projects/edgetpu/vision/serving/tflite_imagenet_evaluator_run.py
+++ b/official/projects/edgetpu/vision/serving/tflite_imagenet_evaluator_run.py
--- a/official/nlp/keras_nlp/encoders/bert_encoder.py
+++ b/official/nlp/keras_nlp/encoders/bert_encoder.py
--- a/official/projects/edgetpu/vision/tasks/__init__.py
+++ b/official/projects/edgetpu/vision/tasks/__init__.py
--- a/official/projects/edgetpu/vision/tasks/image_classification.py
+++ b/official/projects/edgetpu/vision/tasks/image_classification.py
--- a/official/projects/edgetpu/vision/tasks/image_classification_test.py
+++ b/official/projects/edgetpu/vision/tasks/image_classification_test.py
--- a/official/projects/edgetpu/vision/tasks/semantic_segmentation.py
+++ b/official/projects/edgetpu/vision/tasks/semantic_segmentation.py
--- a/official/projects/edgetpu/vision/tasks/semantic_segmentation_test.py
+++ b/official/projects/edgetpu/vision/tasks/semantic_segmentation_test.py
--- a/official/projects/edgetpu/vision/train.py
+++ b/official/projects/edgetpu/vision/train.py
--- a/official/vision/beta/dataloaders/classification_input.py
+++ b/official/vision/beta/dataloaders/classification_input.py
--- a/official/vision/beta/dataloaders/parser.py
+++ b/official/vision/beta/dataloaders/parser.py
--- a/official/vision/beta/modeling/backbones/spinenet.py
+++ b/official/vision/beta/modeling/backbones/spinenet.py
@@ -60,6 +60,7 @@ SPINENET_BLOCK_SPECS = [
    (5, 'bottleneck', (7, 12), True),
    (7, 'bottleneck', (5, 14), True),
    (6, 'bottleneck', (12, 14), True),
+    (2, 'bottleneck', (2, 13), True),
 ]
 SCALING_MAP = {

--- a/official/vision/beta/modeling/layers/nn_layers.py
+++ b/official/vision/beta/modeling/layers/nn_layers.py
--- a/official/vision/beta/modeling/layers/nn_layers_test.py
+++ b/official/vision/beta/modeling/layers/nn_layers_test.py