Merge remote-tracking branch 'upstream/master'

44fa1d37 · Alex Lee · d3628a74 · 6e367f67 · 44fa1d37 · 44fa1d37
Commit 44fa1d37 authored Jun 29, 2017 by Alex Lee
20 changed files
--- a/object_detection/trainer.py
+++ b/object_detection/trainer.py
--- a/object_detection/trainer_test.py
+++ b/object_detection/trainer_test.py
--- a/object_detection/utils/BUILD
+++ b/object_detection/utils/BUILD
--- a/object_detection/utils/__init__.py
+++ b/object_detection/utils/__init__.py
--- a/object_detection/utils/category_util.py
+++ b/object_detection/utils/category_util.py
--- a/object_detection/utils/category_util_test.py
+++ b/object_detection/utils/category_util_test.py
--- a/object_detection/utils/dataset_util.py
+++ b/object_detection/utils/dataset_util.py
--- a/object_detection/utils/dataset_util_test.py
+++ b/object_detection/utils/dataset_util_test.py
--- a/object_detection/utils/label_map_util.py
+++ b/object_detection/utils/label_map_util.py
--- a/object_detection/utils/label_map_util_test.py
+++ b/object_detection/utils/label_map_util_test.py
--- a/object_detection/utils/learning_schedules.py
+++ b/object_detection/utils/learning_schedules.py
--- a/object_detection/utils/learning_schedules_test.py
+++ b/object_detection/utils/learning_schedules_test.py
--- a/object_detection/utils/metrics.py
+++ b/object_detection/utils/metrics.py
--- a/object_detection/utils/metrics_test.py
+++ b/object_detection/utils/metrics_test.py
--- a/object_detection/utils/np_box_list.py
+++ b/object_detection/utils/np_box_list.py
--- a/object_detection/utils/np_box_list_ops.py
+++ b/object_detection/utils/np_box_list_ops.py
--- a/object_detection/utils/np_box_list_ops_test.py
+++ b/object_detection/utils/np_box_list_ops_test.py
--- a/object_detection/utils/np_box_list_test.py
+++ b/object_detection/utils/np_box_list_test.py
--- a/object_detection/utils/np_box_ops.py
+++ b/object_detection/utils/np_box_ops.py
--- a/object_detection/utils/np_box_ops_test.py
+++ b/object_detection/utils/np_box_ops_test.py