Skip to content

Commit 451906e

Browse files
pkulzcsguadadreamdragon
authoredMay 26, 2020
Release MobileDet code and model, and require tf_slim installation for OD API. (#8562)
* Merged commit includes the following changes: 311933687 by Sergio Guadarrama: Removes spurios use of tf.compat.v2, which results in spurious tf.compat.v1.compat.v2. Adds basic test to nasnet_utils. Replaces all remaining import tensorflow as tf with import tensorflow.compat.v1 as tf -- 311766063 by Sergio Guadarrama: Removes explicit tf.compat.v1 in all call sites (we already import tf.compat.v1, so this code was doing tf.compat.v1.compat.v1). The existing code worked in latest version of tensorflow, 2.2, (and 1.15) but not in 1.14 or in 2.0.0a, this CL fixes it. -- 311624958 by Sergio Guadarrama: Updates README that doesn't render properly in github documentation -- 310980959 by Sergio Guadarrama: Moves research_models/slim off tf.contrib.slim/layers/framework to tf_slim -- 310263156 by Sergio Guadarrama: Adds model breakdown for MobilenetV3 -- 308640516 by Sergio Guadarrama: Internal change 308244396 by Sergio Guadarrama: GroupNormalization support for MobilenetV3. -- 307475800 by Sergio Guadarrama: Internal change -- 302077708 by Sergio Guadarrama: Remove `disable_tf2` behavior from slim py_library targets -- 301208453 by Sergio Guadarrama: Automated refactoring to make code Python 3 compatible. -- 300816672 by Sergio Guadarrama: Internal change 299433840 by Sergio Guadarrama: Internal change 299221609 by Sergio Guadarrama: Explicitly disable Tensorflow v2 behaviors for all TF1.x binaries and tests -- 299179617 by Sergio Guadarrama: Internal change 299040784 by Sergio Guadarrama: Internal change 299036699 by Sergio Guadarrama: Internal change 298736510 by Sergio Guadarrama: Internal change 298732599 by Sergio Guadarrama: Internal change 298729507 by Sergio Guadarrama: Internal change 298253328 by Sergio Guadarrama: Internal change 297788346 by Sergio Guadarrama: Internal change 297785278 by Sergio Guadarrama: Internal change 297783127 by Sergio Guadarrama: Internal change 297725870 by Sergio Guadarrama: Internal change 297721811 by Sergio Guadarrama: Internal change 297711347 by Sergio Guadarrama: Internal change 297708059 by Sergio Guadarrama: Internal change 297701831 by Sergio Guadarrama: Internal change 297700038 by Sergio Guadarrama: Internal change 297670468 by Sergio Guadarrama: Internal change. -- 297350326 by Sergio Guadarrama: Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration -- 297201668 by Sergio Guadarrama: Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration -- 294483372 by Sergio Guadarrama: Internal change PiperOrigin-RevId: 311933687 * Merged commit includes the following changes: 312578615 by Menglong Zhu: Modify the LSTM feature extractors to be python 3 compatible. -- 311264357 by Menglong Zhu: Removes contrib.slim -- 308957207 by Menglong Zhu: Automated refactoring to make code Python 3 compatible. -- 306976470 by yongzhe: Internal change 306777559 by Menglong Zhu: Internal change -- 299232507 by lzyuan: Internal update. -- 299221735 by lzyuan: Add small epsilon on max_range for quantize_op to prevent range collapse. -- PiperOrigin-RevId: 312578615 * Merged commit includes the following changes: 310447280 by lzc: Internal changes. -- PiperOrigin-RevId: 310447280 Co-authored-by: Sergio Guadarrama <sguada@google.com> Co-authored-by: Menglong Zhu <menglong@google.com>
1 parent 73b5be6 commit 451906e

File tree

407 files changed

+10483
-5596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+10483
-5596
lines changed
 

‎research/lstm_object_detection/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
![TensorFlow Requirement: 1.x](https://img.shields.io/badge/TensorFlow%20Requirement-1.x-brightgreen)
2-
![TensorFlow 2 Not Supported](https://img.shields.io/badge/TensorFlow%202%20Not%20Supported-%E2%9C%95-red.svg)
3-
41
# Tensorflow Mobile Video Object Detection
52

63
Tensorflow mobile video object detection implementation proposed in the
@@ -35,6 +32,7 @@ https://scholar.googleusercontent.com/scholar.bib?q=info:rLqvkztmWYgJ:scholar.go
3532
* yinxiao@google.com
3633
* menglong@google.com
3734
* yongzhe@google.com
35+
* lzyuan@google.com
3836

3937

4038
## Table of Contents

‎research/lstm_object_detection/inputs/seq_dataset_builder.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
that wraps the build function.
2424
"""
2525
import tensorflow.compat.v1 as tf
26-
from tensorflow.contrib import slim as contrib_slim
26+
import tf_slim as slim
27+
2728
from tensorflow.contrib.training.python.training import sequence_queueing_state_saver as sqss
2829
from lstm_object_detection.inputs import tf_sequence_example_decoder
2930
from lstm_object_detection.protos import input_reader_google_pb2
@@ -33,7 +34,7 @@
3334
from object_detection.protos import input_reader_pb2
3435
from object_detection.utils import ops as util_ops
3536

36-
parallel_reader = contrib_slim.parallel_reader
37+
parallel_reader = slim.parallel_reader
3738
# TODO(yinxiao): Make the following variable into configurable proto.
3839
# Padding size for the labeled objects in each frame. Here we assume each
3940
# frame has a total number of objects less than _PADDING_SIZE.

0 commit comments

Comments
 (0)