diff --git a/dface/core/detect.py b/dface/core/detect.py index b08b615..6d5cefa 100644 --- a/dface/core/detect.py +++ b/dface/core/detect.py @@ -1,3 +1,4 @@ +from __future__ import print_function import cv2 import time import numpy as np @@ -6,7 +7,6 @@ from torch.autograd.variable import Variable from dface.core.models import PNet,RNet,ONet import dface.core.utils as utils import dface.core.image_tools as image_tools -from __future__ import print_function def create_mtcnn_net(p_model_path=None, r_model_path=None, o_model_path=None, use_cuda=True): diff --git a/dface/core/imagedb.py b/dface/core/imagedb.py index 974658d..86ed58c 100644 --- a/dface/core/imagedb.py +++ b/dface/core/imagedb.py @@ -1,6 +1,7 @@ +from __future__ import print_function import os import numpy as np -from __future__ import print_function + class ImageDB(object): def __init__(self, image_annotation_file, prefix_path='', mode='train'): diff --git a/dface/prepare_data/assemble_onet_imglist.py b/dface/prepare_data/assemble_onet_imglist.py index 3a353ee..e519aa6 100644 --- a/dface/prepare_data/assemble_onet_imglist.py +++ b/dface/prepare_data/assemble_onet_imglist.py @@ -1,7 +1,8 @@ +from __future__ import print_function import os import dface.config as config import dface.prepare_data.assemble as assemble -from __future__ import print_function + if __name__ == '__main__': diff --git a/dface/prepare_data/assemble_pnet_imglist.py b/dface/prepare_data/assemble_pnet_imglist.py index 8ba16f1..e161df9 100644 --- a/dface/prepare_data/assemble_pnet_imglist.py +++ b/dface/prepare_data/assemble_pnet_imglist.py @@ -1,7 +1,8 @@ +from __future__ import print_function import os import dface.config as config import dface.prepare_data.assemble as assemble -from __future__ import print_function + if __name__ == '__main__': diff --git a/dface/prepare_data/assemble_rnet_imglist.py b/dface/prepare_data/assemble_rnet_imglist.py index e658b60..d7cbb68 100644 --- a/dface/prepare_data/assemble_rnet_imglist.py +++ b/dface/prepare_data/assemble_rnet_imglist.py @@ -1,7 +1,8 @@ +from __future__ import print_function import os import dface.config as config import dface.prepare_data.assemble as assemble -from __future__ import print_function + if __name__ == '__main__': diff --git a/dface/prepare_data/gen_Onet_train_data.py b/dface/prepare_data/gen_Onet_train_data.py index 085778a..1be37ef 100644 --- a/dface/prepare_data/gen_Onet_train_data.py +++ b/dface/prepare_data/gen_Onet_train_data.py @@ -1,3 +1,4 @@ +from __future__ import print_function import argparse import cv2 import numpy as np @@ -10,7 +11,7 @@ import cPickle from dface.core.utils import convert_to_square,IoU import dface.config as config import dface.core.vision as vision -from __future__ import print_function + def gen_onet_data(data_dir, anno_file, pnet_model_file, rnet_model_file, prefix_path='', use_cuda=True, vis=False): diff --git a/dface/prepare_data/gen_Pnet_train_data.py b/dface/prepare_data/gen_Pnet_train_data.py index 0c91144..e69255a 100644 --- a/dface/prepare_data/gen_Pnet_train_data.py +++ b/dface/prepare_data/gen_Pnet_train_data.py @@ -1,3 +1,4 @@ +from __future__ import print_function import argparse import numpy as np import cv2 @@ -5,7 +6,7 @@ import os import numpy.random as npr from dface.core.utils import IoU import dface.config as config -from __future__ import print_function + def gen_pnet_data(data_dir,anno_file,prefix): diff --git a/dface/prepare_data/gen_Rnet_train_data.py b/dface/prepare_data/gen_Rnet_train_data.py index 3bd2a77..1a95511 100644 --- a/dface/prepare_data/gen_Rnet_train_data.py +++ b/dface/prepare_data/gen_Rnet_train_data.py @@ -1,3 +1,4 @@ +from __future__ import print_function import argparse import cv2 import numpy as np @@ -10,7 +11,7 @@ import cPickle from dface.core.utils import convert_to_square,IoU import dface.config as config import dface.core.vision as vision -from __future__ import print_function + def gen_rnet_data(data_dir, anno_file, pnet_model_file, prefix_path='', use_cuda=True, vis=False): diff --git a/dface/prepare_data/gen_landmark_12.py b/dface/prepare_data/gen_landmark_12.py index e6bfdaa..7467b4e 100644 --- a/dface/prepare_data/gen_landmark_12.py +++ b/dface/prepare_data/gen_landmark_12.py @@ -1,4 +1,5 @@ # coding: utf-8 +from __future__ import print_function import os import cv2 import numpy as np @@ -7,7 +8,7 @@ import numpy.random as npr import argparse import dface.config as config import dface.core.utils as utils -from __future__ import print_function + def gen_data(anno_file, data_dir, prefix): diff --git a/dface/prepare_data/gen_landmark_24.py b/dface/prepare_data/gen_landmark_24.py index 8b5daa1..8b62e72 100644 --- a/dface/prepare_data/gen_landmark_24.py +++ b/dface/prepare_data/gen_landmark_24.py @@ -1,4 +1,5 @@ # coding: utf-8 +from __future__ import print_function import os import cv2 import numpy as np @@ -8,7 +9,7 @@ import numpy.random as npr import argparse import dface.config as config import dface.core.utils as utils -from __future__ import print_function + def gen_data(anno_file, data_dir, prefix): diff --git a/dface/prepare_data/gen_landmark_48.py b/dface/prepare_data/gen_landmark_48.py index 3183c01..f51448b 100644 --- a/dface/prepare_data/gen_landmark_48.py +++ b/dface/prepare_data/gen_landmark_48.py @@ -1,4 +1,5 @@ # coding: utf-8 +from __future__ import print_function import os import cv2 import numpy as np @@ -8,7 +9,7 @@ import numpy.random as npr import argparse import dface.config as config import dface.core.utils as utils -from __future__ import print_function + def gen_data(anno_file, data_dir, prefix): diff --git a/dface/prepare_data/gen_landmark_net_48.py b/dface/prepare_data/gen_landmark_net_48.py index b7092b3..d62f4f0 100644 --- a/dface/prepare_data/gen_landmark_net_48.py +++ b/dface/prepare_data/gen_landmark_net_48.py @@ -1,5 +1,5 @@ +from __future__ import print_function import argparse - import cv2 import numpy as np from dface.core.detect import MtcnnDetector,create_mtcnn_net @@ -11,7 +11,7 @@ import cPickle from dface.core.utils import convert_to_square,IoU import dface.config as config import dface.core.vision as vision -from __future__ import print_function + def gen_landmark48_data(data_dir, anno_file, pnet_model_file, rnet_model_file, prefix_path='', use_cuda=True, vis=False): diff --git a/dface/train_net/train.py b/dface/train_net/train.py index 1449b8a..161428d 100644 --- a/dface/train_net/train.py +++ b/dface/train_net/train.py @@ -1,3 +1,4 @@ +from __future__ import print_function from dface.core.image_reader import TrainImageReader import datetime import os @@ -5,7 +6,7 @@ from dface.core.models import PNet,RNet,ONet,LossFn import torch from torch.autograd import Variable import dface.core.image_tools as image_tools -from __future__ import print_function + def compute_accuracy(prob_cls, gt_cls): diff --git a/dface/train_net/train_o_net.py b/dface/train_net/train_o_net.py index 4ee8ef4..a3e9911 100644 --- a/dface/train_net/train_o_net.py +++ b/dface/train_net/train_o_net.py @@ -1,10 +1,11 @@ +from __future__ import print_function import argparse import sys from dface.core.imagedb import ImageDB import dface.train_net.train as train import dface.config as config import os -from __future__ import print_function + def train_net(annotation_file, model_store_path, diff --git a/dface/train_net/train_p_net.py b/dface/train_net/train_p_net.py index 85c2dda..cae0ad8 100644 --- a/dface/train_net/train_p_net.py +++ b/dface/train_net/train_p_net.py @@ -1,10 +1,11 @@ +from __future__ import print_function import argparse import sys from dface.core.imagedb import ImageDB from dface.train_net.train import train_pnet import dface.config as config import os -from __future__ import print_function + def train_net(annotation_file, model_store_path, diff --git a/dface/train_net/train_r_net.py b/dface/train_net/train_r_net.py index e3cbac0..285bcc1 100644 --- a/dface/train_net/train_r_net.py +++ b/dface/train_net/train_r_net.py @@ -1,10 +1,11 @@ +from __future__ import print_function import argparse import sys from dface.core.imagedb import ImageDB import dface.train_net.train as train import dface.config as config import os -from __future__ import print_function + def train_net(annotation_file, model_store_path, diff --git a/test_image.py b/test_image.py index e4f8a65..ae70ecd 100644 --- a/test_image.py +++ b/test_image.py @@ -10,7 +10,8 @@ if __name__ == '__main__': r_model = "./model_store/rnet_epoch.pt" o_model = "./model_store/onet_epoch.pt" - pnet, rnet, onet = create_mtcnn_net(p_model_path=p_model, r_model_path=r_model, o_model_path=o_model, use_cuda=True) + #use cpu version set use_cuda=False, if you want to use gpu version set use_cuda=True + pnet, rnet, onet = create_mtcnn_net(p_model_path=p_model, r_model_path=r_model, o_model_path=o_model, use_cuda=False) mtcnn_detector = MtcnnDetector(pnet=pnet, rnet=rnet, onet=onet, min_face_size=24) img = cv2.imread("./test.jpg") @@ -20,4 +21,4 @@ if __name__ == '__main__': bboxs, landmarks = mtcnn_detector.detect_face(img) # print box_align - vision.vis_face(img2,bboxs,landmarks) \ No newline at end of file + vision.vis_face(img2,bboxs,landmarks)