Merge branch 'master' into patch-2

f906646c · Duc Nguyen · GitHub · 2f3666ed · a6df5573 · f906646c
Commit f906646c authored Jun 29, 2017 by Duc Nguyen Committed by GitHub Jun 29, 2017
19 changed files
--- a/object_detection/samples/configs/faster_rcnn_resnet152_pets.config
+++ b/object_detection/samples/configs/faster_rcnn_resnet152_pets.config
--- a/object_detection/samples/configs/faster_rcnn_resnet50_pets.config
+++ b/object_detection/samples/configs/faster_rcnn_resnet50_pets.config
--- a/object_detection/samples/configs/rfcn_resnet101_pets.config
+++ b/object_detection/samples/configs/rfcn_resnet101_pets.config
--- a/object_detection/samples/configs/ssd_inception_v2_pets.config
+++ b/object_detection/samples/configs/ssd_inception_v2_pets.config
--- a/object_detection/samples/configs/ssd_mobilenet_v1_pets.config
+++ b/object_detection/samples/configs/ssd_mobilenet_v1_pets.config
--- a/object_detection/utils/metrics.py
+++ b/object_detection/utils/metrics.py
--- a/object_detection/utils/np_box_list.py
+++ b/object_detection/utils/np_box_list.py
--- a/object_detection/utils/ops.py
+++ b/object_detection/utils/ops.py
--- a/object_detection/utils/variables_helper.py
+++ b/object_detection/utils/variables_helper.py
--- a/object_detection/utils/visualization_utils.py
+++ b/object_detection/utils/visualization_utils.py
--- a/real_nvp/real_nvp_multiscale_dataset.py
+++ b/real_nvp/real_nvp_multiscale_dataset.py
--- a/slim/BUILD
+++ b/slim/BUILD
--- a/slim/README.md
+++ b/slim/README.md
--- a/slim/export_inference_graph.py
+++ b/slim/export_inference_graph.py
--- a/slim/export_inference_graph_test.py
+++ b/slim/export_inference_graph_test.py
--- a/slim/nets/resnet_v1.py
+++ b/slim/nets/resnet_v1.py
--- a/slim/nets/resnet_v2.py
+++ b/slim/nets/resnet_v2.py
--- a/slim/slim_walkthrough.ipynb
+++ b/slim/slim_walkthrough.ipynb
--- a/street/README.md
+++ b/street/README.md