ready for push?

This commit is contained in:
Joseph Redmon 2015-11-09 12:06:54 -08:00
parent 8c5364f585
commit 6103ecc401
4 changed files with 7 additions and 24 deletions

View File

@ -1,5 +1,5 @@
GPU=1
OPENCV=1
GPU=0
OPENCV=0
DEBUG=0
ARCH= --gpu-architecture=compute_20 --gpu-code=compute_20

View File

@ -1,6 +1,6 @@
[net]
batch=64
subdivisions=2
subdivisions=64
height=448
width=448
channels=3

View File

@ -48,12 +48,6 @@ void train_imagenet(char *cfgfile, char *weightfile)
pthread_join(load_thread, 0);
train = buffer;
/*
image im = float_to_image(256, 256, 3, train.X.vals[114]);
show_image(im, "training");
cvWaitKey(0);
*/
load_thread = load_data_in_thread(args);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();

View File

@ -46,13 +46,7 @@ void draw_yolo(image im, int num, float thresh, box *boxes, float **probs, char
void train_yolo(char *cfgfile, char *weightfile)
{
//char *train_images = "/home/pjreddie/data/voc/person_detection/2010_person.txt";
//char *train_images = "/home/pjreddie/data/people-art/train.txt";
//char *train_images = "/home/pjreddie/data/voc/test/2012_trainval.txt";
//char *train_images = "/home/pjreddie/data/voc/test/2010_trainval.txt";
char *train_images = "/home/pjreddie/data/voc/test/train.txt";
//char *train_images = "/home/pjreddie/data/voc/test/train_all.txt";
//char *train_images = "/home/pjreddie/data/voc/test/2007_trainval.txt";
char *train_images = "data/voc.0712.trainval";
char *backup_directory = "/home/pjreddie/backup/";
srand(time(0));
data_seed = time(0);
@ -189,12 +183,8 @@ void validate_yolo(char *cfgfile, char *weightfile)
srand(time(0));
char *base = "results/comp4_det_test_";
//base = "/home/pjreddie/comp4_det_test_";
//list *plist = get_paths("/home/pjreddie/data/people-art/test.txt");
//list *plist = get_paths("/home/pjreddie/data/cubist/test.txt");
list *plist = get_paths("/home/pjreddie/data/voc/test/2007_test.txt");
//list *plist = get_paths("/home/pjreddie/data/voc/test_2012.txt");
//list *plist = get_paths("data/voc.2007.test");
list *plist = get_paths("data/voc.2012.test");
char **paths = (char **)list_to_array(plist);
layer l = net.layers[net.n-1];
@ -282,7 +272,7 @@ void validate_yolo_recall(char *cfgfile, char *weightfile)
srand(time(0));
char *base = "results/comp4_det_test_";
list *plist = get_paths("/home/pjreddie/data/voc/test/2007_test.txt");
list *plist = get_paths("data/voc.2007.test");
char **paths = (char **)list_to_array(plist);
layer l = net.layers[net.n-1];
@ -373,7 +363,6 @@ void test_yolo(char *cfgfile, char *weightfile, char *filename, float thresh)
char *input = buff;
int j;
float nms=.5;
printf("%d %d %d", l.side, l.n, l.classes);
box *boxes = calloc(l.side*l.side*l.n, sizeof(box));
float **probs = calloc(l.side*l.side*l.n, sizeof(float *));
for(j = 0; j < l.side*l.side*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));