Merge remote-tracking branch 'upstream/master'

e00e0e13 · dreamdragon · b915db4e · 402b561b · e00e0e13 · e00e0e13
Commit e00e0e13 authored Dec 03, 2018 by dreamdragon
20 changed files
--- a/research/object_detection/core/preprocessor.py
+++ b/research/object_detection/core/preprocessor.py
--- a/research/object_detection/core/preprocessor_test.py
+++ b/research/object_detection/core/preprocessor_test.py
--- a/research/object_detection/core/standard_fields.py
+++ b/research/object_detection/core/standard_fields.py
--- a/research/object_detection/core/target_assigner.py
+++ b/research/object_detection/core/target_assigner.py
--- a/research/object_detection/core/target_assigner_test.py
+++ b/research/object_detection/core/target_assigner_test.py
--- a/research/object_detection/data/face_label_map.pbtxt
+++ b/research/object_detection/data/face_label_map.pbtxt
--- a/research/object_detection/data/mscoco_minival_ids.txt
+++ b/research/object_detection/data/mscoco_minival_ids.txt
--- a/research/object_detection/data_decoders/tf_example_decoder.py
+++ b/research/object_detection/data_decoders/tf_example_decoder.py
--- a/research/object_detection/data_decoders/tf_example_decoder_test.py
+++ b/research/object_detection/data_decoders/tf_example_decoder_test.py
--- a/research/object_detection/dataset_tools/oid_hierarchical_labels_expansion.py
+++ b/research/object_detection/dataset_tools/oid_hierarchical_labels_expansion.py
--- a/research/object_detection/eval_util.py
+++ b/research/object_detection/eval_util.py
--- a/research/object_detection/eval_util_test.py
+++ b/research/object_detection/eval_util_test.py
--- a/research/object_detection/export_tflite_ssd_graph_lib.py
+++ b/research/object_detection/export_tflite_ssd_graph_lib.py
--- a/research/object_detection/export_tflite_ssd_graph_lib_test.py
+++ b/research/object_detection/export_tflite_ssd_graph_lib_test.py
--- a/research/object_detection/exporter.py
+++ b/research/object_detection/exporter.py
--- a/research/object_detection/exporter_test.py
+++ b/research/object_detection/exporter_test.py
--- a/research/object_detection/g3doc/detection_model_zoo.md
+++ b/research/object_detection/g3doc/detection_model_zoo.md
--- a/research/object_detection/g3doc/installation.md
+++ b/research/object_detection/g3doc/installation.md
--- a/research/object_detection/g3doc/running_on_mobile_tensorflowlite.md
+++ b/research/object_detection/g3doc/running_on_mobile_tensorflowlite.md
--- a/research/object_detection/g3doc/running_pets.md
+++ b/research/object_detection/g3doc/running_pets.md