Merge branch 'master' of https://github.com/cguindel/lsi-faster-rcnn

cguindel · Dec 18, 2017 · 63dbdc3 · 63dbdc3
2 parents 4c34a0c + 84423b7
commit 63dbdc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/data/scripts/fetch_lsi_models.sh b/data/scripts/fetch_lsi_models.sh
@@ -30,6 +30,7 @@ wget $URL -O $FILE
 
 echo "Unzipping..."
 
-tar zxvf $FILE
+mkdir -p "lsi_models"
+tar -C "lsi_models" -zxvf $FILE
 
 echo "Done. Please run this command again to verify that checksum = $CHECKSUM."
diff --git a/tools/demo_viewp.py b/tools/demo_viewp.py
@@ -131,7 +131,7 @@ def draw_detections(image, scores, boxes, viewpoints, thresh=0.5):
                         0.4, CLASS_COLOR[args.demo_net][cls_ind])
 
                 cv2.arrowedLine(image, start_arrow, end_arrow, \
-                    CLASS_COLOR[args.demo_net][cls_ind], 3, cv2.LINE_AA, 0, 0.6)
+                    CLASS_COLOR[args.demo_net][cls_ind], 3, 8, 0, 0.6)
 
     nice = cv2.addWeighted(alpha, 0.3, image, 1, 0)
 
@@ -180,6 +180,8 @@ def parse_args():
     cfg.MODELS_DATASET = 'kitti'
     cfg.MODELS_DIR = os.path.abspath(os.path.join(cfg.ROOT_DIR, 'models', \
         cfg.MODELS_DATASET))
+    cfg.TEST.SCALES = [500]
+    cfg.TEST.MAX_SIZE = 1800
 
     args = parse_args()
 
@@ -189,8 +191,8 @@ def parse_args():
                               NETS[args.demo_net][1])
 
     if not os.path.isfile(caffemodel):
-        raise IOError(('{:s} not found.\nDid you run ./data/script/'
-                       'fetch_faster_lsi_models.sh?').format(caffemodel))
+        raise IOError(('{:s} not found.\nDid you run ./data/scripts/'
+                       'fetch_lsi_models.sh?').format(caffemodel))
 
     if args.cpu_mode:
         caffe.set_mode_cpu()