Merge branch 'master' into cifar10_experiment

748eceae · Marianne Linhares Monteiro · GitHub · 40e906d2 · ed65b632 · 748eceae
Commit 748eceae authored Jul 28, 2017 by Marianne Linhares Monteiro Committed by GitHub Jul 28, 2017
20 changed files
--- a/object_detection/meta_architectures/ssd_meta_arch_test.py
+++ b/object_detection/meta_architectures/ssd_meta_arch_test.py
--- a/object_detection/models/BUILD
+++ b/object_detection/models/BUILD
--- a/object_detection/models/faster_rcnn_inception_resnet_v2_feature_extractor.py
+++ b/object_detection/models/faster_rcnn_inception_resnet_v2_feature_extractor.py
--- a/object_detection/models/feature_map_generators_test.py
+++ b/object_detection/models/feature_map_generators_test.py
--- a/object_detection/object_detection_tutorial.ipynb
+++ b/object_detection/object_detection_tutorial.ipynb
--- 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/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/shape_utils.py
+++ b/object_detection/utils/shape_utils.py
--- a/object_detection/utils/shape_utils_test.py
+++ b/object_detection/utils/shape_utils_test.py
--- a/object_detection/utils/test_utils.py
+++ b/object_detection/utils/test_utils.py
--- a/object_detection/utils/visualization_utils.py
+++ b/object_detection/utils/visualization_utils.py
--- a/ptn/.gitignore
+++ b/ptn/.gitignore
--- a/ptn/BUILD
+++ b/ptn/BUILD
--- a/ptn/README.md
+++ b/ptn/README.md
--- a/ptn/eval_ptn.py
+++ b/ptn/eval_ptn.py
--- a/ptn/eval_rotator.py
+++ b/ptn/eval_rotator.py
--- a/ptn/input_generator.py
+++ b/ptn/input_generator.py