import bug solved

gustavz · May 24, 2018 · 99ec7e6 · 99ec7e6
1 parent 621d344
commit 99ec7e6
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 2,782 deletions.
diff --git a/run_objectdetection.py b/run_objectdetection.py
@@ -10,10 +10,8 @@
 import yaml
 import os
 from stuff.helper import Model, FPS, WebcamVideoStream, SessionWorker, conv_detect2track, conv_track2detect, vis_detection
-from object_detection.utils import ops as utils_ops
+from stuff.object_detection.utils import ops as utils_ops
 
-# protobuf compilation (only once necessary)
-os.system('protoc stuff/object_detection/protos/*.proto --python_out=.')
 
 ## LOAD CONFIG PARAMS ##
 if (os.path.isfile('config.yml')):

diff --git a/scripts/config_tools.sh b/scripts/config_tools.sh
@@ -11,9 +11,9 @@
 ### CHANGE THIS ACCORDING TO YOUR SYSTEM ###
 export MODEL_NAME="mask_rcnn_mobilenet_v1_400_coco_117k"
 export TF_PATH="/home/gustav/workspace/tensorflow/tensorflow"
-export REPO_PATH="/home/gustav/workspace/realtime_object_detection"
+export ROOT_PATH="/home/gustav/workspace/realtime_object_detection"
 ### DO NOT CHANGE THIS ###
-export MODEL_PATH="${REPO_PATH}/models/${MODEL_NAME}"
+export MODEL_PATH="${ROOT_PATH}/models/${MODEL_NAME}"
 export IN_GRAPH="${MODEL_PATH}/frozen_inference_graph.pb"
 export OUT_GRAPH="${MODEL_PATH}/optimized_inference_graph.pb"
 export TFLITE_GRAPH="${MODEL_PATH}/frozen_inference_graph.tflite"
@@ -42,7 +42,7 @@ sort_by_execution_order
 echo "> doublecheck all paths:"
 echo "MODEL_NAME: $MODEL_NAME"
 echo "TF_PATH: $TF_PATH"
-echo "REPO_PATH: $REPO_PATH"
+echo "ROOT_PATH: $ROOT_PATH"
 
 ########################
 # Possible Transforms are:

diff --git a/stuff/helper.py b/stuff/helper.py
@@ -18,9 +18,6 @@
 import six.moves.urllib as urllib
 from tensorflow.core.framework import graph_pb2
 
-from object_detection.utils import label_map_util
-from object_detection.utils import visualization_utils as vis_util
-
 import sys
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
@@ -29,6 +26,11 @@
 elif PY3:
     import queue as Queue
 
+from object_detection.utils import label_map_util
+from object_detection.utils import visualization_utils as vis_util
+
+
+
 
 class Model:
     """

diff --git a/stuff/object_detection/core/box_list_ops.py b/stuff/object_detection/core/box_list_ops.py
@@ -25,8 +25,8 @@
 """
 import tensorflow as tf
 
-from object_detection.core import box_list
-from object_detection.utils import shape_utils
+from stuff.object_detection.core import box_list
+from stuff.object_detection.utils import shape_utils
 
 
 class SortOrder(object):

diff --git a/stuff/object_detection/utils/label_map_util.py b/stuff/object_detection/utils/label_map_util.py
@@ -19,7 +19,7 @@
 
 import tensorflow as tf
 from google.protobuf import text_format
-from object_detection.protos import string_int_label_map_pb2
+from stuff.object_detection.protos import string_int_label_map_pb2
 
 
 def _validate_label_map(label_map):

diff --git a/stuff/object_detection/utils/new/label_map_util.py b/stuff/object_detection/utils/new/label_map_util.py