diff --git a/Makefile b/Makefile index 1d1fdf2b..0a029e9c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -GPU=0 -OPENCV=0 +GPU=1 +OPENCV=1 DEBUG=0 ARCH= -arch=sm_52 diff --git a/src/detection.c b/src/detection.c index 96f8521a..84a03b43 100644 --- a/src/detection.c +++ b/src/detection.c @@ -18,7 +18,7 @@ void draw_detection(image im, float *box, int side, char *label) for(c = 0; c < side; ++c){ j = (r*side + c) * elems; int class = max_index(box+j, classes); - if(box[j+class] > .2){ + if(box[j+class] > 0){ printf("%f %s\n", box[j+class], class_names[class]); float red = get_color(0,class,classes); float green = get_color(1,class,classes); @@ -77,9 +77,9 @@ void train_detection(char *cfgfile, char *weightfile) //plist = get_paths("/home/pjreddie/data/voc/no_2012_val.txt"); //plist = get_paths("/home/pjreddie/data/voc/no_2007_test.txt"); //plist = get_paths("/home/pjreddie/data/voc/val_2012.txt"); - plist = get_paths("/home/pjreddie/data/voc/no_2007_test.txt"); + //plist = get_paths("/home/pjreddie/data/voc/no_2007_test.txt"); //plist = get_paths("/home/pjreddie/data/coco/trainval.txt"); - //plist = get_paths("/home/pjreddie/data/voc/all2007-2012.txt"); + plist = get_paths("/home/pjreddie/data/voc/all2007-2012.txt"); } paths = (char **)list_to_array(plist); pthread_t load_thread = load_data_detection_thread(imgs, paths, plist->size, classes, net.w, net.h, side, side, background, &buffer); diff --git a/src/parser.c b/src/parser.c index 240c6eee..2caf96e5 100644 --- a/src/parser.c +++ b/src/parser.c @@ -167,7 +167,7 @@ detection_layer parse_detection(list *options, size_params params) int rescore = option_find_int(options, "rescore", 0); int joint = option_find_int(options, "joint", 0); int objectness = option_find_int(options, "objectness", 0); - int background = option_find_int(options, "background", 1); + int background = option_find_int(options, "background", 0); detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, joint, rescore, background, objectness); option_unused(options); return layer;