Merge pull request #46 from timesler/dev

Increment version and fix bug in points concat

Author: timesler

models/utils/detect_face.py

@@ -46,7 +46,7 @@ def detect_face(imgs, minsize, pnet, rnet, onet, threshold, factor, device):
     batch_boxes = []
     batch_points = []
     for img, total_boxes in zip(imgs, total_boxes_all):
-        points = []
+        points = np.zeros((2, 5, 0))
         numbox = total_boxes.shape[0]
         if numbox > 0:
             pick = nms(total_boxes, 0.7, "Union")
@@ -127,10 +127,10 @@ def detect_face(imgs, minsize, pnet, rnet, onet, threshold, factor, device):
                 total_boxes = bbreg(total_boxes, np.transpose(mv))
                 pick = nms(total_boxes, 0.7, "Min")
                 total_boxes = total_boxes[pick, :]
-                points = np.transpose(points[:, :, pick])
+                points = points[:, :, pick]
 
         batch_boxes.append(total_boxes)
-        batch_points.append(points)
+        batch_points.append(np.transpose(points))
 
     return np.array(batch_boxes), np.array(batch_points)
 

setup.py

@@ -1,7 +1,7 @@
 import setuptools, os
 
 PACKAGE_NAME = 'facenet-pytorch'
-VERSION = '0.5.0'
+VERSION = '1.0.1'
 AUTHOR = 'Tim Esler'
 EMAIL = 'tim.esler@gmail.com'
 DESCRIPTION = 'Pretrained Pytorch face detection and recognition models'