From 87f36fc8e900054600048e6cdfe50f5df537f1ae Mon Sep 17 00:00:00 2001 From: kkkim <314127900@qq.com> Date: Thu, 28 Dec 2017 10:31:13 +0800 Subject: [PATCH] print function --- dface/core/detect.py | 2 +- dface/core/imagedb.py | 1 + dface/prepare_data/assemble_onet_imglist.py | 2 +- dface/prepare_data/assemble_pnet_imglist.py | 2 +- dface/prepare_data/assemble_rnet_imglist.py | 2 +- dface/prepare_data/gen_Onet_train_data.py | 3 ++- dface/prepare_data/gen_Pnet_train_data.py | 1 + dface/prepare_data/gen_Rnet_train_data.py | 3 +-- dface/prepare_data/gen_landmark_12.py | 2 +- dface/prepare_data/gen_landmark_24.py | 2 +- dface/prepare_data/gen_landmark_48.py | 2 +- dface/prepare_data/gen_landmark_net_48.py | 2 ++ dface/train_net/train.py | 4 +--- dface/train_net/train_o_net.py | 2 +- dface/train_net/train_p_net.py | 2 +- dface/train_net/train_r_net.py | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dface/core/detect.py b/dface/core/detect.py index cdb53ac..b08b615 100644 --- a/dface/core/detect.py +++ b/dface/core/detect.py @@ -6,7 +6,7 @@ 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 839f0cf..974658d 100644 --- a/dface/core/imagedb.py +++ b/dface/core/imagedb.py @@ -1,5 +1,6 @@ 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 54fa6e3..3a353ee 100644 --- a/dface/prepare_data/assemble_onet_imglist.py +++ b/dface/prepare_data/assemble_onet_imglist.py @@ -1,7 +1,7 @@ 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 3fdba49..8ba16f1 100644 --- a/dface/prepare_data/assemble_pnet_imglist.py +++ b/dface/prepare_data/assemble_pnet_imglist.py @@ -1,7 +1,7 @@ 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 3a7f2ca..e658b60 100644 --- a/dface/prepare_data/assemble_rnet_imglist.py +++ b/dface/prepare_data/assemble_rnet_imglist.py @@ -1,7 +1,7 @@ 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 bbb6fe9..085778a 100644 --- a/dface/prepare_data/gen_Onet_train_data.py +++ b/dface/prepare_data/gen_Onet_train_data.py @@ -1,5 +1,4 @@ import argparse - import cv2 import numpy as np from dface.core.detect import MtcnnDetector,create_mtcnn_net @@ -11,6 +10,8 @@ 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 1d2b598..0c91144 100644 --- a/dface/prepare_data/gen_Pnet_train_data.py +++ b/dface/prepare_data/gen_Pnet_train_data.py @@ -5,6 +5,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 4f8888f..3bd2a77 100644 --- a/dface/prepare_data/gen_Rnet_train_data.py +++ b/dface/prepare_data/gen_Rnet_train_data.py @@ -1,6 +1,4 @@ import argparse - - import cv2 import numpy as np from dface.core.detect import MtcnnDetector,create_mtcnn_net @@ -12,6 +10,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 118e963..e6bfdaa 100644 --- a/dface/prepare_data/gen_landmark_12.py +++ b/dface/prepare_data/gen_landmark_12.py @@ -7,7 +7,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 854e7c2..8b5daa1 100644 --- a/dface/prepare_data/gen_landmark_24.py +++ b/dface/prepare_data/gen_landmark_24.py @@ -8,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_48.py b/dface/prepare_data/gen_landmark_48.py index 98331e4..3183c01 100644 --- a/dface/prepare_data/gen_landmark_48.py +++ b/dface/prepare_data/gen_landmark_48.py @@ -8,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_net_48.py b/dface/prepare_data/gen_landmark_net_48.py index e32e882..b7092b3 100644 --- a/dface/prepare_data/gen_landmark_net_48.py +++ b/dface/prepare_data/gen_landmark_net_48.py @@ -11,6 +11,8 @@ 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 a2c2ac5..1449b8a 100644 --- a/dface/train_net/train.py +++ b/dface/train_net/train.py @@ -5,9 +5,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 51a31a8..4ee8ef4 100644 --- a/dface/train_net/train_o_net.py +++ b/dface/train_net/train_o_net.py @@ -4,7 +4,7 @@ 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 f13f876..85c2dda 100644 --- a/dface/train_net/train_p_net.py +++ b/dface/train_net/train_p_net.py @@ -4,7 +4,7 @@ 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 4424cd1..e3cbac0 100644 --- a/dface/train_net/train_r_net.py +++ b/dface/train_net/train_r_net.py @@ -4,7 +4,7 @@ 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,