mirror
/
darknet
mirror of https://github.com/pjreddie/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MERRY CHRISTMAS I BROKE ALL YOUR DETECTION THINGS

This commit is contained in:
Joseph Redmon 2017-12-26 10:52:21 -08:00
parent 80d9bec20f
commit 6e79145309
36 changed files with 1166 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,7 +1,7 @@
GPU=0 GPU=1
CUDNN=0 CUDNN=1
OPENCV=0 OPENCV=1
OPENMP=0 OPENMP=1
DEBUG=0 DEBUG=0
ARCH= -gencode arch=compute_30,code=sm_30 \ ARCH= -gencode arch=compute_30,code=sm_30 \
@ -57,8 +57,8 @@ CFLAGS+= -DCUDNN
LDFLAGS+= -lcudnn LDFLAGS+= -lcudnn
endif endif
OBJ=gemm.o utils.o cuda.o deconvolutional_layer.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o detection_layer.o route_layer.o box.o normalization_layer.o avgpool_layer.o layer.o local_layer.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o crnn_layer.o demo.o batchnorm_layer.o region_layer.o reorg_layer.o tree.o lstm_layer.o OBJ=gemm.o utils.o cuda.o deconvolutional_layer.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o detection_layer.o route_layer.o upsample_layer.o box.o normalization_layer.o avgpool_layer.o layer.o local_layer.o shortcut_layer.o logistic_layer.o activation_layer.o rnn_layer.o gru_layer.o crnn_layer.o demo.o batchnorm_layer.o region_layer.o reorg_layer.o tree.o lstm_layer.o
EXECOBJA=captcha.o lsd.o super.o art.o tag.o cifar.o go.o rnn.o segmenter.o regressor.o classifier.o coco.o yolo.o detector.o nightmare.o attention.o darknet.o EXECOBJA=captcha.o lsd.o super.o art.o tag.o cifar.o go.o rnn.o segmenter.o regressor.o classifier.o coco.o yolo.o detector.o nightmare.o darknet.o
ifeq ($(GPU), 1) ifeq ($(GPU), 1)
LDFLAGS+= -lstdc++ LDFLAGS+= -lstdc++
OBJ+=convolutional_kernels.o deconvolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o avgpool_layer_kernels.o OBJ+=convolutional_kernels.o deconvolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o avgpool_layer_kernels.o

10
cfg/darknet.cfg
View File

@ -1,12 +1,12 @@
[net] [net]
# Train # Train
# batch=128
# subdivisions=1
# Test
batch=1 batch=1
subdivisions=1 subdivisions=1
# Test height=256
# batch=1 width=256
# subdivisions=1
height=224
width=224
channels=3 channels=3
momentum=0.9 momentum=0.9
decay=0.0005 decay=0.0005

2
cfg/tiny-yolo.cfg
View File

@ -120,7 +120,7 @@ filters=425
activation=linear activation=linear
[region] [region]
anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 anchors = 18.3274,21.6763, 59.9827,66.001, 106.83,175.179, 252.25,112.889, 312.657,293.385
bias_match=1 bias_match=1
classes=80 classes=80
coords=4 coords=4

10
cfg/yolo.cfg
View File

@ -1,10 +1,10 @@
[net] [net]
# Testing # Testing
batch=1 # batch=1
subdivisions=1 # subdivisions=1
# Training # Training
# batch=64 batch=64
# subdivisions=8 subdivisions=8
width=608 width=608
height=608 height=608
channels=3 channels=3
@ -239,7 +239,7 @@ activation=linear
[region] [region]
anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 anchors = 18.3274,21.6763, 59.9827,66.001, 106.83,175.179, 252.25,112.889, 312.657,293.385
bias_match=1 bias_match=1
classes=80 classes=80
coords=4 coords=4

53
examples/classifier.c
View File

@ -403,6 +403,7 @@ void validate_classifier_single(char *datacfg, char *filename, char *weightfile)
if(indexes[j] == class) avg_topk += 1; if(indexes[j] == class) avg_topk += 1;
} }
printf("%s, %d, %f, %f, \n", paths[i], class, pred[0], pred[1]);
printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1)); printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1));
} }
} }
@ -704,6 +705,44 @@ void test_classifier(char *datacfg, char *cfgfile, char *weightfile, int target_
} }
} }
void file_output_classifier(char *datacfg, char *filename, char *weightfile, char *listfile)
{
int i,j;
network *net = load_network(filename, weightfile, 0);
set_batch_network(net, 1);
srand(time(0));
list *options = read_data_cfg(datacfg);
//char *label_list = option_find_str(options, "names", "data/labels.list");
int classes = option_find_int(options, "classes", 2);
list *plist = get_paths(listfile);
char **paths = (char **)list_to_array(plist);
int m = plist->size;
free_list(plist);
for(i = 0; i < m; ++i){
image im = load_image_color(paths[i], 0, 0);
image resized = resize_min(im, net->w);
image crop = crop_image(resized, (resized.w - net->w)/2, (resized.h - net->h)/2, net->w, net->h);
float *pred = network_predict(net, crop.data);
if(net->hierarchy) hierarchy_predictions(pred, net->outputs, net->hierarchy, 0, 1);
if(resized.data != im.data) free_image(resized);
free_image(im);
free_image(crop);
printf("%s", paths[i]);
for(j = 0; j < classes; ++j){
printf("\t%g", pred[j]);
}
printf("\n");
}
}
void threat_classifier(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename) void threat_classifier(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename)
{ {
@ -922,15 +961,26 @@ void demo_classifier(char *datacfg, char *cfgfile, char *weightfile, int cam_ind
srand(2222222); srand(2222222);
CvCapture * cap; CvCapture * cap;
int w = 1280;
int h = 720;
if(filename){ if(filename){
cap = cvCaptureFromFile(filename); cap = cvCaptureFromFile(filename);
}else{ }else{
cap = cvCaptureFromCAM(cam_index); cap = cvCaptureFromCAM(cam_index);
} }
if(w){
cvSetCaptureProperty(cap, CV_CAP_PROP_FRAME_WIDTH, w);
}
if(h){
cvSetCaptureProperty(cap, CV_CAP_PROP_FRAME_HEIGHT, h);
}
int top = option_find_int(options, "top", 1); int top = option_find_int(options, "top", 1);
char *name_list = option_find_str(options, "names", 0); char *label_list = option_find_str(options, "labels", 0);
char *name_list = option_find_str(options, "names", label_list);
char **names = get_labels(name_list); char **names = get_labels(name_list);
int *indexes = calloc(top, sizeof(int)); int *indexes = calloc(top, sizeof(int));
@ -998,6 +1048,7 @@ void run_classifier(int argc, char **argv)
char *layer_s = (argc > 7) ? argv[7]: 0; char *layer_s = (argc > 7) ? argv[7]: 0;
int layer = layer_s ? atoi(layer_s) : -1; int layer = layer_s ? atoi(layer_s) : -1;
if(0==strcmp(argv[2], "predict")) predict_classifier(data, cfg, weights, filename, top); if(0==strcmp(argv[2], "predict")) predict_classifier(data, cfg, weights, filename, top);
else if(0==strcmp(argv[2], "fout")) file_output_classifier(data, cfg, weights, filename);
else if(0==strcmp(argv[2], "try")) try_classifier(data, cfg, weights, filename, atoi(layer_s)); else if(0==strcmp(argv[2], "try")) try_classifier(data, cfg, weights, filename, atoi(layer_s));
else if(0==strcmp(argv[2], "train")) train_classifier(data, cfg, weights, gpus, ngpus, clear); else if(0==strcmp(argv[2], "train")) train_classifier(data, cfg, weights, gpus, ngpus, clear);
else if(0==strcmp(argv[2], "demo")) demo_classifier(data, cfg, weights, cam_index, filename); else if(0==strcmp(argv[2], "demo")) demo_classifier(data, cfg, weights, cam_index, filename);

53
examples/coco.c
View File

@ -94,14 +94,14 @@ void train_coco(char *cfgfile, char *weightfile)
save_weights(net, buff); save_weights(net, buff);
} }
void print_cocos(FILE *fp, int image_id, box *boxes, float **probs, int num_boxes, int classes, int w, int h) static void print_cocos(FILE *fp, int image_id, detection *dets, int num_boxes, int classes, int w, int h)
{ {
int i, j; int i, j;
for(i = 0; i < num_boxes; ++i){ for(i = 0; i < num_boxes; ++i){
float xmin = boxes[i].x - boxes[i].w/2.; float xmin = dets[i].bbox.x - dets[i].bbox.w/2.;
float xmax = boxes[i].x + boxes[i].w/2.; float xmax = dets[i].bbox.x + dets[i].bbox.w/2.;
float ymin = boxes[i].y - boxes[i].h/2.; float ymin = dets[i].bbox.y - dets[i].bbox.h/2.;
float ymax = boxes[i].y + boxes[i].h/2.; float ymax = dets[i].bbox.y + dets[i].bbox.h/2.;
if (xmin < 0) xmin = 0; if (xmin < 0) xmin = 0;
if (ymin < 0) ymin = 0; if (ymin < 0) ymin = 0;
@ -114,7 +114,7 @@ void print_cocos(FILE *fp, int image_id, box *boxes, float **probs, int num_boxe
float bh = ymax - ymin; float bh = ymax - ymin;
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
if (probs[i][j]) fprintf(fp, "{\"image_id\":%d, \"category_id\":%d, \"bbox\":[%f, %f, %f, %f], \"score\":%f},\n", image_id, coco_ids[j], bx, by, bw, bh, probs[i][j]); if (dets[i].prob[j]) fprintf(fp, "{\"image_id\":%d, \"category_id\":%d, \"bbox\":[%f, %f, %f, %f], \"score\":%f},\n", image_id, coco_ids[j], bx, by, bw, bh, dets[i].prob[j]);
} }
} }
} }
@ -140,17 +140,13 @@ void validate_coco(char *cfg, char *weights)
layer l = net->layers[net->n-1]; layer l = net->layers[net->n-1];
int classes = l.classes; int classes = l.classes;
int side = l.side;
int j;
char buff[1024]; char buff[1024];
snprintf(buff, 1024, "%s/coco_results.json", base); snprintf(buff, 1024, "%s/coco_results.json", base);
FILE *fp = fopen(buff, "w"); FILE *fp = fopen(buff, "w");
fprintf(fp, "[\n"); fprintf(fp, "[\n");
box *boxes = calloc(side*side*l.n, sizeof(box)); detection *dets = make_network_boxes(net);
float **probs = calloc(side*side*l.n, sizeof(float *));
for(j = 0; j < side*side*l.n; ++j) probs[j] = calloc(classes, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -199,9 +195,9 @@ void validate_coco(char *cfg, char *weights)
network_predict(net, X); network_predict(net, X);
int w = val[t].w; int w = val[t].w;
int h = val[t].h; int h = val[t].h;
get_detection_boxes(l, w, h, thresh, probs, boxes, 0); fill_network_boxes(net, w, h, thresh, 0, 0, 0, dets);
if (nms) do_nms_sort(boxes, probs, side*side*l.n, classes, iou_thresh); if (nms) do_nms_sort(dets, l.side*l.side*l.n, classes, iou_thresh);
print_cocos(fp, image_id, boxes, probs, side*side*l.n, classes, w, h); print_cocos(fp, image_id, dets, l.side*l.side*l.n, classes, w, h);
free_image(val[t]); free_image(val[t]);
free_image(val_resized[t]); free_image(val_resized[t]);
} }
@ -235,9 +231,7 @@ void validate_coco_recall(char *cfgfile, char *weightfile)
snprintf(buff, 1024, "%s%s.txt", base, coco_classes[j]); snprintf(buff, 1024, "%s%s.txt", base, coco_classes[j]);
fps[j] = fopen(buff, "w"); fps[j] = fopen(buff, "w");
} }
box *boxes = calloc(side*side*l.n, sizeof(box)); detection *dets = make_network_boxes(net);
float **probs = calloc(side*side*l.n, sizeof(float *));
for(j = 0; j < side*side*l.n; ++j) probs[j] = calloc(classes, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -245,7 +239,6 @@ void validate_coco_recall(char *cfgfile, char *weightfile)
float thresh = .001; float thresh = .001;
int nms = 0; int nms = 0;
float iou_thresh = .5; float iou_thresh = .5;
float nms_thresh = .5;
int total = 0; int total = 0;
int correct = 0; int correct = 0;
@ -258,8 +251,9 @@ void validate_coco_recall(char *cfgfile, char *weightfile)
image sized = resize_image(orig, net->w, net->h); image sized = resize_image(orig, net->w, net->h);
char *id = basecfg(path); char *id = basecfg(path);
network_predict(net, sized.data); network_predict(net, sized.data);
get_detection_boxes(l, 1, 1, thresh, probs, boxes, 1);
if (nms) do_nms(boxes, probs, side*side*l.n, 1, nms_thresh); fill_network_boxes(net, orig.w, orig.h, thresh, 0, 0, 1, dets);
if (nms) do_nms_obj(dets, side*side*l.n, 1, nms);
char labelpath[4096]; char labelpath[4096];
find_replace(path, "images", "labels", labelpath); find_replace(path, "images", "labels", labelpath);
@ -270,7 +264,7 @@ void validate_coco_recall(char *cfgfile, char *weightfile)
int num_labels = 0; int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels); box_label *truth = read_boxes(labelpath, &num_labels);
for(k = 0; k < side*side*l.n; ++k){ for(k = 0; k < side*side*l.n; ++k){
if(probs[k][0] > thresh){ if(dets[k].objectness > thresh){
++proposals; ++proposals;
} }
} }
@ -279,8 +273,8 @@ void validate_coco_recall(char *cfgfile, char *weightfile)
box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h}; box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h};
float best_iou = 0; float best_iou = 0;
for(k = 0; k < side*side*l.n; ++k){ for(k = 0; k < side*side*l.n; ++k){
float iou = box_iou(boxes[k], t); float iou = box_iou(dets[k].bbox, t);
if(probs[k][0] > thresh && iou > best_iou){ if(dets[k].objectness > thresh && iou > best_iou){
best_iou = iou; best_iou = iou;
} }
} }
@ -308,10 +302,7 @@ void test_coco(char *cfgfile, char *weightfile, char *filename, float thresh)
clock_t time; clock_t time;
char buff[256]; char buff[256];
char *input = buff; char *input = buff;
int j; detection *dets = make_network_boxes(net);
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 *));
while(1){ while(1){
if(filename){ if(filename){
strncpy(input, filename, 256); strncpy(input, filename, 256);
@ -328,9 +319,11 @@ void test_coco(char *cfgfile, char *weightfile, char *filename, float thresh)
time=clock(); time=clock();
network_predict(net, X); network_predict(net, X);
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time)); printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
get_detection_boxes(l, 1, 1, thresh, probs, boxes, 0);
if (nms) do_nms_sort(boxes, probs, l.side*l.side*l.n, l.classes, nms); fill_network_boxes(net, 1, 1, thresh, 0, 0, 0, dets);
draw_detections(im, l.side*l.side*l.n, thresh, boxes, probs, 0, coco_classes, alphabet, 80); if (nms) do_nms_sort(dets, l.side*l.side*l.n, l.classes, nms);
draw_detections(im, dets, l.side*l.side*l.n, thresh, coco_classes, alphabet, 80);
save_image(im, "prediction"); save_image(im, "prediction");
show_image(im, "predictions"); show_image(im, "predictions");
free_image(im); free_image(im);

3
examples/darknet.c
View File

@ -12,7 +12,6 @@ extern void run_coco(int argc, char **argv);
extern void run_captcha(int argc, char **argv); extern void run_captcha(int argc, char **argv);
extern void run_nightmare(int argc, char **argv); extern void run_nightmare(int argc, char **argv);
extern void run_classifier(int argc, char **argv); extern void run_classifier(int argc, char **argv);
extern void run_attention(int argc, char **argv);
extern void run_regressor(int argc, char **argv); extern void run_regressor(int argc, char **argv);
extern void run_segmenter(int argc, char **argv); extern void run_segmenter(int argc, char **argv);
extern void run_char_rnn(int argc, char **argv); extern void run_char_rnn(int argc, char **argv);
@ -432,8 +431,6 @@ int main(int argc, char **argv)
predict_classifier("cfg/imagenet1k.data", argv[2], argv[3], argv[4], 5); predict_classifier("cfg/imagenet1k.data", argv[2], argv[3], argv[4], 5);
} else if (0 == strcmp(argv[1], "classifier")){ } else if (0 == strcmp(argv[1], "classifier")){
run_classifier(argc, argv); run_classifier(argc, argv);
} else if (0 == strcmp(argv[1], "attention")){
run_attention(argc, argv);
} else if (0 == strcmp(argv[1], "regressor")){ } else if (0 == strcmp(argv[1], "regressor")){
run_regressor(argc, argv); run_regressor(argc, argv);
} else if (0 == strcmp(argv[1], "segmenter")){ } else if (0 == strcmp(argv[1], "segmenter")){

159
examples/detector.c
View File

@ -2,6 +2,7 @@
static int coco_ids[] = {1,2,3,4,5,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,27,28,31,32,33,34,35,36,37,38,39,40,41,42,43,44,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,70,72,73,74,75,76,77,78,79,80,81,82,84,85,86,87,88,89,90}; static int coco_ids[] = {1,2,3,4,5,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,27,28,31,32,33,34,35,36,37,38,39,40,41,42,43,44,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,70,72,73,74,75,76,77,78,79,80,81,82,84,85,86,87,88,89,90};
void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear) void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear)
{ {
list *options = read_data_cfg(datacfg); list *options = read_data_cfg(datacfg);
@ -73,6 +74,7 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i
free_data(train); free_data(train);
load_thread = load_data(args); load_thread = load_data(args);
#pragma omp parallel for
for(i = 0; i < ngpus; ++i){ for(i = 0; i < ngpus; ++i){
resize_network(nets[i], dim, dim); resize_network(nets[i], dim, dim);
} }
@ -84,28 +86,28 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i
load_thread = load_data(args); load_thread = load_data(args);
/* /*
int k; int k;
for(k = 0; k < l.max_boxes; ++k){ for(k = 0; k < l.max_boxes; ++k){
box b = float_to_box(train.y.vals[10] + 1 + k*5); box b = float_to_box(train.y.vals[10] + 1 + k*5);
if(!b.x) break; if(!b.x) break;
printf("loaded: %f %f %f %f\n", b.x, b.y, b.w, b.h); printf("loaded: %f %f %f %f\n", b.x, b.y, b.w, b.h);
} }
*/ */
/* /*
int zz; int zz;
for(zz = 0; zz < train.X.cols; ++zz){ for(zz = 0; zz < train.X.cols; ++zz){
image im = float_to_image(net->w, net->h, 3, train.X.vals[zz]); image im = float_to_image(net->w, net->h, 3, train.X.vals[zz]);
int k; int k;
for(k = 0; k < l.max_boxes; ++k){ for(k = 0; k < l.max_boxes; ++k){
box b = float_to_box(train.y.vals[zz] + k*5, 1); box b = float_to_box(train.y.vals[zz] + k*5, 1);
printf("%f %f %f %f\n", b.x, b.y, b.w, b.h); printf("%f %f %f %f\n", b.x, b.y, b.w, b.h);
draw_bbox(im, b, 1, 1,0,0); draw_bbox(im, b, 1, 1,0,0);
} }
show_image(im, "truth11"); show_image(im, "truth11");
cvWaitKey(0); cvWaitKey(0);
save_image(im, "truth11"); save_image(im, "truth11");
} }
*/ */
printf("Loaded: %lf seconds\n", what_time_is_it_now()-time); printf("Loaded: %lf seconds\n", what_time_is_it_now()-time);
@ -158,15 +160,15 @@ static int get_coco_image_id(char *filename)
return atoi(p+1); return atoi(p+1);
} }
static void print_cocos(FILE *fp, char *image_path, box *boxes, float **probs, int num_boxes, int classes, int w, int h) static void print_cocos(FILE *fp, char *image_path, detection *dets, int num_boxes, int classes, int w, int h)
{ {
int i, j; int i, j;
int image_id = get_coco_image_id(image_path); int image_id = get_coco_image_id(image_path);
for(i = 0; i < num_boxes; ++i){ for(i = 0; i < num_boxes; ++i){
float xmin = boxes[i].x - boxes[i].w/2.; float xmin = dets[i].bbox.x - dets[i].bbox.w/2.;
float xmax = boxes[i].x + boxes[i].w/2.; float xmax = dets[i].bbox.x + dets[i].bbox.w/2.;
float ymin = boxes[i].y - boxes[i].h/2.; float ymin = dets[i].bbox.y - dets[i].bbox.h/2.;
float ymax = boxes[i].y + boxes[i].h/2.; float ymax = dets[i].bbox.y + dets[i].bbox.h/2.;
if (xmin < 0) xmin = 0; if (xmin < 0) xmin = 0;
if (ymin < 0) ymin = 0; if (ymin < 0) ymin = 0;
@ -179,19 +181,19 @@ static void print_cocos(FILE *fp, char *image_path, box *boxes, float **probs, i
float bh = ymax - ymin; float bh = ymax - ymin;
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
if (probs[i][j]) fprintf(fp, "{\"image_id\":%d, \"category_id\":%d, \"bbox\":[%f, %f, %f, %f], \"score\":%f},\n", image_id, coco_ids[j], bx, by, bw, bh, probs[i][j]); if (dets[i].prob[j]) fprintf(fp, "{\"image_id\":%d, \"category_id\":%d, \"bbox\":[%f, %f, %f, %f], \"score\":%f},\n", image_id, coco_ids[j], bx, by, bw, bh, dets[i].prob[j]);
} }
} }
} }
void print_detector_detections(FILE **fps, char *id, box *boxes, float **probs, int total, int classes, int w, int h) void print_detector_detections(FILE **fps, char *id, detection *dets, int total, int classes, int w, int h)
{ {
int i, j; int i, j;
for(i = 0; i < total; ++i){ for(i = 0; i < total; ++i){
float xmin = boxes[i].x - boxes[i].w/2. + 1; float xmin = dets[i].bbox.x - dets[i].bbox.w/2. + 1;
float xmax = boxes[i].x + boxes[i].w/2. + 1; float xmax = dets[i].bbox.x + dets[i].bbox.w/2. + 1;
float ymin = boxes[i].y - boxes[i].h/2. + 1; float ymin = dets[i].bbox.y - dets[i].bbox.h/2. + 1;
float ymax = boxes[i].y + boxes[i].h/2. + 1; float ymax = dets[i].bbox.y + dets[i].bbox.h/2. + 1;
if (xmin < 1) xmin = 1; if (xmin < 1) xmin = 1;
if (ymin < 1) ymin = 1; if (ymin < 1) ymin = 1;
@ -199,20 +201,20 @@ void print_detector_detections(FILE **fps, char *id, box *boxes, float **probs,
if (ymax > h) ymax = h; if (ymax > h) ymax = h;
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
if (probs[i][j]) fprintf(fps[j], "%s %f %f %f %f %f\n", id, probs[i][j], if (dets[i].prob[j]) fprintf(fps[j], "%s %f %f %f %f %f\n", id, dets[i].prob[j],
xmin, ymin, xmax, ymax); xmin, ymin, xmax, ymax);
} }
} }
} }
void print_imagenet_detections(FILE *fp, int id, box *boxes, float **probs, int total, int classes, int w, int h) void print_imagenet_detections(FILE *fp, int id, detection *dets, int total, int classes, int w, int h)
{ {
int i, j; int i, j;
for(i = 0; i < total; ++i){ for(i = 0; i < total; ++i){
float xmin = boxes[i].x - boxes[i].w/2.; float xmin = dets[i].bbox.x - dets[i].bbox.w/2.;
float xmax = boxes[i].x + boxes[i].w/2.; float xmax = dets[i].bbox.x + dets[i].bbox.w/2.;
float ymin = boxes[i].y - boxes[i].h/2.; float ymin = dets[i].bbox.y - dets[i].bbox.h/2.;
float ymax = boxes[i].y + boxes[i].h/2.; float ymax = dets[i].bbox.y + dets[i].bbox.h/2.;
if (xmin < 0) xmin = 0; if (xmin < 0) xmin = 0;
if (ymin < 0) ymin = 0; if (ymin < 0) ymin = 0;
@ -221,7 +223,7 @@ void print_imagenet_detections(FILE *fp, int id, box *boxes, float **probs, int
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
int class = j; int class = j;
if (probs[i][class]) fprintf(fp, "%d %d %f %f %f %f %f\n", id, j+1, probs[i][class], if (dets[i].prob[class]) fprintf(fp, "%d %d %f %f %f %f %f\n", id, j+1, dets[i].prob[class],
xmin, ymin, xmax, ymax); xmin, ymin, xmax, ymax);
} }
} }
@ -277,10 +279,7 @@ void validate_detector_flip(char *datacfg, char *cfgfile, char *weightfile, char
} }
} }
detection *dets = make_network_boxes(net);
box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(classes+1, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -334,14 +333,14 @@ void validate_detector_flip(char *datacfg, char *cfgfile, char *weightfile, char
network_predict(net, input.data); network_predict(net, input.data);
int w = val[t].w; int w = val[t].w;
int h = val[t].h; int h = val[t].h;
get_region_boxes(l, w, h, net->w, net->h, thresh, probs, boxes, 0, 0, map, .5, 0); fill_network_boxes(net, w, h, thresh, .5, map, 0, dets);
if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, classes, nms); if (nms) do_nms_sort(dets, l.w*l.h*l.n, classes, nms);
if (coco){ if (coco){
print_cocos(fp, path, boxes, probs, l.w*l.h*l.n, classes, w, h); print_cocos(fp, path, dets, l.w*l.h*l.n, classes, w, h);
} else if (imagenet){ } else if (imagenet){
print_imagenet_detections(fp, i+t-nthreads+1, boxes, probs, l.w*l.h*l.n, classes, w, h); print_imagenet_detections(fp, i+t-nthreads+1, dets, l.w*l.h*l.n, classes, w, h);
} else { } else {
print_detector_detections(fps, id, boxes, probs, l.w*l.h*l.n, classes, w, h); print_detector_detections(fps, id, dets, l.w*l.h*l.n, classes, w, h);
} }
free(id); free(id);
free_image(val[t]); free_image(val[t]);
@ -410,10 +409,8 @@ void validate_detector(char *datacfg, char *cfgfile, char *weightfile, char *out
} }
} }
detection *dets = make_network_boxes(net);
box *boxes = calloc(l.w*l.h*l.n, sizeof(box)); int nboxes = num_boxes(net);
float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(classes+1, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -462,14 +459,14 @@ void validate_detector(char *datacfg, char *cfgfile, char *weightfile, char *out
network_predict(net, X); network_predict(net, X);
int w = val[t].w; int w = val[t].w;
int h = val[t].h; int h = val[t].h;
get_region_boxes(l, w, h, net->w, net->h, thresh, probs, boxes, 0, 0, map, .5, 0); fill_network_boxes(net, w, h, thresh, .5, map, 0, dets);
if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, classes, nms); if (nms) do_nms_sort(dets, nboxes, classes, nms);
if (coco){ if (coco){
print_cocos(fp, path, boxes, probs, l.w*l.h*l.n, classes, w, h); print_cocos(fp, path, dets, nboxes, classes, w, h);
} else if (imagenet){ } else if (imagenet){
print_imagenet_detections(fp, i+t-nthreads+1, boxes, probs, l.w*l.h*l.n, classes, w, h); print_imagenet_detections(fp, i+t-nthreads+1, dets, nboxes, classes, w, h);
} else { } else {
print_detector_detections(fps, id, boxes, probs, l.w*l.h*l.n, classes, w, h); print_detector_detections(fps, id, dets, nboxes, classes, w, h);
} }
free(id); free(id);
free_image(val[t]); free_image(val[t]);
@ -498,12 +495,9 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
char **paths = (char **)list_to_array(plist); char **paths = (char **)list_to_array(plist);
layer l = net->layers[net->n-1]; layer l = net->layers[net->n-1];
int classes = l.classes;
int j, k; int j, k;
box *boxes = calloc(l.w*l.h*l.n, sizeof(box)); detection *dets = make_network_boxes(net);
float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(classes+1, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -516,6 +510,7 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
int correct = 0; int correct = 0;
int proposals = 0; int proposals = 0;
float avg_iou = 0; float avg_iou = 0;
int nboxes = num_boxes(net);
for(i = 0; i < m; ++i){ for(i = 0; i < m; ++i){
char *path = paths[i]; char *path = paths[i];
@ -523,8 +518,8 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
image sized = resize_image(orig, net->w, net->h); image sized = resize_image(orig, net->w, net->h);
char *id = basecfg(path); char *id = basecfg(path);
network_predict(net, sized.data); network_predict(net, sized.data);
get_region_boxes(l, sized.w, sized.h, net->w, net->h, thresh, probs, boxes, 0, 1, 0, .5, 1); fill_network_boxes(net, sized.w, sized.h, thresh, .5, 0, 1, dets);
if (nms) do_nms(boxes, probs, l.w*l.h*l.n, 1, nms); if (nms) do_nms_obj(dets, nboxes, 1, nms);
char labelpath[4096]; char labelpath[4096];
find_replace(path, "images", "labels", labelpath); find_replace(path, "images", "labels", labelpath);
@ -534,8 +529,8 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
int num_labels = 0; int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels); box_label *truth = read_boxes(labelpath, &num_labels);
for(k = 0; k < l.w*l.h*l.n; ++k){ for(k = 0; k < nboxes; ++k){
if(probs[k][0] > thresh){ if(dets[k].objectness > thresh){
++proposals; ++proposals;
} }
} }
@ -544,8 +539,8 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h}; box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h};
float best_iou = 0; float best_iou = 0;
for(k = 0; k < l.w*l.h*l.n; ++k){ for(k = 0; k < l.w*l.h*l.n; ++k){
float iou = box_iou(boxes[k], t); float iou = box_iou(dets[k].bbox, t);
if(probs[k][0] > thresh && iou > best_iou){ if(dets[k].objectness > thresh && iou > best_iou){
best_iou = iou; best_iou = iou;
} }
} }
@ -562,6 +557,7 @@ void validate_detector_recall(char *cfgfile, char *weightfile)
} }
} }
void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, float hier_thresh, char *outfile, int fullscreen) void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, float hier_thresh, char *outfile, int fullscreen)
{ {
list *options = read_data_cfg(datacfg); list *options = read_data_cfg(datacfg);
@ -575,7 +571,6 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
double time; double time;
char buff[256]; char buff[256];
char *input = buff; char *input = buff;
int j;
float nms=.3; float nms=.3;
while(1){ while(1){
if(filename){ if(filename){
@ -595,23 +590,18 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
//resize_network(net, sized.w, sized.h); //resize_network(net, sized.w, sized.h);
layer l = net->layers[net->n-1]; layer l = net->layers[net->n-1];
box *boxes = calloc(l.w*l.h*l.n, sizeof(box)); int nboxes = num_boxes(net);
float **probs = calloc(l.w*l.h*l.n, sizeof(float *)); printf("%d\n", nboxes);
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes + 1, sizeof(float *));
float **masks = 0;
if (l.coords > 4){
masks = calloc(l.w*l.h*l.n, sizeof(float*));
for(j = 0; j < l.w*l.h*l.n; ++j) masks[j] = calloc(l.coords-4, sizeof(float *));
}
float *X = sized.data; float *X = sized.data;
time=what_time_is_it_now(); time=what_time_is_it_now();
network_predict(net, X); network_predict(net, X);
printf("%s: Predicted in %f seconds.\n", input, what_time_is_it_now()-time); printf("%s: Predicted in %f seconds.\n", input, what_time_is_it_now()-time);
get_region_boxes(l, im.w, im.h, net->w, net->h, thresh, probs, boxes, masks, 0, 0, hier_thresh, 1); detection *dets = get_network_boxes(net, im.w, im.h, thresh, hier_thresh, 0, 1);
//if (nms) do_nms_obj(boxes, probs, l.w*l.h*l.n, l.classes, nms); //if (nms) do_nms_obj(boxes, probs, l.w*l.h*l.n, l.classes, nms);
if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, l.classes, nms); if (nms) do_nms_sort(dets, nboxes, l.classes, nms);
draw_detections(im, l.w*l.h*l.n, thresh, boxes, probs, masks, names, alphabet, l.classes); draw_detections(im, dets, nboxes, thresh, names, alphabet, l.classes);
free_detections(dets, num_boxes(net));
if(outfile){ if(outfile){
save_image(im, outfile); save_image(im, outfile);
} }
@ -630,12 +620,19 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
free_image(im); free_image(im);
free_image(sized); free_image(sized);
free(boxes);
free_ptrs((void **)probs, l.w*l.h*l.n);
if (filename) break; if (filename) break;
} }
} }
void network_detect(network *net, image im, float thresh, float hier_thresh, float nms, detection *dets)
{
network_predict_image(net, im);
layer l = net->layers[net->n-1];
int nboxes = num_boxes(net);
fill_network_boxes(net, im.w, im.h, thresh, hier_thresh, 0, 0, dets);
if (nms) do_nms_sort(dets, nboxes, l.classes, nms);
}
void run_detector(int argc, char **argv) void run_detector(int argc, char **argv)
{ {
char *prefix = find_char_arg(argc, argv, "-prefix", 0); char *prefix = find_char_arg(argc, argv, "-prefix", 0);

527
examples/lsd.c
View File

@ -408,6 +408,8 @@ void test_dcgan(char *cfgfile, char *weightfile)
for(i = 0; i < im.w*im.h*im.c; ++i){ for(i = 0; i < im.w*im.h*im.c; ++i){
im.data[i] = rand_normal(); im.data[i] = rand_normal();
} }
float mag = mag_array(im.data, im.w*im.h*im.c);
//scale_array(im.data, im.w*im.h*im.c, 1./mag);
float *X = im.data; float *X = im.data;
time=clock(); time=clock();
@ -426,21 +428,10 @@ void test_dcgan(char *cfgfile, char *weightfile)
} }
} }
void dcgan_batch(network gnet, network anet)
{
//float *input = calloc(x_size, sizeof(float));
}
void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear, int display, char *train_images) void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear, int display, char *train_images)
{ {
#ifdef GPU #ifdef GPU
//char *train_images = "/home/pjreddie/data/coco/train1.txt";
//char *train_images = "/home/pjreddie/data/coco/trainvalno5k.txt";
//char *train_images = "/home/pjreddie/data/imagenet/imagenet1k.train.list";
//char *train_images = "data/64.txt";
//char *train_images = "data/alp.txt";
//char *train_images = "data/cifar.txt";
char *backup_directory = "/home/pjreddie/backup/"; char *backup_directory = "/home/pjreddie/backup/";
srand(time(0)); srand(time(0));
char *base = basecfg(cfg); char *base = basecfg(cfg);
@ -498,7 +489,7 @@ void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear,
//data generated = copy_data(train); //data generated = copy_data(train);
while (get_current_batch(gnet) < gnet->max_batches) { while (get_current_batch(gnet) < gnet->max_batches) {
start += 1; start += 1;
i += 1; i += 1;
time=clock(); time=clock();
pthread_join(load_thread, 0); pthread_join(load_thread, 0);
@ -513,8 +504,8 @@ void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear,
data gen = copy_data(train); data gen = copy_data(train);
for (j = 0; j < imgs; ++j) { for (j = 0; j < imgs; ++j) {
train.y.vals[j][0] = .95; train.y.vals[j][0] = 1;
gen.y.vals[j][0] = .05; gen.y.vals[j][0] = 0;
} }
time=clock(); time=clock();
@ -524,31 +515,35 @@ void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear,
for(z = 0; z < x_size; ++z){ for(z = 0; z < x_size; ++z){
gnet->input[z] = rand_normal(); gnet->input[z] = rand_normal();
} }
for(z = 0; z < gnet->batch; ++z){
float mag = mag_array(gnet->input + z*gnet->inputs, gnet->inputs);
scale_array(gnet->input + z*gnet->inputs, gnet->inputs, 1./mag);
}
cuda_push_array(gnet->input_gpu, gnet->input, x_size); //cuda_push_array(gnet->input_gpu, gnet->input, x_size);
cuda_push_array(gnet->truth_gpu, gnet->truth, y_size); //cuda_push_array(gnet->truth_gpu, gnet->truth, y_size);
*gnet->seen += gnet->batch; *gnet->seen += gnet->batch;
forward_network_gpu(gnet); forward_network(gnet);
fill_gpu(imlayer.outputs*imlayer.batch, 0, imerror, 1); fill_gpu(imlayer.outputs*imlayer.batch, 0, imerror, 1);
fill_gpu(anet->truths*anet->batch, .95, anet->truth_gpu, 1); fill_cpu(anet->truths*anet->batch, 1, anet->truth, 1);
copy_gpu(anet->inputs*anet->batch, imlayer.output_gpu, 1, anet->input_gpu, 1); copy_cpu(anet->inputs*anet->batch, imlayer.output, 1, anet->input, 1);
anet->delta_gpu = imerror; anet->delta_gpu = imerror;
forward_network_gpu(anet); forward_network(anet);
backward_network_gpu(anet); backward_network(anet);
float genaloss = *anet->cost / anet->batch; float genaloss = *anet->cost / anet->batch;
printf("%f\n", genaloss); printf("%f\n", genaloss);
scal_gpu(imlayer.outputs*imlayer.batch, 1, imerror, 1); scal_gpu(imlayer.outputs*imlayer.batch, 1, imerror, 1);
scal_gpu(imlayer.outputs*imlayer.batch, .00, gnet->layers[gnet->n-1].delta_gpu, 1); scal_gpu(imlayer.outputs*imlayer.batch, 0, gnet->layers[gnet->n-1].delta_gpu, 1);
printf("realness %f\n", cuda_mag_array(imerror, imlayer.outputs*imlayer.batch)); printf("realness %f\n", cuda_mag_array(imerror, imlayer.outputs*imlayer.batch));
printf("features %f\n", cuda_mag_array(gnet->layers[gnet->n-1].delta_gpu, imlayer.outputs*imlayer.batch)); printf("features %f\n", cuda_mag_array(gnet->layers[gnet->n-1].delta_gpu, imlayer.outputs*imlayer.batch));
axpy_gpu(imlayer.outputs*imlayer.batch, 1, imerror, 1, gnet->layers[gnet->n-1].delta_gpu, 1); axpy_gpu(imlayer.outputs*imlayer.batch, 1, imerror, 1, gnet->layers[gnet->n-1].delta_gpu, 1);
backward_network_gpu(gnet); backward_network(gnet);
for(k = 0; k < gnet->batch; ++k){ for(k = 0; k < gnet->batch; ++k){
int index = j*gnet->batch + k; int index = j*gnet->batch + k;
@ -565,23 +560,25 @@ void train_dcgan(char *cfg, char *weight, char *acfg, char *aweight, int clear,
//scale_image(im, .5); //scale_image(im, .5);
//translate_image(im2, 1); //translate_image(im2, 1);
//scale_image(im2, .5); //scale_image(im2, .5);
#ifdef OPENCV #ifdef OPENCV
if(display){ if(display){
image im = float_to_image(anet->w, anet->h, anet->c, gen.X.vals[0]); image im = float_to_image(anet->w, anet->h, anet->c, gen.X.vals[0]);
image im2 = float_to_image(anet->w, anet->h, anet->c, train.X.vals[0]); image im2 = float_to_image(anet->w, anet->h, anet->c, train.X.vals[0]);
show_image(im, "gen"); show_image(im, "gen");
show_image(im2, "train"); show_image(im2, "train");
save_image(im, "gen");
save_image(im2, "train");
cvWaitKey(50); cvWaitKey(50);
} }
#endif #endif
/* /*
if(aloss < .1){ if(aloss < .1){
anet->learning_rate = 0; anet->learning_rate = 0;
} else if (aloss > .3){ } else if (aloss > .3){
anet->learning_rate = orig_rate; anet->learning_rate = orig_rate;
} }
*/ */
update_network_gpu(gnet); update_network_gpu(gnet);
@ -747,7 +744,7 @@ void train_colorizer(char *cfg, char *weight, char *acfg, char *aweight, int cle
update_network_gpu(net); update_network_gpu(net);
#ifdef OPENCV #ifdef OPENCV
if(display){ if(display){
image im = float_to_image(anet->w, anet->h, anet->c, gray.X.vals[0]); image im = float_to_image(anet->w, anet->h, anet->c, gray.X.vals[0]);
image im2 = float_to_image(anet->w, anet->h, anet->c, train.X.vals[0]); image im2 = float_to_image(anet->w, anet->h, anet->c, train.X.vals[0]);
@ -755,7 +752,7 @@ void train_colorizer(char *cfg, char *weight, char *acfg, char *aweight, int cle
show_image(im2, "train"); show_image(im2, "train");
cvWaitKey(50); cvWaitKey(50);
} }
#endif #endif
free_data(merge); free_data(merge);
free_data(train); free_data(train);
free_data(gray); free_data(gray);
@ -786,259 +783,259 @@ void train_colorizer(char *cfg, char *weight, char *acfg, char *aweight, int cle
} }
/* /*
void train_lsd2(char *cfgfile, char *weightfile, char *acfgfile, char *aweightfile, int clear) void train_lsd2(char *cfgfile, char *weightfile, char *acfgfile, char *aweightfile, int clear)
{ {
#ifdef GPU #ifdef GPU
char *train_images = "/home/pjreddie/data/coco/trainvalno5k.txt"; char *train_images = "/home/pjreddie/data/coco/trainvalno5k.txt";
char *backup_directory = "/home/pjreddie/backup/"; char *backup_directory = "/home/pjreddie/backup/";
srand(time(0)); srand(time(0));
char *base = basecfg(cfgfile); char *base = basecfg(cfgfile);
printf("%s\n", base); printf("%s\n", base);
network net = parse_network_cfg(cfgfile); network net = parse_network_cfg(cfgfile);
if(weightfile){ if(weightfile){
load_weights(&net, weightfile); load_weights(&net, weightfile);
} }
if(clear) *net->seen = 0; if(clear) *net->seen = 0;
char *abase = basecfg(acfgfile); char *abase = basecfg(acfgfile);
network anet = parse_network_cfg(acfgfile); network anet = parse_network_cfg(acfgfile);
if(aweightfile){ if(aweightfile){
load_weights(&anet, aweightfile); load_weights(&anet, aweightfile);
} }
if(clear) *anet->seen = 0; if(clear) *anet->seen = 0;
int i, j, k; int i, j, k;
layer imlayer = {0}; layer imlayer = {0};
for (i = 0; i < net->n; ++i) { for (i = 0; i < net->n; ++i) {
if (net->layers[i].out_c == 3) { if (net->layers[i].out_c == 3) {
imlayer = net->layers[i]; imlayer = net->layers[i];
break; break;
}
}
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net->learning_rate, net->momentum, net->decay);
int imgs = net->batch*net->subdivisions;
i = *net->seen/imgs;
data train, buffer;
list *plist = get_paths(train_images);
//int N = plist->size;
char **paths = (char **)list_to_array(plist);
load_args args = {0};
args.w = net->w;
args.h = net->h;
args.paths = paths;
args.n = imgs;
args.m = plist->size;
args.d = &buffer;
args.min = net->min_crop;
args.max = net->max_crop;
args.angle = net->angle;
args.aspect = net->aspect;
args.exposure = net->exposure;
args.saturation = net->saturation;
args.hue = net->hue;
args.size = net->w;
args.type = CLASSIFICATION_DATA;
args.classes = 1;
char *ls[1] = {"coco"};
args.labels = ls;
pthread_t load_thread = load_data_in_thread(args);
clock_t time;
network_state gstate = {0};
gstate.index = 0;
gstate.net = net;
int x_size = get_network_input_size(net)*net->batch;
int y_size = 1*net->batch;
gstate.input = cuda_make_array(0, x_size);
gstate.truth = 0;
gstate.delta = 0;
gstate.train = 1;
float *X = calloc(x_size, sizeof(float));
float *y = calloc(y_size, sizeof(float));
network_state astate = {0};
astate.index = 0;
astate.net = anet;
int ay_size = get_network_output_size(anet)*anet->batch;
astate.input = 0;
astate.truth = 0;
astate.delta = 0;
astate.train = 1;
float *imerror = cuda_make_array(0, imlayer.outputs);
float *ones_gpu = cuda_make_array(0, ay_size);
fill_gpu(ay_size, 1, ones_gpu, 1);
float aloss_avg = -1;
float gloss_avg = -1;
//data generated = copy_data(train);
while (get_current_batch(net) < net->max_batches) {
i += 1;
time=clock();
pthread_join(load_thread, 0);
train = buffer;
load_thread = load_data_in_thread(args);
printf("Loaded: %lf seconds\n", sec(clock()-time));
data generated = copy_data(train);
time=clock();
float gloss = 0;
for(j = 0; j < net->subdivisions; ++j){
get_next_batch(train, net->batch, j*net->batch, X, y);
cuda_push_array(gstate.input, X, x_size);
*net->seen += net->batch;
forward_network_gpu(net, gstate);
fill_gpu(imlayer.outputs, 0, imerror, 1);
astate.input = imlayer.output_gpu;
astate.delta = imerror;
astate.truth = ones_gpu;
forward_network_gpu(anet, astate);
backward_network_gpu(anet, astate);
scal_gpu(imlayer.outputs, 1, imerror, 1);
axpy_gpu(imlayer.outputs, 1, imerror, 1, imlayer.delta_gpu, 1);
backward_network_gpu(net, gstate);
printf("features %f\n", cuda_mag_array(imlayer.delta_gpu, imlayer.outputs));
printf("realness %f\n", cuda_mag_array(imerror, imlayer.outputs));
gloss += get_network_cost(net) /(net->subdivisions*net->batch);
cuda_pull_array(imlayer.output_gpu, imlayer.output, imlayer.outputs*imlayer.batch);
for(k = 0; k < net->batch; ++k){
int index = j*net->batch + k;
copy_cpu(imlayer.outputs, imlayer.output + k*imlayer.outputs, 1, generated.X.vals[index], 1);
generated.y.vals[index][0] = 0;
} }
} }
harmless_update_network_gpu(anet);
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net->learning_rate, net->momentum, net->decay); data merge = concat_data(train, generated);
int imgs = net->batch*net->subdivisions; randomize_data(merge);
i = *net->seen/imgs; float aloss = train_network(anet, merge);
data train, buffer;
update_network_gpu(net);
update_network_gpu(anet);
free_data(merge);
free_data(train);
free_data(generated);
if (aloss_avg < 0) aloss_avg = aloss;
aloss_avg = aloss_avg*.9 + aloss*.1;
gloss_avg = gloss_avg*.9 + gloss*.1;
list *plist = get_paths(train_images); printf("%d: gen: %f, adv: %f | gen_avg: %f, adv_avg: %f, %f rate, %lf seconds, %d images\n", i, gloss, aloss, gloss_avg, aloss_avg, get_current_rate(net), sec(clock()-time), i*imgs);
//int N = plist->size; if(i%1000==0){
char **paths = (char **)list_to_array(plist); char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
load_args args = {0}; save_weights(net, buff);
args.w = net->w; sprintf(buff, "%s/%s_%d.weights", backup_directory, abase, i);
args.h = net->h; save_weights(anet, buff);
args.paths = paths;
args.n = imgs;
args.m = plist->size;
args.d = &buffer;
args.min = net->min_crop;
args.max = net->max_crop;
args.angle = net->angle;
args.aspect = net->aspect;
args.exposure = net->exposure;
args.saturation = net->saturation;
args.hue = net->hue;
args.size = net->w;
args.type = CLASSIFICATION_DATA;
args.classes = 1;
char *ls[1] = {"coco"};
args.labels = ls;
pthread_t load_thread = load_data_in_thread(args);
clock_t time;
network_state gstate = {0};
gstate.index = 0;
gstate.net = net;
int x_size = get_network_input_size(net)*net->batch;
int y_size = 1*net->batch;
gstate.input = cuda_make_array(0, x_size);
gstate.truth = 0;
gstate.delta = 0;
gstate.train = 1;
float *X = calloc(x_size, sizeof(float));
float *y = calloc(y_size, sizeof(float));
network_state astate = {0};
astate.index = 0;
astate.net = anet;
int ay_size = get_network_output_size(anet)*anet->batch;
astate.input = 0;
astate.truth = 0;
astate.delta = 0;
astate.train = 1;
float *imerror = cuda_make_array(0, imlayer.outputs);
float *ones_gpu = cuda_make_array(0, ay_size);
fill_gpu(ay_size, 1, ones_gpu, 1);
float aloss_avg = -1;
float gloss_avg = -1;
//data generated = copy_data(train);
while (get_current_batch(net) < net->max_batches) {
i += 1;
time=clock();
pthread_join(load_thread, 0);
train = buffer;
load_thread = load_data_in_thread(args);
printf("Loaded: %lf seconds\n", sec(clock()-time));
data generated = copy_data(train);
time=clock();
float gloss = 0;
for(j = 0; j < net->subdivisions; ++j){
get_next_batch(train, net->batch, j*net->batch, X, y);
cuda_push_array(gstate.input, X, x_size);
*net->seen += net->batch;
forward_network_gpu(net, gstate);
fill_gpu(imlayer.outputs, 0, imerror, 1);
astate.input = imlayer.output_gpu;
astate.delta = imerror;
astate.truth = ones_gpu;
forward_network_gpu(anet, astate);
backward_network_gpu(anet, astate);
scal_gpu(imlayer.outputs, 1, imerror, 1);
axpy_gpu(imlayer.outputs, 1, imerror, 1, imlayer.delta_gpu, 1);
backward_network_gpu(net, gstate);
printf("features %f\n", cuda_mag_array(imlayer.delta_gpu, imlayer.outputs));
printf("realness %f\n", cuda_mag_array(imerror, imlayer.outputs));
gloss += get_network_cost(net) /(net->subdivisions*net->batch);
cuda_pull_array(imlayer.output_gpu, imlayer.output, imlayer.outputs*imlayer.batch);
for(k = 0; k < net->batch; ++k){
int index = j*net->batch + k;
copy_cpu(imlayer.outputs, imlayer.output + k*imlayer.outputs, 1, generated.X.vals[index], 1);
generated.y.vals[index][0] = 0;
}
}
harmless_update_network_gpu(anet);
data merge = concat_data(train, generated);
randomize_data(merge);
float aloss = train_network(anet, merge);
update_network_gpu(net);
update_network_gpu(anet);
free_data(merge);
free_data(train);
free_data(generated);
if (aloss_avg < 0) aloss_avg = aloss;
aloss_avg = aloss_avg*.9 + aloss*.1;
gloss_avg = gloss_avg*.9 + gloss*.1;
printf("%d: gen: %f, adv: %f | gen_avg: %f, adv_avg: %f, %f rate, %lf seconds, %d images\n", i, gloss, aloss, gloss_avg, aloss_avg, get_current_rate(net), sec(clock()-time), i*imgs);
if(i%1000==0){
char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
save_weights(net, buff);
sprintf(buff, "%s/%s_%d.weights", backup_directory, abase, i);
save_weights(anet, buff);
}
if(i%100==0){
char buff[256];
sprintf(buff, "%s/%s.backup", backup_directory, base);
save_weights(net, buff);
sprintf(buff, "%s/%s.backup", backup_directory, abase);
save_weights(anet, buff);
}
} }
char buff[256]; if(i%100==0){
sprintf(buff, "%s/%s_final.weights", backup_directory, base); char buff[256];
save_weights(net, buff); sprintf(buff, "%s/%s.backup", backup_directory, base);
save_weights(net, buff);
sprintf(buff, "%s/%s.backup", backup_directory, abase);
save_weights(anet, buff);
}
}
char buff[256];
sprintf(buff, "%s/%s_final.weights", backup_directory, base);
save_weights(net, buff);
#endif #endif
} }
*/ */
/* /*
void train_lsd(char *cfgfile, char *weightfile, int clear) void train_lsd(char *cfgfile, char *weightfile, int clear)
{ {
char *train_images = "/home/pjreddie/data/coco/trainvalno5k.txt"; char *train_images = "/home/pjreddie/data/coco/trainvalno5k.txt";
char *backup_directory = "/home/pjreddie/backup/"; char *backup_directory = "/home/pjreddie/backup/";
srand(time(0)); srand(time(0));
char *base = basecfg(cfgfile); char *base = basecfg(cfgfile);
printf("%s\n", base); printf("%s\n", base);
float avg_loss = -1; float avg_loss = -1;
network net = parse_network_cfg(cfgfile); network net = parse_network_cfg(cfgfile);
if(weightfile){ if(weightfile){
load_weights(&net, weightfile); load_weights(&net, weightfile);
} }
if(clear) *net->seen = 0; if(clear) *net->seen = 0;
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net->learning_rate, net->momentum, net->decay); printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net->learning_rate, net->momentum, net->decay);
int imgs = net->batch*net->subdivisions; int imgs = net->batch*net->subdivisions;
int i = *net->seen/imgs; int i = *net->seen/imgs;
data train, buffer; data train, buffer;
list *plist = get_paths(train_images); list *plist = get_paths(train_images);
//int N = plist->size; //int N = plist->size;
char **paths = (char **)list_to_array(plist); char **paths = (char **)list_to_array(plist);
load_args args = {0}; load_args args = {0};
args.w = net->w; args.w = net->w;
args.h = net->h; args.h = net->h;
args.paths = paths; args.paths = paths;
args.n = imgs; args.n = imgs;
args.m = plist->size; args.m = plist->size;
args.d = &buffer; args.d = &buffer;
args.min = net->min_crop; args.min = net->min_crop;
args.max = net->max_crop; args.max = net->max_crop;
args.angle = net->angle; args.angle = net->angle;
args.aspect = net->aspect; args.aspect = net->aspect;
args.exposure = net->exposure; args.exposure = net->exposure;
args.saturation = net->saturation; args.saturation = net->saturation;
args.hue = net->hue; args.hue = net->hue;
args.size = net->w; args.size = net->w;
args.type = CLASSIFICATION_DATA; args.type = CLASSIFICATION_DATA;
args.classes = 1; args.classes = 1;
char *ls[1] = {"coco"}; char *ls[1] = {"coco"};
args.labels = ls; args.labels = ls;
pthread_t load_thread = load_data_in_thread(args); pthread_t load_thread = load_data_in_thread(args);
clock_t time; clock_t time;
//while(i*imgs < N*120){ //while(i*imgs < N*120){
while(get_current_batch(net) < net->max_batches){ while(get_current_batch(net) < net->max_batches){
i += 1; i += 1;
time=clock(); time=clock();
pthread_join(load_thread, 0); pthread_join(load_thread, 0);
train = buffer; train = buffer;
load_thread = load_data_in_thread(args); load_thread = load_data_in_thread(args);
printf("Loaded: %lf seconds\n", sec(clock()-time)); printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock(); time=clock();
float loss = train_network(net, train); float loss = train_network(net, train);
if (avg_loss < 0) avg_loss = loss; if (avg_loss < 0) avg_loss = loss;
avg_loss = avg_loss*.9 + loss*.1; avg_loss = avg_loss*.9 + loss*.1;
printf("%d: %f, %f avg, %f rate, %lf seconds, %d images\n", i, loss, avg_loss, get_current_rate(net), sec(clock()-time), i*imgs); printf("%d: %f, %f avg, %f rate, %lf seconds, %d images\n", i, loss, avg_loss, get_current_rate(net), sec(clock()-time), i*imgs);
if(i%1000==0){ if(i%1000==0){
char buff[256]; char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i); sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
save_weights(net, buff); save_weights(net, buff);
} }
if(i%100==0){ if(i%100==0){
char buff[256]; char buff[256];
sprintf(buff, "%s/%s.backup", backup_directory, base); sprintf(buff, "%s/%s.backup", backup_directory, base);
save_weights(net, buff); save_weights(net, buff);
} }
free_data(train); free_data(train);
} }
char buff[256]; char buff[256];
sprintf(buff, "%s/%s_final.weights", backup_directory, base); sprintf(buff, "%s/%s_final.weights", backup_directory, base);
save_weights(net, buff); save_weights(net, buff);
} }
*/ */

4
examples/nightmare.c
View File

@ -83,6 +83,10 @@ void optimize_picture(network *net, image orig, int max_layer, float scale, floa
*/ */
//rate = rate / abs_mean(out.data, out.w*out.h*out.c); //rate = rate / abs_mean(out.data, out.w*out.h*out.c);
image gray = make_image(out.w, out.h, out.c);
fill_image(gray, .5);
axpy_cpu(orig.w*orig.h*orig.c, -1, orig.data, 1, gray.data, 1);
axpy_cpu(orig.w*orig.h*orig.c, .1, gray.data, 1, out.data, 1);
if(norm) normalize_array(out.data, out.w*out.h*out.c); if(norm) normalize_array(out.data, out.w*out.h*out.c);
axpy_cpu(orig.w*orig.h*orig.c, rate, out.data, 1, orig.data, 1); axpy_cpu(orig.w*orig.h*orig.c, rate, out.data, 1, orig.data, 1);

2
examples/super.c
View File

@ -93,6 +93,8 @@ void test_super(char *cfgfile, char *weightfile, char *filename)
image out = get_network_image(net); image out = get_network_image(net);
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time)); printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
save_image(out, "out"); save_image(out, "out");
show_image(out, "out");
cvWaitKey(0);
free_image(im); free_image(im);
if (filename) break; if (filename) break;

50
examples/yolo.c
View File

@ -74,14 +74,14 @@ void train_yolo(char *cfgfile, char *weightfile)
save_weights(net, buff); save_weights(net, buff);
} }
void print_yolo_detections(FILE **fps, char *id, box *boxes, float **probs, int total, int classes, int w, int h) void print_yolo_detections(FILE **fps, char *id, int total, int classes, int w, int h, detection *dets)
{ {
int i, j; int i, j;
for(i = 0; i < total; ++i){ for(i = 0; i < total; ++i){
float xmin = boxes[i].x - boxes[i].w/2.; float xmin = dets[i].bbox.x - dets[i].bbox.w/2.;
float xmax = boxes[i].x + boxes[i].w/2.; float xmax = dets[i].bbox.x + dets[i].bbox.w/2.;
float ymin = boxes[i].y - boxes[i].h/2.; float ymin = dets[i].bbox.y - dets[i].bbox.h/2.;
float ymax = boxes[i].y + boxes[i].h/2.; float ymax = dets[i].bbox.y + dets[i].bbox.h/2.;
if (xmin < 0) xmin = 0; if (xmin < 0) xmin = 0;
if (ymin < 0) ymin = 0; if (ymin < 0) ymin = 0;
@ -89,7 +89,7 @@ void print_yolo_detections(FILE **fps, char *id, box *boxes, float **probs, int
if (ymax > h) ymax = h; if (ymax > h) ymax = h;
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
if (probs[i][j]) fprintf(fps[j], "%s %f %f %f %f %f\n", id, probs[i][j], if (dets[i].prob[j]) fprintf(fps[j], "%s %f %f %f %f %f\n", id, dets[i].prob[j],
xmin, ymin, xmax, ymax); xmin, ymin, xmax, ymax);
} }
} }
@ -118,9 +118,6 @@ void validate_yolo(char *cfg, char *weights)
snprintf(buff, 1024, "%s%s.txt", base, voc_names[j]); snprintf(buff, 1024, "%s%s.txt", base, voc_names[j]);
fps[j] = fopen(buff, "w"); fps[j] = fopen(buff, "w");
} }
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(classes, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -136,6 +133,7 @@ void validate_yolo(char *cfg, char *weights)
image *buf = calloc(nthreads, sizeof(image)); image *buf = calloc(nthreads, sizeof(image));
image *buf_resized = calloc(nthreads, sizeof(image)); image *buf_resized = calloc(nthreads, sizeof(image));
pthread_t *thr = calloc(nthreads, sizeof(pthread_t)); pthread_t *thr = calloc(nthreads, sizeof(pthread_t));
detection *dets = make_network_boxes(net);
load_args args = {0}; load_args args = {0};
args.w = net->w; args.w = net->w;
@ -169,9 +167,9 @@ void validate_yolo(char *cfg, char *weights)
network_predict(net, X); network_predict(net, X);
int w = val[t].w; int w = val[t].w;
int h = val[t].h; int h = val[t].h;
get_detection_boxes(l, w, h, thresh, probs, boxes, 0); fill_network_boxes(net, w, h, thresh, 0, 0, 0, dets);
if (nms) do_nms_sort(boxes, probs, l.side*l.side*l.n, classes, iou_thresh); if (nms) do_nms_sort(dets, l.side*l.side*l.n, classes, iou_thresh);
print_yolo_detections(fps, id, boxes, probs, l.side*l.side*l.n, classes, w, h); print_yolo_detections(fps, id, l.side*l.side*l.n, classes, w, h, dets);
free(id); free(id);
free_image(val[t]); free_image(val[t]);
free_image(val_resized[t]); free_image(val_resized[t]);
@ -202,9 +200,7 @@ void validate_yolo_recall(char *cfg, char *weights)
snprintf(buff, 1024, "%s%s.txt", base, voc_names[j]); snprintf(buff, 1024, "%s%s.txt", base, voc_names[j]);
fps[j] = fopen(buff, "w"); fps[j] = fopen(buff, "w");
} }
box *boxes = calloc(side*side*l.n, sizeof(box)); detection *dets = make_network_boxes(net);
float **probs = calloc(side*side*l.n, sizeof(float *));
for(j = 0; j < side*side*l.n; ++j) probs[j] = calloc(classes, sizeof(float *));
int m = plist->size; int m = plist->size;
int i=0; int i=0;
@ -224,8 +220,9 @@ void validate_yolo_recall(char *cfg, char *weights)
image sized = resize_image(orig, net->w, net->h); image sized = resize_image(orig, net->w, net->h);
char *id = basecfg(path); char *id = basecfg(path);
network_predict(net, sized.data); network_predict(net, sized.data);
get_detection_boxes(l, orig.w, orig.h, thresh, probs, boxes, 1);
if (nms) do_nms(boxes, probs, side*side*l.n, 1, nms); fill_network_boxes(net, orig.w, orig.h, thresh, 0, 0, 1, dets);
if (nms) do_nms_obj(dets, side*side*l.n, 1, nms);
char labelpath[4096]; char labelpath[4096];
find_replace(path, "images", "labels", labelpath); find_replace(path, "images", "labels", labelpath);
@ -236,7 +233,7 @@ void validate_yolo_recall(char *cfg, char *weights)
int num_labels = 0; int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels); box_label *truth = read_boxes(labelpath, &num_labels);
for(k = 0; k < side*side*l.n; ++k){ for(k = 0; k < side*side*l.n; ++k){
if(probs[k][0] > thresh){ if(dets[k].objectness > thresh){
++proposals; ++proposals;
} }
} }
@ -245,8 +242,8 @@ void validate_yolo_recall(char *cfg, char *weights)
box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h}; box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h};
float best_iou = 0; float best_iou = 0;
for(k = 0; k < side*side*l.n; ++k){ for(k = 0; k < side*side*l.n; ++k){
float iou = box_iou(boxes[k], t); float iou = box_iou(dets[k].bbox, t);
if(probs[k][0] > thresh && iou > best_iou){ if(dets[k].objectness > thresh && iou > best_iou){
best_iou = iou; best_iou = iou;
} }
} }
@ -273,11 +270,8 @@ void test_yolo(char *cfgfile, char *weightfile, char *filename, float thresh)
clock_t time; clock_t time;
char buff[256]; char buff[256];
char *input = buff; char *input = buff;
int j;
float nms=.4; float nms=.4;
box *boxes = calloc(l.side*l.side*l.n, sizeof(box)); detection *dets = make_network_boxes(net);
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 *));
while(1){ while(1){
if(filename){ if(filename){
strncpy(input, filename, 256); strncpy(input, filename, 256);
@ -294,9 +288,11 @@ void test_yolo(char *cfgfile, char *weightfile, char *filename, float thresh)
time=clock(); time=clock();
network_predict(net, X); network_predict(net, X);
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time)); printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
get_detection_boxes(l, 1, 1, thresh, probs, boxes, 0);
if (nms) do_nms_sort(boxes, probs, l.side*l.side*l.n, l.classes, nms); fill_network_boxes(net, 1, 1, thresh, 0, 0, 0, dets);
draw_detections(im, l.side*l.side*l.n, thresh, boxes, probs, 0, voc_names, alphabet, 20); if (nms) do_nms_sort(dets, l.side*l.side*l.n, l.classes, nms);
draw_detections(im, dets, l.side*l.side*l.n, thresh, voc_names, alphabet, 20);
save_image(im, "predictions"); save_image(im, "predictions");
show_image(im, "predictions"); show_image(im, "predictions");

36
include/darknet.h
View File

@ -85,6 +85,8 @@ typedef enum {
XNOR, XNOR,
REGION, REGION,
REORG, REORG,
UPSAMPLE,
LOGXENT,
BLANK BLANK
} LAYER_TYPE; } LAYER_TYPE;
@ -166,12 +168,13 @@ struct layer{
int background; int background;
int rescore; int rescore;
int objectness; int objectness;
int does_cost;
int joint; int joint;
int noadjust; int noadjust;
int reorg; int reorg;
int log; int log;
int tanh; int tanh;
int *mask;
int total;
float alpha; float alpha;
float beta; float beta;
@ -228,6 +231,7 @@ struct layer{
float * delta; float * delta;
float * output; float * output;
float * loss;
float * squared; float * squared;
float * norms; float * norms;
@ -389,6 +393,7 @@ struct layer{
float * scale_change_gpu; float * scale_change_gpu;
float * output_gpu; float * output_gpu;
float * loss_gpu;
float * delta_gpu; float * delta_gpu;
float * rand_gpu; float * rand_gpu;
float * squared_gpu; float * squared_gpu;
@ -501,6 +506,15 @@ typedef struct{
float x, y, w, h; float x, y, w, h;
} box; } box;
typedef struct detection{
box bbox;
int classes;
float *prob;
float *mask;
float objectness;
int sort_class;
} detection;
typedef struct matrix{ typedef struct matrix{
int rows, cols; int rows, cols;
float **vals; float **vals;
@ -593,6 +607,7 @@ void update_network(network *net);
void axpy_cpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY); void axpy_cpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY);
void copy_cpu(int N, float *X, int INCX, float *Y, int INCY); void copy_cpu(int N, float *X, int INCX, float *Y, int INCY);
void scal_cpu(int N, float ALPHA, float *X, int INCX); void scal_cpu(int N, float ALPHA, float *X, int INCX);
void fill_cpu(int N, float ALPHA, float * X, int INCX);
void normalize_cpu(float *x, float *mean, float *variance, int batch, int filters, int spatial); void normalize_cpu(float *x, float *mean, float *variance, int batch, int filters, int spatial);
void softmax(float *input, int n, float temp, int stride, float *output); void softmax(float *input, int n, float temp, int stride, float *output);
@ -644,7 +659,7 @@ void rgbgr_weights(layer l);
image *get_weights(layer l); image *get_weights(layer l);
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix, int avg, float hier_thresh, int w, int h, int fps, int fullscreen); void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix, int avg, float hier_thresh, int w, int h, int fps, int fullscreen);
void get_detection_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness); void get_detection_detections(layer l, int w, int h, float thresh, detection *dets);
char *option_find_str(list *l, char *key, char *def); char *option_find_str(list *l, char *key, char *def);
int option_find_int(list *l, char *key, int def); int option_find_int(list *l, char *key, int def);
@ -656,7 +671,7 @@ void save_weights_upto(network *net, char *filename, int cutoff);
void load_weights_upto(network *net, char *filename, int start, int cutoff); void load_weights_upto(network *net, char *filename, int start, int cutoff);
void zero_objectness(layer l); void zero_objectness(layer l);
void get_region_boxes(layer l, int w, int h, int netw, int neth, float thresh, float **probs, box *boxes, float **masks, int only_objectness, int *map, float tree_thresh, int relative); void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets);
void free_network(network *net); void free_network(network *net);
void set_batch_network(network *net, int b); void set_batch_network(network *net, int b);
void set_temp_network(network *net, float t); void set_temp_network(network *net, float t);
@ -697,11 +712,10 @@ double what_time_is_it_now();
image rotate_image(image m, float rad); image rotate_image(image m, float rad);
void visualize_network(network *net); void visualize_network(network *net);
float box_iou(box a, box b); float box_iou(box a, box b);
void do_nms(box *boxes, float **probs, int total, int classes, float thresh);
data load_all_cifar10(); data load_all_cifar10();
box_label *read_boxes(char *filename, int *n); box_label *read_boxes(char *filename, int *n);
box float_to_box(float *f, int stride); box float_to_box(float *f, int stride);
void draw_detections(image im, int num, float thresh, box *boxes, float **probs, float **masks, char **names, image **alphabet, int classes); void draw_detections(image im, detection *dets, int num, float thresh, char **names, image **alphabet, int classes);
matrix network_predict_data(network *net, data test); matrix network_predict_data(network *net, data test);
image **load_alphabet(); image **load_alphabet();
@ -711,15 +725,18 @@ float *network_predict(network *net, float *input);
int network_width(network *net); int network_width(network *net);
int network_height(network *net); int network_height(network *net);
float *network_predict_image(network *net, image im); float *network_predict_image(network *net, image im);
void network_detect(network *net, image im, float thresh, float hier_thresh, float nms, box *boxes, float **probs); void network_detect(network *net, image im, float thresh, float hier_thresh, float nms, detection *dets);
int num_boxes(network *net); int num_boxes(network *net);
box *make_boxes(network *net); detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative);
void fill_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, detection *dets);
detection *make_network_boxes(network *net);
void free_detections(detection *dets, int n);
void reset_network_state(network *net, int b); void reset_network_state(network *net, int b);
char **get_labels(char *filename); char **get_labels(char *filename);
void do_nms_sort(box *boxes, float **probs, int total, int classes, float thresh); void do_nms_obj(detection *dets, int total, int classes, float thresh);
void do_nms_obj(box *boxes, float **probs, int total, int classes, float thresh); void do_nms_sort(detection *dets, int total, int classes, float thresh);
matrix make_matrix(int rows, int cols); matrix make_matrix(int rows, int cols);
@ -758,6 +775,7 @@ void free_list(list *l);
float mse_array(float *a, int n); float mse_array(float *a, int n);
float variance_array(float *a, int n); float variance_array(float *a, int n);
float mag_array(float *a, int n); float mag_array(float *a, int n);
void scale_array(float *a, int n, float s);
float mean_array(float *a, int n); float mean_array(float *a, int n);
float sum_array(float *a, int n); float sum_array(float *a, int n);
void normalize_array(float *a, int n); void normalize_array(float *a, int n);

22
src/blas.c
View File

@ -241,6 +241,28 @@ void l1_cpu(int n, float *pred, float *truth, float *delta, float *error)
} }
} }
void softmax_x_ent_cpu(int n, float *pred, float *truth, float *delta, float *error)
{
int i;
for(i = 0; i < n; ++i){
float t = truth[i];
float p = pred[i];
error[i] = (t) ? -log(p) : 0;
delta[i] = t-p;
}
}
void logistic_x_ent_cpu(int n, float *pred, float *truth, float *delta, float *error)
{
int i;
for(i = 0; i < n; ++i){
float t = truth[i];
float p = pred[i];
error[i] = -t*log(p) - (1-t)*log(1-p);
delta[i] = t-p;
}
}
void l2_cpu(int n, float *pred, float *truth, float *delta, float *error) void l2_cpu(int n, float *pred, float *truth, float *delta, float *error)
{ {
int i; int i;

8
src/blas.h
View File

@ -19,7 +19,6 @@ void constrain_gpu(int N, float ALPHA, float * X, int INCX);
void pow_cpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY); void pow_cpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY);
void mul_cpu(int N, float *X, int INCX, float *Y, int INCY); void mul_cpu(int N, float *X, int INCX, float *Y, int INCY);
void fill_cpu(int N, float ALPHA, float * X, int INCX);
float dot_cpu(int N, float *X, int INCX, float *Y, int INCY); float dot_cpu(int N, float *X, int INCX, float *Y, int INCY);
int test_gpu_blas(); int test_gpu_blas();
void shortcut_cpu(int batch, int w1, int h1, int c1, float *add, int w2, int h2, int c2, float *out); void shortcut_cpu(int batch, int w1, int h1, int c1, float *add, int w2, int h2, int c2, float *out);
@ -36,6 +35,8 @@ void normalize_delta_cpu(float *x, float *mean, float *variance, float *mean_del
void smooth_l1_cpu(int n, float *pred, float *truth, float *delta, float *error); void smooth_l1_cpu(int n, float *pred, float *truth, float *delta, float *error);
void l2_cpu(int n, float *pred, float *truth, float *delta, float *error); void l2_cpu(int n, float *pred, float *truth, float *delta, float *error);
void l1_cpu(int n, float *pred, float *truth, float *delta, float *error); void l1_cpu(int n, float *pred, float *truth, float *delta, float *error);
void logistic_x_ent_cpu(int n, float *pred, float *truth, float *delta, float *error);
void softmax_x_ent_cpu(int n, float *pred, float *truth, float *delta, float *error);
void weighted_sum_cpu(float *a, float *b, float *s, int num, float *c); void weighted_sum_cpu(float *a, float *b, float *s, int num, float *c);
void weighted_delta_cpu(float *a, float *b, float *s, float *da, float *db, float *ds, int n, float *dc); void weighted_delta_cpu(float *a, float *b, float *s, float *da, float *db, float *ds, int n, float *dc);
@ -52,7 +53,7 @@ void copy_gpu(int N, float * X, int INCX, float * Y, int INCY);
void copy_gpu_offset(int N, float * X, int OFFX, int INCX, float * Y, int OFFY, int INCY); void copy_gpu_offset(int N, float * X, int OFFX, int INCX, float * Y, int OFFY, int INCY);
void add_gpu(int N, float ALPHA, float * X, int INCX); void add_gpu(int N, float ALPHA, float * X, int INCX);
void supp_gpu(int N, float ALPHA, float * X, int INCX); void supp_gpu(int N, float ALPHA, float * X, int INCX);
void mask_gpu(int N, float * X, float mask_num, float * mask); void mask_gpu(int N, float * X, float mask_num, float * mask, float val);
void scale_mask_gpu(int N, float * X, float mask_num, float * mask, float scale); void scale_mask_gpu(int N, float * X, float mask_num, float * mask, float scale);
void const_gpu(int N, float ALPHA, float *X, int INCX); void const_gpu(int N, float ALPHA, float *X, int INCX);
void pow_gpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY); void pow_gpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY);
@ -76,6 +77,8 @@ void scale_bias_gpu(float *output, float *biases, int batch, int n, int size);
void add_bias_gpu(float *output, float *biases, int batch, int n, int size); void add_bias_gpu(float *output, float *biases, int batch, int n, int size);
void backward_bias_gpu(float *bias_updates, float *delta, int batch, int n, int size); void backward_bias_gpu(float *bias_updates, float *delta, int batch, int n, int size);
void logistic_x_ent_gpu(int n, float *pred, float *truth, float *delta, float *error);
void softmax_x_ent_gpu(int n, float *pred, float *truth, float *delta, float *error);
void smooth_l1_gpu(int n, float *pred, float *truth, float *delta, float *error); void smooth_l1_gpu(int n, float *pred, float *truth, float *delta, float *error);
void l2_gpu(int n, float *pred, float *truth, float *delta, float *error); void l2_gpu(int n, float *pred, float *truth, float *delta, float *error);
void l1_gpu(int n, float *pred, float *truth, float *delta, float *error); void l1_gpu(int n, float *pred, float *truth, float *delta, float *error);
@ -93,6 +96,7 @@ void adam_gpu(int n, float *x, float *m, float *v, float B1, float B2, float rat
void flatten_gpu(float *x, int spatial, int layers, int batch, int forward, float *out); void flatten_gpu(float *x, int spatial, int layers, int batch, int forward, float *out);
void softmax_tree(float *input, int spatial, int batch, int stride, float temp, float *output, tree hier); void softmax_tree(float *input, int spatial, int batch, int stride, float temp, float *output, tree hier);
void upsample_gpu(float *in, int w, int h, int c, int batch, int stride, int forward, float *out);
#endif #endif
#endif #endif

89
src/blas_kernels.cu
View File

@ -446,12 +446,6 @@ __global__ void fill_kernel(int N, float ALPHA, float *X, int INCX)
if(i < N) X[i*INCX] = ALPHA; if(i < N) X[i*INCX] = ALPHA;
} }
__global__ void mask_kernel(int n, float *x, float mask_num, float *mask)
{
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
if(i < n && mask[i] == mask_num) x[i] = mask_num;
}
__global__ void copy_kernel(int N, float *X, int OFFX, int INCX, float *Y, int OFFY, int INCY) __global__ void copy_kernel(int N, float *X, int OFFX, int INCX, float *Y, int OFFY, int INCY)
{ {
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x; int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
@ -621,6 +615,18 @@ extern "C" void reorg_gpu(float *x, int w, int h, int c, int batch, int stride,
check_error(cudaPeekAtLastError()); check_error(cudaPeekAtLastError());
} }
__global__ void mask_kernel(int n, float *x, float mask_num, float *mask, float val)
{
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
if(i < n && mask[i] == mask_num) x[i] = val;
}
extern "C" void mask_gpu(int N, float * X, float mask_num, float * mask, float val)
{
mask_kernel<<<cuda_gridsize(N), BLOCK>>>(N, X, mask_num, mask, val);
check_error(cudaPeekAtLastError());
}
__global__ void scale_mask_kernel(int n, float *x, float mask_num, float *mask, float scale) __global__ void scale_mask_kernel(int n, float *x, float mask_num, float *mask, float scale)
{ {
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x; int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
@ -633,12 +639,6 @@ extern "C" void scale_mask_gpu(int N, float * X, float mask_num, float * mask, f
check_error(cudaPeekAtLastError()); check_error(cudaPeekAtLastError());
} }
extern "C" void mask_gpu(int N, float * X, float mask_num, float * mask)
{
mask_kernel<<<cuda_gridsize(N), BLOCK>>>(N, X, mask_num, mask);
check_error(cudaPeekAtLastError());
}
extern "C" void const_gpu(int N, float ALPHA, float * X, int INCX) extern "C" void const_gpu(int N, float ALPHA, float * X, int INCX)
{ {
const_kernel<<<cuda_gridsize(N), BLOCK>>>(N, ALPHA, X, INCX); const_kernel<<<cuda_gridsize(N), BLOCK>>>(N, ALPHA, X, INCX);
@ -734,6 +734,40 @@ extern "C" void smooth_l1_gpu(int n, float *pred, float *truth, float *delta, fl
check_error(cudaPeekAtLastError()); check_error(cudaPeekAtLastError());
} }
__global__ void softmax_x_ent_kernel(int n, float *pred, float *truth, float *delta, float *error)
{
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
if(i < n){
float t = truth[i];
float p = pred[i];
error[i] = (t) ? -log(p) : 0;
delta[i] = t-p;
}
}
extern "C" void softmax_x_ent_gpu(int n, float *pred, float *truth, float *delta, float *error)
{
softmax_x_ent_kernel<<<cuda_gridsize(n), BLOCK>>>(n, pred, truth, delta, error);
check_error(cudaPeekAtLastError());
}
__global__ void logistic_x_ent_kernel(int n, float *pred, float *truth, float *delta, float *error)
{
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
if(i < n){
float t = truth[i];
float p = pred[i];
error[i] = -t*log(p) - (1-t)*log(1-p);
delta[i] = t-p;
}
}
extern "C" void logistic_x_ent_gpu(int n, float *pred, float *truth, float *delta, float *error)
{
logistic_x_ent_kernel<<<cuda_gridsize(n), BLOCK>>>(n, pred, truth, delta, error);
check_error(cudaPeekAtLastError());
}
__global__ void l2_kernel(int n, float *pred, float *truth, float *delta, float *error) __global__ void l2_kernel(int n, float *pred, float *truth, float *delta, float *error)
{ {
int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x; int i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
@ -920,3 +954,34 @@ extern "C" void softmax_gpu(float *input, int n, int batch, int batch_offset, in
softmax_kernel<<<cuda_gridsize(batch*groups), BLOCK>>>(input, n, batch, batch_offset, groups, group_offset, stride, temp, output); softmax_kernel<<<cuda_gridsize(batch*groups), BLOCK>>>(input, n, batch, batch_offset, groups, group_offset, stride, temp, output);
check_error(cudaPeekAtLastError()); check_error(cudaPeekAtLastError());
} }
__global__ void upsample_kernel(size_t N, float *x, int w, int h, int c, int batch, int stride, int forward, float *out)
{
size_t i = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
if(i >= N) return;
int out_index = i;
int out_w = i%(w*stride);
i = i/(w*stride);
int out_h = i%(h*stride);
i = i/(h*stride);
int out_c = i%c;
i = i/c;
int b = i%batch;
int in_w = out_w / stride;
int in_h = out_h / stride;
int in_c = out_c;
int in_index = b*w*h*c + in_c*w*h + in_h*w + in_w;
if(forward) out[out_index] = x[in_index];
else atomicAdd(x+in_index, out[out_index]);
}
extern "C" void upsample_gpu(float *in, int w, int h, int c, int batch, int stride, int forward, float *out)
{
size_t size = w*h*c*batch*stride*stride;
upsample_kernel<<<cuda_gridsize(size), BLOCK>>>(size, in, w, h, c, batch, stride, forward, out);
check_error(cudaPeekAtLastError());
}

149
src/box.c
View File

@ -3,9 +3,83 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
int nms_comparator(const void *pa, const void *pb)
{
detection a = *(detection *)pa;
detection b = *(detection *)pb;
float diff = 0;
if(b.sort_class >= 0){
diff = a.prob[b.sort_class] - b.prob[b.sort_class];
} else {
diff = a.objectness - b.objectness;
}
if(diff < 0) return 1;
else if(diff > 0) return -1;
return 0;
}
void do_nms_obj(detection *dets, int total, int classes, float thresh)
{
int i, j, k;
for(i = 0; i < total; ++i){
dets[i].sort_class = -1;
}
qsort(dets, total, sizeof(detection), nms_comparator);
for(i = 0; i < total; ++i){
if(dets[i].objectness == 0) continue;
box a = dets[i].bbox;
for(j = i+1; j < total; ++j){
if(dets[j].objectness == 0) continue;
box b = dets[j].bbox;
if (box_iou(a, b) > thresh){
dets[j].objectness = 0;
for(k = 0; k < classes; ++k){
dets[j].prob[k] = 0;
}
}
}
}
}
void do_nms_sort(detection *dets, int total, int classes, float thresh)
{
int i, j, k;
k = total-1;
for(i = 0; i <= k; ++i){
if(dets[i].objectness == 0){
detection swap = dets[i];
dets[i] = dets[k];
dets[k] = swap;
--k;
--i;
}
}
total = k+1;
for(k = 0; k < classes; ++k){
for(i = 0; i < total; ++i){
dets[i].sort_class = k;
}
qsort(dets, total, sizeof(detection), nms_comparator);
for(i = 0; i < total; ++i){
if(dets[i].prob[k] == 0) continue;
box a = dets[i].bbox;
for(j = i+1; j < total; ++j){
box b = dets[j].bbox;
if (box_iou(a, b) > thresh){
dets[j].prob[k] = 0;
}
}
}
}
}
box float_to_box(float *f, int stride) box float_to_box(float *f, int stride)
{ {
box b; box b = {0};
b.x = f[0]; b.x = f[0];
b.y = f[1*stride]; b.y = f[1*stride];
b.w = f[2*stride]; b.w = f[2*stride];
@ -230,79 +304,6 @@ dbox diou(box a, box b)
return dd; return dd;
} }
typedef struct{
int index;
int class;
float **probs;
} sortable_bbox;
int nms_comparator(const void *pa, const void *pb)
{
sortable_bbox a = *(sortable_bbox *)pa;
sortable_bbox b = *(sortable_bbox *)pb;
float diff = a.probs[a.index][b.class] - b.probs[b.index][b.class];
if(diff < 0) return 1;
else if(diff > 0) return -1;
return 0;
}
void do_nms_obj(box *boxes, float **probs, int total, int classes, float thresh)
{
int i, j, k;
sortable_bbox *s = calloc(total, sizeof(sortable_bbox));
for(i = 0; i < total; ++i){
s[i].index = i;
s[i].class = classes;
s[i].probs = probs;
}
qsort(s, total, sizeof(sortable_bbox), nms_comparator);
for(i = 0; i < total; ++i){
if(probs[s[i].index][classes] == 0) continue;
box a = boxes[s[i].index];
for(j = i+1; j < total; ++j){
box b = boxes[s[j].index];
if (box_iou(a, b) > thresh){
for(k = 0; k < classes+1; ++k){
probs[s[j].index][k] = 0;
}
}
}
}
free(s);
}
void do_nms_sort(box *boxes, float **probs, int total, int classes, float thresh)
{
int i, j, k;
sortable_bbox *s = calloc(total, sizeof(sortable_bbox));
for(i = 0; i < total; ++i){
s[i].index = i;
s[i].class = 0;
s[i].probs = probs;
}
for(k = 0; k < classes; ++k){
for(i = 0; i < total; ++i){
s[i].class = k;
}
qsort(s, total, sizeof(sortable_bbox), nms_comparator);
for(i = 0; i < total; ++i){
if(probs[s[i].index][k] == 0) continue;
box a = boxes[s[i].index];
for(j = i+1; j < total; ++j){
box b = boxes[s[j].index];
if (box_iou(a, b) > thresh){
probs[s[j].index][k] = 0;
}
}
}
}
free(s);
}
void do_nms(box *boxes, float **probs, int total, int classes, float thresh) void do_nms(box *boxes, float **probs, int total, int classes, float thresh)
{ {

1
src/convolutional_layer.c
View File

@ -203,6 +203,7 @@ convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int
// float scale = 1./sqrt(size*size*c); // float scale = 1./sqrt(size*size*c);
float scale = sqrt(2./(size*size*c/l.groups)); float scale = sqrt(2./(size*size*c/l.groups));
//printf("convscale %f\n", scale);
//scale = .02; //scale = .02;
//for(i = 0; i < c*n*size*size; ++i) l.weights[i] = scale*rand_uniform(-1, 1); //for(i = 0; i < c*n*size*size; ++i) l.weights[i] = scale*rand_uniform(-1, 1);
for(i = 0; i < l.nweights; ++i) l.weights[i] = scale*rand_normal(); for(i = 0; i < l.nweights; ++i) l.weights[i] = scale*rand_normal();

8
src/cost_layer.c
View File

@ -123,14 +123,11 @@ int float_abs_compare (const void * a, const void * b)
void forward_cost_layer_gpu(cost_layer l, network net) void forward_cost_layer_gpu(cost_layer l, network net)
{ {
if (!net.truth_gpu) return; if (!net.truth) return;
if(l.smooth){ if(l.smooth){
scal_gpu(l.batch*l.inputs, (1-l.smooth), net.truth_gpu, 1); scal_gpu(l.batch*l.inputs, (1-l.smooth), net.truth_gpu, 1);
add_gpu(l.batch*l.inputs, l.smooth * 1./l.inputs, net.truth_gpu, 1); add_gpu(l.batch*l.inputs, l.smooth * 1./l.inputs, net.truth_gpu, 1);
} }
if (l.cost_type == MASKED) {
mask_gpu(l.batch*l.inputs, net.input_gpu, SECRET_NUM, net.truth_gpu);
}
if(l.cost_type == SMOOTH){ if(l.cost_type == SMOOTH){
smooth_l1_gpu(l.batch*l.inputs, net.input_gpu, net.truth_gpu, l.delta_gpu, l.output_gpu); smooth_l1_gpu(l.batch*l.inputs, net.input_gpu, net.truth_gpu, l.delta_gpu, l.output_gpu);
@ -144,6 +141,9 @@ void forward_cost_layer_gpu(cost_layer l, network net)
scale_mask_gpu(l.batch*l.inputs, l.delta_gpu, 0, net.truth_gpu, l.noobject_scale); scale_mask_gpu(l.batch*l.inputs, l.delta_gpu, 0, net.truth_gpu, l.noobject_scale);
scale_mask_gpu(l.batch*l.inputs, l.output_gpu, 0, net.truth_gpu, l.noobject_scale); scale_mask_gpu(l.batch*l.inputs, l.output_gpu, 0, net.truth_gpu, l.noobject_scale);
} }
if (l.cost_type == MASKED) {
mask_gpu(l.batch*l.inputs, net.delta_gpu, SECRET_NUM, net.truth_gpu, 0);
}
if(l.ratio){ if(l.ratio){
cuda_pull_array(l.delta_gpu, l.delta, l.batch*l.inputs); cuda_pull_array(l.delta_gpu, l.delta, l.batch*l.inputs);

1
src/data.c
View File

@ -506,6 +506,7 @@ void fill_truth(char *path, char **labels, int k, float *truth)
if(strstr(path, labels[i])){ if(strstr(path, labels[i])){
truth[i] = 1; truth[i] = 1;
++count; ++count;
//printf("%s %s %d\n", path, labels[i], i);
} }
} }
if(count != 1 && (k != 1 || count != 0)) printf("Too many or too few labels: %d, %s\n", count, path); if(count != 1 && (k != 1 || count != 0)) printf("Too many or too few labels: %d, %s\n", count, path);

12
src/deconvolutional_kernels.cu
View File

@ -45,7 +45,7 @@ extern "C" void backward_deconvolutional_layer_gpu(layer l, network net)
{ {
int i; int i;
constrain_gpu(l.outputs*l.batch, 1, l.delta_gpu, 1); //constrain_gpu(l.outputs*l.batch, 1, l.delta_gpu, 1);
gradient_array_gpu(l.output_gpu, l.outputs*l.batch, l.activation, l.delta_gpu); gradient_array_gpu(l.output_gpu, l.outputs*l.batch, l.activation, l.delta_gpu);
if(l.batch_normalize){ if(l.batch_normalize){
@ -116,18 +116,16 @@ void update_deconvolutional_layer_gpu(layer l, update_args a)
float decay = a.decay; float decay = a.decay;
int batch = a.batch; int batch = a.batch;
int size = l.size*l.size*l.c*l.n;
if(a.adam){ if(a.adam){
adam_update_gpu(l.weights_gpu, l.weight_updates_gpu, l.m_gpu, l.v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, size, batch, a.t); adam_update_gpu(l.weights_gpu, l.weight_updates_gpu, l.m_gpu, l.v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, l.nweights, batch, a.t);
adam_update_gpu(l.biases_gpu, l.bias_updates_gpu, l.bias_m_gpu, l.bias_v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, l.n, batch, a.t); adam_update_gpu(l.biases_gpu, l.bias_updates_gpu, l.bias_m_gpu, l.bias_v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, l.n, batch, a.t);
if(l.scales_gpu){ if(l.scales_gpu){
adam_update_gpu(l.scales_gpu, l.scale_updates_gpu, l.scale_m_gpu, l.scale_v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, l.n, batch, a.t); adam_update_gpu(l.scales_gpu, l.scale_updates_gpu, l.scale_m_gpu, l.scale_v_gpu, a.B1, a.B2, a.eps, decay, learning_rate, l.n, batch, a.t);
} }
}else{ }else{
axpy_gpu(size, -decay*batch, l.weights_gpu, 1, l.weight_updates_gpu, 1); axpy_gpu(l.nweights, -decay*batch, l.weights_gpu, 1, l.weight_updates_gpu, 1);
axpy_gpu(size, learning_rate/batch, l.weight_updates_gpu, 1, l.weights_gpu, 1); axpy_gpu(l.nweights, learning_rate/batch, l.weight_updates_gpu, 1, l.weights_gpu, 1);
scal_gpu(size, momentum, l.weight_updates_gpu, 1); scal_gpu(l.nweights, momentum, l.weight_updates_gpu, 1);
axpy_gpu(l.n, learning_rate/batch, l.bias_updates_gpu, 1, l.biases_gpu, 1); axpy_gpu(l.n, learning_rate/batch, l.bias_updates_gpu, 1, l.biases_gpu, 1);
scal_gpu(l.n, momentum, l.bias_updates_gpu, 1); scal_gpu(l.n, momentum, l.bias_updates_gpu, 1);

1
src/deconvolutional_layer.c
View File

@ -39,6 +39,7 @@ layer make_deconvolutional_layer(int batch, int h, int w, int c, int n, int size
l.biases = calloc(n, sizeof(float)); l.biases = calloc(n, sizeof(float));
l.bias_updates = calloc(n, sizeof(float)); l.bias_updates = calloc(n, sizeof(float));
float scale = .02; float scale = .02;
printf("scale: %f\n", scale);
for(i = 0; i < c*n*size*size; ++i) l.weights[i] = scale*rand_normal(); for(i = 0; i < c*n*size*size; ++i) l.weights[i] = scale*rand_normal();
for(i = 0; i < n; ++i){ for(i = 0; i < n; ++i){
l.biases[i] = 0; l.biases[i] = 0;

69
src/demo.c
View File

@ -17,8 +17,6 @@ static char **demo_names;
static image **demo_alphabet; static image **demo_alphabet;
static int demo_classes; static int demo_classes;
static float **probs;
static box *boxes;
static network *net; static network *net;
static image buff [3]; static image buff [3];
static image buff_letter[3]; static image buff_letter[3];
@ -31,13 +29,19 @@ static float demo_hier = .5;
static int running = 0; static int running = 0;
static int demo_frame = 3; static int demo_frame = 3;
static int demo_detections = 0;
static float **predictions;
static int demo_index = 0; static int demo_index = 0;
static int demo_detections = 0;
//static float **predictions;
static detection **dets;
static detection *avg;
//static float *avg;
static int demo_done = 0; static int demo_done = 0;
static float *avg;
double demo_time; double demo_time;
detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative);
detection *make_network_boxes(network *net);
void fill_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, detection *dets);
void *detect_in_thread(void *ptr) void *detect_in_thread(void *ptr)
{ {
running = 1; running = 1;
@ -45,26 +49,45 @@ void *detect_in_thread(void *ptr)
layer l = net->layers[net->n-1]; layer l = net->layers[net->n-1];
float *X = buff_letter[(buff_index+2)%3].data; float *X = buff_letter[(buff_index+2)%3].data;
float *prediction = network_predict(net, X); network_predict(net, X);
memcpy(predictions[demo_index], prediction, l.outputs*sizeof(float)); /*
mean_arrays(predictions, demo_frame, l.outputs, avg);
l.output = avg;
if(l.type == DETECTION){ if(l.type == DETECTION){
get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0); get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0);
} else if (l.type == REGION){ } else */
get_region_boxes(l, buff[0].w, buff[0].h, net->w, net->h, demo_thresh, probs, boxes, 0, 0, 0, demo_hier, 1); if (l.type == REGION){
fill_network_boxes(net, buff[0].w, buff[0].h, demo_thresh, demo_hier, 0, 1, dets[demo_index]);
} else { } else {
error("Last layer must produce detections\n"); error("Last layer must produce detections\n");
} }
if (nms > 0) do_nms_obj(boxes, probs, l.w*l.h*l.n, l.classes, nms);
int i,j;
box zero = {0};
int classes = l.classes;
for(i = 0; i < demo_detections; ++i){
avg[i].objectness = 0;
avg[i].bbox = zero;
memset(avg[i].prob, 0, classes*sizeof(float));
for(j = 0; j < demo_frame; ++j){
axpy_cpu(classes, 1./demo_frame, dets[j][i].prob, 1, avg[i].prob, 1);
avg[i].objectness += dets[j][i].objectness * 1./demo_frame;
avg[i].bbox.x += dets[j][i].bbox.x * 1./demo_frame;
avg[i].bbox.y += dets[j][i].bbox.y * 1./demo_frame;
avg[i].bbox.w += dets[j][i].bbox.w * 1./demo_frame;
avg[i].bbox.h += dets[j][i].bbox.h * 1./demo_frame;
}
//copy_cpu(classes, dets[0][i].prob, 1, avg[i].prob, 1);
//avg[i].objectness = dets[0][i].objectness;
}
if (nms > 0) do_nms_obj(avg, demo_detections, l.classes, nms);
printf("\033[2J"); printf("\033[2J");
printf("\033[1;1H"); printf("\033[1;1H");
printf("\nFPS:%.1f\n",fps); printf("\nFPS:%.1f\n",fps);
printf("Objects:\n\n"); printf("Objects:\n\n");
image display = buff[(buff_index+2) % 3]; image display = buff[(buff_index+2) % 3];
draw_detections(display, demo_detections, demo_thresh, boxes, probs, 0, demo_names, demo_alphabet, demo_classes); draw_detections(display, avg, demo_detections, demo_thresh, demo_names, demo_alphabet, demo_classes);
demo_index = (demo_index + 1)%demo_frame; demo_index = (demo_index + 1)%demo_frame;
running = 0; running = 0;
@ -117,8 +140,7 @@ void *detect_loop(void *ptr)
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen) void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen)
{ {
demo_frame = avg_frames; //demo_frame = avg_frames;
predictions = calloc(demo_frame, sizeof(float*));
image **alphabet = load_alphabet(); image **alphabet = load_alphabet();
demo_names = names; demo_names = names;
demo_alphabet = alphabet; demo_alphabet = alphabet;
@ -152,16 +174,11 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
if(!cap) error("Couldn't connect to webcam.\n"); if(!cap) error("Couldn't connect to webcam.\n");
layer l = net->layers[net->n-1]; demo_detections = num_boxes(net);
demo_detections = l.n*l.w*l.h; avg = make_network_boxes(net);
int j; dets = calloc(demo_frame, sizeof(detection*));
int i;
avg = (float *) calloc(l.outputs, sizeof(float)); for(i = 0; i < demo_frame; ++i) dets[i] = make_network_boxes(net);
for(j = 0; j < demo_frame; ++j) predictions[j] = (float *) calloc(l.outputs, sizeof(float));
boxes = (box *)calloc(l.w*l.h*l.n, sizeof(box));
probs = (float **)calloc(l.w*l.h*l.n, sizeof(float *));
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = (float *)calloc(l.classes+1, sizeof(float));
buff[0] = get_image_from_stream(cap); buff[0] = get_image_from_stream(cap);
buff[1] = copy_image(buff[0]); buff[1] = copy_image(buff[0]);
@ -203,6 +220,7 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
} }
} }
/*
void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen) void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen)
{ {
demo_frame = avg_frames; demo_frame = avg_frames;
@ -290,6 +308,7 @@ void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float th
++count; ++count;
} }
} }
*/
#else #else
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg, float hier, int w, int h, int frames, int fullscreen) void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg, float hier, int w, int h, int frames, int fullscreen)
{ {

18
src/detection_layer.c
View File

@ -222,7 +222,7 @@ void backward_detection_layer(const detection_layer l, network net)
axpy_cpu(l.batch*l.inputs, 1, l.delta, 1, net.delta, 1); axpy_cpu(l.batch*l.inputs, 1, l.delta, 1, net.delta, 1);
} }
void get_detection_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness) void get_detection_detections(layer l, int w, int h, float thresh, detection *dets)
{ {
int i,j,n; int i,j,n;
float *predictions = l.output; float *predictions = l.output;
@ -235,17 +235,17 @@ void get_detection_boxes(layer l, int w, int h, float thresh, float **probs, box
int p_index = l.side*l.side*l.classes + i*l.n + n; int p_index = l.side*l.side*l.classes + i*l.n + n;
float scale = predictions[p_index]; float scale = predictions[p_index];
int box_index = l.side*l.side*(l.classes + l.n) + (i*l.n + n)*4; int box_index = l.side*l.side*(l.classes + l.n) + (i*l.n + n)*4;
boxes[index].x = (predictions[box_index + 0] + col) / l.side * w; box b;
boxes[index].y = (predictions[box_index + 1] + row) / l.side * h; b.x = (predictions[box_index + 0] + col) / l.side * w;
boxes[index].w = pow(predictions[box_index + 2], (l.sqrt?2:1)) * w; b.y = (predictions[box_index + 1] + row) / l.side * h;
boxes[index].h = pow(predictions[box_index + 3], (l.sqrt?2:1)) * h; b.w = pow(predictions[box_index + 2], (l.sqrt?2:1)) * w;
b.h = pow(predictions[box_index + 3], (l.sqrt?2:1)) * h;
dets[index].bbox = b;
dets[index].objectness = scale;
for(j = 0; j < l.classes; ++j){ for(j = 0; j < l.classes; ++j){
int class_index = i*l.classes; int class_index = i*l.classes;
float prob = scale*predictions[class_index+j]; float prob = scale*predictions[class_index+j];
probs[index][j] = (prob > thresh) ? prob : 0; dets[index].prob[j] = (prob > thresh) ? prob : 0;
}
if(only_objectness){
probs[index][0] = scale;
} }
} }
} }

13
src/image.c
View File

@ -235,7 +235,7 @@ image **load_alphabet()
return alphabets; return alphabets;
} }
void draw_detections(image im, int num, float thresh, box *boxes, float **probs, float **masks, char **names, image **alphabet, int classes) void draw_detections(image im, detection *dets, int num, float thresh, char **names, image **alphabet, int classes)
{ {
int i,j; int i,j;
@ -243,7 +243,7 @@ void draw_detections(image im, int num, float thresh, box *boxes, float **probs,
char labelstr[4096] = {0}; char labelstr[4096] = {0};
int class = -1; int class = -1;
for(j = 0; j < classes; ++j){ for(j = 0; j < classes; ++j){
if (probs[i][j] > thresh){ if (dets[i].prob[j] > thresh){
if (class < 0) { if (class < 0) {
strcat(labelstr, names[j]); strcat(labelstr, names[j]);
class = j; class = j;
@ -251,7 +251,7 @@ void draw_detections(image im, int num, float thresh, box *boxes, float **probs,
strcat(labelstr, ", "); strcat(labelstr, ", ");
strcat(labelstr, names[j]); strcat(labelstr, names[j]);
} }
printf("%s: %.0f%%\n", names[j], probs[i][j]*100); printf("%s: %.0f%%\n", names[j], dets[i].prob[j]*100);
} }
} }
if(class >= 0){ if(class >= 0){
@ -276,7 +276,8 @@ void draw_detections(image im, int num, float thresh, box *boxes, float **probs,
rgb[0] = red; rgb[0] = red;
rgb[1] = green; rgb[1] = green;
rgb[2] = blue; rgb[2] = blue;
box b = boxes[i]; box b = dets[i].bbox;
//printf("%f %f %f %f\n", b.x, b.y, b.w, b.h);
int left = (b.x-b.w/2.)*im.w; int left = (b.x-b.w/2.)*im.w;
int right = (b.x+b.w/2.)*im.w; int right = (b.x+b.w/2.)*im.w;
@ -294,8 +295,8 @@ void draw_detections(image im, int num, float thresh, box *boxes, float **probs,
draw_label(im, top + width, left, label, rgb); draw_label(im, top + width, left, label, rgb);
free_image(label); free_image(label);
} }
if (masks){ if (dets[i].mask){
image mask = float_to_image(14, 14, 1, masks[i]); image mask = float_to_image(14, 14, 1, dets[i].mask);
image resized_mask = resize_image(mask, b.w*im.w, b.h*im.h); image resized_mask = resize_image(mask, b.w*im.w, b.h*im.h);
image tmask = threshold_image(resized_mask, .5); image tmask = threshold_image(resized_mask, .5);
embed_image(tmask, im, left, top); embed_image(tmask, im, left, top);

72
src/logistic_layer.c Normal file
View File

@ -0,0 +1,72 @@
#include "logistic_layer.h"
#include "activations.h"
#include "blas.h"
#include "cuda.h"
#include <float.h>
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
layer make_logistic_layer(int batch, int inputs)
{
fprintf(stderr, "logistic x entropy %4d\n", inputs);
layer l = {0};
l.type = LOGXENT;
l.batch = batch;
l.inputs = inputs;
l.outputs = inputs;
l.loss = calloc(inputs*batch, sizeof(float));
l.output = calloc(inputs*batch, sizeof(float));
l.delta = calloc(inputs*batch, sizeof(float));
l.cost = calloc(1, sizeof(float));
l.forward = forward_logistic_layer;
l.backward = backward_logistic_layer;
#ifdef GPU
l.forward_gpu = forward_logistic_layer_gpu;
l.backward_gpu = backward_logistic_layer_gpu;
l.output_gpu = cuda_make_array(l.output, inputs*batch);
l.loss_gpu = cuda_make_array(l.loss, inputs*batch);
l.delta_gpu = cuda_make_array(l.delta, inputs*batch);
#endif
return l;
}
void forward_logistic_layer(const layer l, network net)
{
copy_cpu(l.outputs*l.batch, net.input, 1, l.output, 1);
activate_array(l.output, l.outputs*l.batch, LOGISTIC);
if(net.truth){
logistic_x_ent_cpu(l.batch*l.inputs, l.output, net.truth, l.delta, l.loss);
l.cost[0] = sum_array(l.loss, l.batch*l.inputs);
}
}
void backward_logistic_layer(const layer l, network net)
{
axpy_cpu(l.inputs*l.batch, 1, l.delta, 1, net.delta, 1);
}
#ifdef GPU
void forward_logistic_layer_gpu(const layer l, network net)
{
copy_gpu(l.outputs*l.batch, net.input_gpu, 1, l.output_gpu, 1);
activate_array_gpu(l.output_gpu, l.outputs*l.batch, LOGISTIC);
if(net.truth){
logistic_x_ent_gpu(l.batch*l.inputs, l.output_gpu, net.truth_gpu, l.delta_gpu, l.loss_gpu);
cuda_pull_array(l.loss_gpu, l.loss, l.batch*l.inputs);
l.cost[0] = sum_array(l.loss, l.batch*l.inputs);
printf("hey: %f\n", l.cost[0]);
}
}
void backward_logistic_layer_gpu(const layer layer, network net)
{
axpy_gpu(layer.batch*layer.inputs, 1, layer.delta_gpu, 1, net.delta_gpu, 1);
}
#endif

15
src/logistic_layer.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef LOGISTIC_LAYER_H
#define LOGISTIC_LAYER_H
#include "layer.h"
#include "network.h"
layer make_logistic_layer(int batch, int inputs);
void forward_logistic_layer(const layer l, network net);
void backward_logistic_layer(const layer l, network net);
#ifdef GPU
void forward_logistic_layer_gpu(const layer l, network net);
void backward_logistic_layer_gpu(const layer l, network net);
#endif
#endif

71
src/network.c
View File

@ -26,6 +26,7 @@
#include "softmax_layer.h" #include "softmax_layer.h"
#include "dropout_layer.h" #include "dropout_layer.h"
#include "route_layer.h" #include "route_layer.h"
#include "upsample_layer.h"
#include "shortcut_layer.h" #include "shortcut_layer.h"
#include "parser.h" #include "parser.h"
#include "data.h" #include "data.h"
@ -377,6 +378,8 @@ int resize_network(network *net, int w, int h)
resize_region_layer(&l, w, h); resize_region_layer(&l, w, h);
}else if(l.type == ROUTE){ }else if(l.type == ROUTE){
resize_route_layer(&l, net); resize_route_layer(&l, net);
}else if(l.type == UPSAMPLE){
resize_upsample_layer(&l, w, h);
}else if(l.type == REORG){ }else if(l.type == REORG){
resize_reorg_layer(&l, w, h); resize_reorg_layer(&l, w, h);
}else if(l.type == AVGPOOL){ }else if(l.type == AVGPOOL){
@ -412,7 +415,9 @@ int resize_network(network *net, int w, int h)
cuda_free(net->truth_gpu); cuda_free(net->truth_gpu);
net->input_gpu = cuda_make_array(net->input, net->inputs*net->batch); net->input_gpu = cuda_make_array(net->input, net->inputs*net->batch);
net->truth_gpu = cuda_make_array(net->truth, net->truths*net->batch); net->truth_gpu = cuda_make_array(net->truth, net->truths*net->batch);
net->workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1); if(workspace_size){
net->workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1);
}
}else { }else {
free(net->workspace); free(net->workspace);
net->workspace = calloc(1, workspace_size); net->workspace = calloc(1, workspace_size);
@ -497,34 +502,62 @@ float *network_predict(network *net, float *input)
int num_boxes(network *net) int num_boxes(network *net)
{ {
layer l = net->layers[net->n-1]; int i;
return l.w*l.h*l.n; int s = 0;
for(i = 0; i < net->n; ++i){
layer l = net->layers[i];
if(l.type == REGION || l.type == DETECTION){
s += l.w*l.h*l.n;
}
}
return s;
} }
box *make_boxes(network *net) detection *make_network_boxes(network *net)
{ {
layer l = net->layers[net->n-1]; layer l = net->layers[net->n - 1];
box *boxes = calloc(l.w*l.h*l.n, sizeof(box)); int i;
return boxes; int nboxes = num_boxes(net);
detection *dets = calloc(nboxes, sizeof(detection));
for(i = 0; i < nboxes; ++i){
dets[i].prob = calloc(l.classes, sizeof(float));
if(l.coords > 4){
dets[i].mask = calloc(l.coords-4, sizeof(float));
}
}
return dets;
} }
void fill_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, detection *dets)
float **make_probs(network *net)
{ {
int j; int j;
layer l = net->layers[net->n-1]; for(j = 0; j < net->n; ++j){
float **probs = calloc(l.w*l.h*l.n, sizeof(float *)); layer l = net->layers[j];
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes + 1, sizeof(float *)); if(l.type == REGION){
return probs; get_region_detections(l, w, h, net->w, net->h, thresh, map, hier, relative, dets);
dets += l.w*l.h*l.n;
}
if(l.type == DETECTION){
get_detection_detections(l, w, h, thresh, dets);
dets += l.w*l.h*l.n;
}
}
} }
void network_detect(network *net, image im, float thresh, float hier_thresh, float nms, box *boxes, float **probs) detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative)
{ {
network_predict_image(net, im); detection *dets = make_network_boxes(net);
layer l = net->layers[net->n-1]; fill_network_boxes(net, w, h, thresh, hier, map, relative, dets);
if(l.type == REGION){ return dets;
get_region_boxes(l, im.w, im.h, net->w, net->h, thresh, probs, boxes, 0, 0, 0, hier_thresh, 0); }
if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, l.classes, nms);
void free_detections(detection *dets, int n)
{
int i;
for(i = 0; i < n; ++i){
free(dets[i].prob);
if(dets[i].mask) free(dets[i].mask);
} }
free(dets);
} }
float *network_predict_image(network *net, image im) float *network_predict_image(network *net, image im)

51
src/parser.c
View File

@ -4,6 +4,7 @@
#include <assert.h> #include <assert.h>
#include "activation_layer.h" #include "activation_layer.h"
#include "logistic_layer.h"
#include "activations.h" #include "activations.h"
#include "avgpool_layer.h" #include "avgpool_layer.h"
#include "batchnorm_layer.h" #include "batchnorm_layer.h"
@ -27,6 +28,7 @@
#include "reorg_layer.h" #include "reorg_layer.h"
#include "rnn_layer.h" #include "rnn_layer.h"
#include "route_layer.h" #include "route_layer.h"
#include "upsample_layer.h"
#include "shortcut_layer.h" #include "shortcut_layer.h"
#include "softmax_layer.h" #include "softmax_layer.h"
#include "lstm_layer.h" #include "lstm_layer.h"
@ -53,6 +55,7 @@ LAYER_TYPE string_to_layer_type(char * type)
if (strcmp(type, "[deconv]")==0 if (strcmp(type, "[deconv]")==0
|| strcmp(type, "[deconvolutional]")==0) return DECONVOLUTIONAL; || strcmp(type, "[deconvolutional]")==0) return DECONVOLUTIONAL;
if (strcmp(type, "[activation]")==0) return ACTIVE; if (strcmp(type, "[activation]")==0) return ACTIVE;
if (strcmp(type, "[logistic]")==0) return LOGXENT;
if (strcmp(type, "[net]")==0 if (strcmp(type, "[net]")==0
|| strcmp(type, "[network]")==0) return NETWORK; || strcmp(type, "[network]")==0) return NETWORK;
if (strcmp(type, "[crnn]")==0) return CRNN; if (strcmp(type, "[crnn]")==0) return CRNN;
@ -73,6 +76,7 @@ LAYER_TYPE string_to_layer_type(char * type)
if (strcmp(type, "[soft]")==0 if (strcmp(type, "[soft]")==0
|| strcmp(type, "[softmax]")==0) return SOFTMAX; || strcmp(type, "[softmax]")==0) return SOFTMAX;
if (strcmp(type, "[route]")==0) return ROUTE; if (strcmp(type, "[route]")==0) return ROUTE;
if (strcmp(type, "[upsample]")==0) return UPSAMPLE;
return BLANK; return BLANK;
} }
@ -275,9 +279,27 @@ layer parse_region(list *options, size_params params)
{ {
int coords = option_find_int(options, "coords", 4); int coords = option_find_int(options, "coords", 4);
int classes = option_find_int(options, "classes", 20); int classes = option_find_int(options, "classes", 20);
int num = option_find_int(options, "num", 1); int total = option_find_int(options, "num", 1);
int num = total;
layer l = make_region_layer(params.batch, params.w, params.h, num, classes, coords); char *a = option_find_str(options, "mask", 0);
int *mask = 0;
if(a){
int len = strlen(a);
int n = 1;
int i;
for(i = 0; i < len; ++i){
if (a[i] == ',') ++n;
}
mask = calloc(n, sizeof(int));
for(i = 0; i < n; ++i){
int val = atoi(a);
mask[i] = val;
a = strchr(a, ',')+1;
}
num = n;
}
layer l = make_region_layer(params.batch, params.w, params.h, num, total, mask, classes, coords);
assert(l.outputs == params.inputs); assert(l.outputs == params.inputs);
l.log = option_find_int_quiet(options, "log", 0); l.log = option_find_int_quiet(options, "log", 0);
@ -297,7 +319,7 @@ layer parse_region(list *options, size_params params)
l.coord_scale = option_find_float(options, "coord_scale", 1); l.coord_scale = option_find_float(options, "coord_scale", 1);
l.object_scale = option_find_float(options, "object_scale", 1); l.object_scale = option_find_float(options, "object_scale", 1);
l.noobject_scale = option_find_float(options, "noobject_scale", 1); l.noobject_scale = option_find_float(options, "noobject_scale", 1);
l.mask_scale = option_find_float(options, "mask_scale", 1); l.mask_scale = option_find_float_quiet(options, "mask_scale", 1);
l.class_scale = option_find_float(options, "class_scale", 1); l.class_scale = option_find_float(options, "class_scale", 1);
l.bias_match = option_find_int_quiet(options, "bias_match",0); l.bias_match = option_find_int_quiet(options, "bias_match",0);
@ -306,7 +328,7 @@ layer parse_region(list *options, size_params params)
char *map_file = option_find_str(options, "map", 0); char *map_file = option_find_str(options, "map", 0);
if (map_file) l.map = read_map(map_file); if (map_file) l.map = read_map(map_file);
char *a = option_find_str(options, "anchors", 0); a = option_find_str(options, "anchors", 0);
if(a){ if(a){
int len = strlen(a); int len = strlen(a);
int n = 1; int n = 1;
@ -474,6 +496,15 @@ layer parse_shortcut(list *options, size_params params, network *net)
} }
layer parse_logistic(list *options, size_params params)
{
layer l = make_logistic_layer(params.batch, params.inputs);
l.w = l.out_h = params.h;
l.w = l.out_w = params.w;
l.c = l.out_c = params.c;
return l;
}
layer parse_activation(list *options, size_params params) layer parse_activation(list *options, size_params params)
{ {
char *activation_s = option_find_str(options, "activation", "linear"); char *activation_s = option_find_str(options, "activation", "linear");
@ -491,6 +522,14 @@ layer parse_activation(list *options, size_params params)
return l; return l;
} }
layer parse_upsample(list *options, size_params params, network *net)
{
int stride = option_find_int(options, "stride",2);
layer l = make_upsample_layer(params.batch, params.w, params.h, params.c, stride);
return l;
}
route_layer parse_route(list *options, size_params params, network *net) route_layer parse_route(list *options, size_params params, network *net)
{ {
char *l = option_find(options, "layers"); char *l = option_find(options, "layers");
@ -673,6 +712,8 @@ network *parse_network_cfg(char *filename)
l = parse_local(options, params); l = parse_local(options, params);
}else if(lt == ACTIVE){ }else if(lt == ACTIVE){
l = parse_activation(options, params); l = parse_activation(options, params);
}else if(lt == LOGXENT){
l = parse_logistic(options, params);
}else if(lt == RNN){ }else if(lt == RNN){
l = parse_rnn(options, params); l = parse_rnn(options, params);
}else if(lt == GRU){ }else if(lt == GRU){
@ -706,6 +747,8 @@ network *parse_network_cfg(char *filename)
l = parse_avgpool(options, params); l = parse_avgpool(options, params);
}else if(lt == ROUTE){ }else if(lt == ROUTE){
l = parse_route(options, params, net); l = parse_route(options, params, net);
}else if(lt == UPSAMPLE){
l = parse_upsample(options, params, net);
}else if(lt == SHORTCUT){ }else if(lt == SHORTCUT){
l = parse_shortcut(options, params, net); l = parse_shortcut(options, params, net);
}else if(lt == DROPOUT){ }else if(lt == DROPOUT){

187
src/region_layer.c
View File

@ -10,12 +10,14 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
layer make_region_layer(int batch, int w, int h, int n, int classes, int coords) layer make_region_layer(int batch, int w, int h, int n, int total, int *mask, int classes, int coords)
{ {
int i;
layer l = {0}; layer l = {0};
l.type = REGION; l.type = REGION;
l.n = n; l.n = n;
l.total = total;
l.batch = batch; l.batch = batch;
l.h = h; l.h = h;
l.w = w; l.w = w;
@ -26,15 +28,21 @@ layer make_region_layer(int batch, int w, int h, int n, int classes, int coords)
l.classes = classes; l.classes = classes;
l.coords = coords; l.coords = coords;
l.cost = calloc(1, sizeof(float)); l.cost = calloc(1, sizeof(float));
l.biases = calloc(n*2, sizeof(float)); l.biases = calloc(total*2, sizeof(float));
if(mask) l.mask = mask;
else{
l.mask = calloc(n, sizeof(int));
for(i = 0; i < n; ++i){
l.mask[i] = i;
}
}
l.bias_updates = calloc(n*2, sizeof(float)); l.bias_updates = calloc(n*2, sizeof(float));
l.outputs = h*w*n*(classes + coords + 1); l.outputs = h*w*n*(classes + coords + 1);
l.inputs = l.outputs; l.inputs = l.outputs;
l.truths = 30*(l.coords + 1); l.truths = 30*(l.coords + 1);
l.delta = calloc(batch*l.outputs, sizeof(float)); l.delta = calloc(batch*l.outputs, sizeof(float));
l.output = calloc(batch*l.outputs, sizeof(float)); l.output = calloc(batch*l.outputs, sizeof(float));
int i; for(i = 0; i < total*2; ++i){
for(i = 0; i < n*2; ++i){
l.biases[i] = .5; l.biases[i] = .5;
} }
@ -73,30 +81,37 @@ void resize_region_layer(layer *l, int w, int h)
#endif #endif
} }
box get_region_box(float *x, float *biases, int n, int index, int i, int j, int w, int h, int stride) box get_region_box(float *x, float *biases, int n, int index, int i, int j, int lw, int lh, int w, int h, int stride)
{ {
box b; box b;
b.x = (i + x[index + 0*stride]) / w; b.x = (i + x[index + 0*stride]) / lw;
b.y = (j + x[index + 1*stride]) / h; b.y = (j + x[index + 1*stride]) / lh;
b.w = exp(x[index + 2*stride]) * biases[2*n] / w; b.w = exp(x[index + 2*stride]) * biases[2*n] / w;
b.h = exp(x[index + 3*stride]) * biases[2*n+1] / h; b.h = exp(x[index + 3*stride]) * biases[2*n+1] / h;
return b; return b;
} }
float delta_region_box(box truth, float *x, float *biases, int n, int index, int i, int j, int w, int h, float *delta, float scale, int stride) float delta_region_box(box truth, float *x, float *biases, int n, int index, int i, int j, int lw, int lh, int w, int h, float *delta, float scale, int stride)
{ {
box pred = get_region_box(x, biases, n, index, i, j, w, h, stride); box pred = get_region_box(x, biases, n, index, i, j, lw, lh, w, h, stride);
float iou = box_iou(pred, truth); float iou = box_iou(pred, truth);
float tx = (truth.x*w - i); float tx = (truth.x*lw - i);
float ty = (truth.y*h - j); float ty = (truth.y*lh - j);
float tw = log(truth.w*w / biases[2*n]); float tw = log(truth.w*w / biases[2*n]);
float th = log(truth.h*h / biases[2*n + 1]); float th = log(truth.h*h / biases[2*n + 1]);
//printf("%f %f %f %f\n", tx, ty, tw, th);
delta[index + 0*stride] = scale * (tx - x[index + 0*stride]); delta[index + 0*stride] = scale * (tx - x[index + 0*stride]);
delta[index + 1*stride] = scale * (ty - x[index + 1*stride]); delta[index + 1*stride] = scale * (ty - x[index + 1*stride]);
delta[index + 2*stride] = scale * (tw - x[index + 2*stride]); delta[index + 2*stride] = scale * (tw - x[index + 2*stride]);
delta[index + 3*stride] = scale * (th - x[index + 3*stride]); delta[index + 3*stride] = scale * (th - x[index + 3*stride]);
//printf("x: %f %f\n",tx , x[index + 0*stride]);
//printf("y: %f %f\n",ty , x[index + 1*stride]);
//printf("w: %f %f\n",tw , x[index + 2*stride]);
//printf("h: %f %f\n\n",th , x[index + 3*stride]);
//printf("%f %f %f %f\n", x[index + 0*stride], x[index + 1*stride], x[index + 2*stride], x[index + 3*stride]);
return iou; return iou;
} }
@ -233,7 +248,7 @@ void forward_region_layer(const layer l, network net)
for (i = 0; i < l.w; ++i) { for (i = 0; i < l.w; ++i) {
for (n = 0; n < l.n; ++n) { for (n = 0; n < l.n; ++n) {
int box_index = entry_index(l, b, n*l.w*l.h + j*l.w + i, 0); int box_index = entry_index(l, b, n*l.w*l.h + j*l.w + i, 0);
box pred = get_region_box(l.output, l.biases, n, box_index, i, j, l.w, l.h, l.w*l.h); box pred = get_region_box(l.output, l.biases, l.mask[n], box_index, i, j, l.w, l.h, net.w, net.h, l.w*l.h);
float best_iou = 0; float best_iou = 0;
for(t = 0; t < 30; ++t){ for(t = 0; t < 30; ++t){
box truth = float_to_box(net.truth + t*(l.coords + 1) + b*l.truths, 1); box truth = float_to_box(net.truth + t*(l.coords + 1) + b*l.truths, 1);
@ -251,14 +266,16 @@ void forward_region_layer(const layer l, network net)
l.delta[obj_index] = 0; l.delta[obj_index] = 0;
} }
/*
if(*(net.seen) < 12800){ if(*(net.seen) < 12800){
box truth = {0}; box truth = {0};
truth.x = (i + .5)/l.w; truth.x = (i + .5)/l.w;
truth.y = (j + .5)/l.h; truth.y = (j + .5)/l.h;
truth.w = l.biases[2*n]/l.w; truth.w = l.biases[2*l.mask[n]]/net.w;
truth.h = l.biases[2*n+1]/l.h; truth.h = l.biases[2*l.mask[n]+1]/net.h;
delta_region_box(truth, l.output, l.biases, n, box_index, i, j, l.w, l.h, l.delta, .01, l.w*l.h); delta_region_box(truth, l.output, l.biases, l.mask[n], box_index, i, j, l.w, l.h, net.w, net.h, l.delta, .01, l.w*l.h);
} }
*/
} }
} }
} }
@ -275,16 +292,11 @@ void forward_region_layer(const layer l, network net)
truth_shift.x = 0; truth_shift.x = 0;
truth_shift.y = 0; truth_shift.y = 0;
//printf("index %d %d\n",i, j); //printf("index %d %d\n",i, j);
for(n = 0; n < l.n; ++n){ for(n = 0; n < l.total; ++n){
int box_index = entry_index(l, b, n*l.w*l.h + j*l.w + i, 0); box pred = {0};
box pred = get_region_box(l.output, l.biases, n, box_index, i, j, l.w, l.h, l.w*l.h); pred.w = l.biases[2*n]/net.w;
if(l.bias_match){ pred.h = l.biases[2*n+1]/net.h;
pred.w = l.biases[2*n]/l.w;
pred.h = l.biases[2*n+1]/l.h;
}
//printf("pred: (%f, %f) %f x %f\n", pred.x, pred.y, pred.w, pred.h); //printf("pred: (%f, %f) %f x %f\n", pred.x, pred.y, pred.w, pred.h);
pred.x = 0;
pred.y = 0;
float iou = box_iou(pred, truth_shift); float iou = box_iou(pred, truth_shift);
if (iou > best_iou){ if (iou > best_iou){
best_iou = iou; best_iou = iou;
@ -293,37 +305,41 @@ void forward_region_layer(const layer l, network net)
} }
//printf("%d %f (%f, %f) %f x %f\n", best_n, best_iou, truth.x, truth.y, truth.w, truth.h); //printf("%d %f (%f, %f) %f x %f\n", best_n, best_iou, truth.x, truth.y, truth.w, truth.h);
int box_index = entry_index(l, b, best_n*l.w*l.h + j*l.w + i, 0); int mask_n = int_index(l.mask, best_n, l.n);
float iou = delta_region_box(truth, l.output, l.biases, best_n, box_index, i, j, l.w, l.h, l.delta, l.coord_scale * (2 - truth.w*truth.h), l.w*l.h); //printf("%d %d\n", best_n, mask_n);
if(l.coords > 4){ if(mask_n >= 0){
int mask_index = entry_index(l, b, best_n*l.w*l.h + j*l.w + i, 4); int box_index = entry_index(l, b, mask_n*l.w*l.h + j*l.w + i, 0);
delta_region_mask(net.truth + t*(l.coords + 1) + b*l.truths + 5, l.output, l.coords - 4, mask_index, l.delta, l.w*l.h, l.mask_scale); float iou = delta_region_box(truth, l.output, l.biases, best_n, box_index, i, j, l.w, l.h, net.w, net.h, l.delta, l.coord_scale * (2 - truth.w*truth.h), l.w*l.h);
} if(l.coords > 4){
if(iou > .5) recall += 1; int mask_index = entry_index(l, b, mask_n*l.w*l.h + j*l.w + i, 4);
avg_iou += iou; delta_region_mask(net.truth + t*(l.coords + 1) + b*l.truths + 5, l.output, l.coords - 4, mask_index, l.delta, l.w*l.h, l.mask_scale);
}
if(iou > .5) recall += 1;
avg_iou += iou;
//l.delta[best_index + 4] = iou - l.output[best_index + 4]; //l.delta[best_index + 4] = iou - l.output[best_index + 4];
int obj_index = entry_index(l, b, best_n*l.w*l.h + j*l.w + i, l.coords); int obj_index = entry_index(l, b, mask_n*l.w*l.h + j*l.w + i, l.coords);
avg_obj += l.output[obj_index]; avg_obj += l.output[obj_index];
l.delta[obj_index] = l.object_scale * (1 - l.output[obj_index]); l.delta[obj_index] = l.object_scale * (1 - l.output[obj_index]);
if (l.rescore) { if (l.rescore) {
l.delta[obj_index] = l.object_scale * (iou - l.output[obj_index]); l.delta[obj_index] = l.object_scale * (iou - l.output[obj_index]);
} }
if(l.background){ if(l.background){
l.delta[obj_index] = l.object_scale * (0 - l.output[obj_index]); l.delta[obj_index] = l.object_scale * (0 - l.output[obj_index]);
} }
int class = net.truth[t*(l.coords + 1) + b*l.truths + l.coords]; int class = net.truth[t*(l.coords + 1) + b*l.truths + l.coords];
if (l.map) class = l.map[class]; if (l.map) class = l.map[class];
int class_index = entry_index(l, b, best_n*l.w*l.h + j*l.w + i, l.coords + 1); int class_index = entry_index(l, b, mask_n*l.w*l.h + j*l.w + i, l.coords + 1);
delta_region_class(l.output, l.delta, class_index, class, l.classes, l.softmax_tree, l.class_scale, l.w*l.h, &avg_cat, !l.softmax); delta_region_class(l.output, l.delta, class_index, class, l.classes, l.softmax_tree, l.class_scale, l.w*l.h, &avg_cat, !l.softmax);
++count; ++count;
++class_count; ++class_count;
}
} }
} }
//printf("\n"); //printf("\n");
*(l.cost) = pow(mag_array(l.delta, l.outputs * l.batch), 2); *(l.cost) = pow(mag_array(l.delta, l.outputs * l.batch), 2);
printf("Region Avg IOU: %f, Class: %f, Obj: %f, No Obj: %f, Avg Recall: %f, count: %d\n", avg_iou/count, avg_cat/class_count, avg_obj/count, avg_anyobj/(l.w*l.h*l.n*l.batch), recall/count, count); printf("Region %d Avg IOU: %f, Class: %f, Obj: %f, No Obj: %f, Avg Recall: %f, count: %d\n", net.index, avg_iou/count, avg_cat/class_count, avg_obj/count, avg_anyobj/(l.w*l.h*l.n*l.batch), recall/count, count);
} }
void backward_region_layer(const layer l, network net) void backward_region_layer(const layer l, network net)
@ -339,7 +355,7 @@ void backward_region_layer(const layer l, network net)
*/ */
} }
void correct_region_boxes(box *boxes, int n, int w, int h, int netw, int neth, int relative) void correct_region_boxes(detection *dets, int n, int w, int h, int netw, int neth, int relative)
{ {
int i; int i;
int new_w=0; int new_w=0;
@ -352,7 +368,7 @@ void correct_region_boxes(box *boxes, int n, int w, int h, int netw, int neth, i
new_w = (w * neth)/h; new_w = (w * neth)/h;
} }
for (i = 0; i < n; ++i){ for (i = 0; i < n; ++i){
box b = boxes[i]; box b = dets[i].bbox;
b.x = (b.x - (netw - new_w)/2./netw) / ((float)new_w/netw); b.x = (b.x - (netw - new_w)/2./netw) / ((float)new_w/netw);
b.y = (b.y - (neth - new_h)/2./neth) / ((float)new_h/neth); b.y = (b.y - (neth - new_h)/2./neth) / ((float)new_h/neth);
b.w *= (float)netw/new_w; b.w *= (float)netw/new_w;
@ -363,11 +379,11 @@ void correct_region_boxes(box *boxes, int n, int w, int h, int netw, int neth, i
b.y *= h; b.y *= h;
b.h *= h; b.h *= h;
} }
boxes[i] = b; dets[i].bbox = b;
} }
} }
void get_region_boxes(layer l, int w, int h, int netw, int neth, float thresh, float **probs, box *boxes, float **masks, int only_objectness, int *map, float tree_thresh, int relative) void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets)
{ {
int i,j,n,z; int i,j,n,z;
float *predictions = l.output; float *predictions = l.output;
@ -399,17 +415,19 @@ void get_region_boxes(layer l, int w, int h, int netw, int neth, float thresh, f
int col = i % l.w; int col = i % l.w;
for(n = 0; n < l.n; ++n){ for(n = 0; n < l.n; ++n){
int index = n*l.w*l.h + i; int index = n*l.w*l.h + i;
for(j = 0; j < l.classes; ++j){ for (j = 0; j < l.classes; ++j) {
probs[index][j] = 0; dets[index].prob[j] = 0;
} }
int obj_index = entry_index(l, 0, n*l.w*l.h + i, l.coords); int obj_index = entry_index(l, 0, n*l.w*l.h + i, l.coords);
int box_index = entry_index(l, 0, n*l.w*l.h + i, 0); int box_index = entry_index(l, 0, n*l.w*l.h + i, 0);
int mask_index = entry_index(l, 0, n*l.w*l.h + i, 4); int mask_index = entry_index(l, 0, n*l.w*l.h + i, 4);
float scale = l.background ? 1 : predictions[obj_index]; float scale = l.background ? 1 : predictions[obj_index];
boxes[index] = get_region_box(predictions, l.biases, n, box_index, col, row, l.w, l.h, l.w*l.h); dets[index].bbox = get_region_box(predictions, l.biases, l.mask[n], box_index, col, row, l.w, l.h, netw, neth, l.w*l.h);
if(masks){ dets[index].objectness = scale > thresh ? scale : 0;
dets[index].classes = l.classes;
if(dets[index].mask){
for(j = 0; j < l.coords - 4; ++j){ for(j = 0; j < l.coords - 4; ++j){
masks[index][j] = l.output[mask_index + j*l.w*l.h]; dets[index].mask[j] = l.output[mask_index + j*l.w*l.h];
} }
} }
@ -421,39 +439,24 @@ void get_region_boxes(layer l, int w, int h, int netw, int neth, float thresh, f
for(j = 0; j < 200; ++j){ for(j = 0; j < 200; ++j){
int class_index = entry_index(l, 0, n*l.w*l.h + i, l.coords + 1 + map[j]); int class_index = entry_index(l, 0, n*l.w*l.h + i, l.coords + 1 + map[j]);
float prob = scale*predictions[class_index]; float prob = scale*predictions[class_index];
probs[index][j] = (prob > thresh) ? prob : 0; dets[index].prob[j] = (prob > thresh) ? prob : 0;
} }
} else { } else {
int j = hierarchy_top_prediction(predictions + class_index, l.softmax_tree, tree_thresh, l.w*l.h); int j = hierarchy_top_prediction(predictions + class_index, l.softmax_tree, tree_thresh, l.w*l.h);
probs[index][j] = (scale > thresh) ? scale : 0; dets[index].prob[j] = (scale > thresh) ? scale : 0;
probs[index][l.classes] = scale;
} }
} else { } else {
float max = 0; if(dets[index].objectness){
for(j = 0; j < l.classes; ++j){ for(j = 0; j < l.classes; ++j){
int class_index = entry_index(l, 0, n*l.w*l.h + i, l.coords + 1 + j); int class_index = entry_index(l, 0, n*l.w*l.h + i, l.coords + 1 + j);
float prob = scale*predictions[class_index]; float prob = scale*predictions[class_index];
probs[index][j] = (prob > thresh) ? prob : 0; dets[index].prob[j] = (prob > thresh) ? prob : 0;
if(prob > max) max = prob; }
// TODO REMOVE
// if (j == 56 ) probs[index][j] = 0;
/*
if (j != 0) probs[index][j] = 0;
int blacklist[] = {121, 497, 482, 504, 122, 518,481, 418, 542, 491, 914, 478, 120, 510,500};
int bb;
for (bb = 0; bb < sizeof(blacklist)/sizeof(int); ++bb){
if(index == blacklist[bb]) probs[index][j] = 0;
}
*/
} }
probs[index][l.classes] = max;
}
if(only_objectness){
probs[index][0] = scale;
} }
} }
} }
correct_region_boxes(boxes, l.w*l.h*l.n, w, h, netw, neth, relative); correct_region_boxes(dets, l.w*l.h*l.n, w, h, netw, neth, relative);
} }
#ifdef GPU #ifdef GPU
@ -479,17 +482,17 @@ void forward_region_layer_gpu(const layer l, network net)
if (l.softmax_tree){ if (l.softmax_tree){
int index = entry_index(l, 0, 0, l.coords + 1); int index = entry_index(l, 0, 0, l.coords + 1);
softmax_tree(net.input_gpu + index, l.w*l.h, l.batch*l.n, l.inputs/l.n, 1, l.output_gpu + index, *l.softmax_tree); softmax_tree(net.input_gpu + index, l.w*l.h, l.batch*l.n, l.inputs/l.n, 1, l.output_gpu + index, *l.softmax_tree);
/* /*
int mmin = 9000; int mmin = 9000;
int mmax = 0; int mmax = 0;
int i; int i;
for(i = 0; i < l.softmax_tree->groups; ++i){ for(i = 0; i < l.softmax_tree->groups; ++i){
int group_size = l.softmax_tree->group_size[i]; int group_size = l.softmax_tree->group_size[i];
if (group_size < mmin) mmin = group_size; if (group_size < mmin) mmin = group_size;
if (group_size > mmax) mmax = group_size; if (group_size > mmax) mmax = group_size;
} }
//printf("%d %d %d \n", l.softmax_tree->groups, mmin, mmax); //printf("%d %d %d \n", l.softmax_tree->groups, mmin, mmax);
*/ */
/* /*
// TIMING CODE // TIMING CODE
int zz; int zz;

2
src/region_layer.h
View File

@ -5,7 +5,7 @@
#include "layer.h" #include "layer.h"
#include "network.h" #include "network.h"
layer make_region_layer(int batch, int h, int w, int n, int classes, int coords); layer make_region_layer(int batch, int h, int w, int n, int total, int *mask, int classes, int coords);
void forward_region_layer(const layer l, network net); void forward_region_layer(const layer l, network net);
void backward_region_layer(const layer l, network net); void backward_region_layer(const layer l, network net);
void resize_region_layer(layer *l, int w, int h); void resize_region_layer(layer *l, int w, int h);

20
src/softmax_layer.c
View File

@ -18,8 +18,10 @@ softmax_layer make_softmax_layer(int batch, int inputs, int groups)
l.groups = groups; l.groups = groups;
l.inputs = inputs; l.inputs = inputs;
l.outputs = inputs; l.outputs = inputs;
l.loss = calloc(inputs*batch, sizeof(float));
l.output = calloc(inputs*batch, sizeof(float)); l.output = calloc(inputs*batch, sizeof(float));
l.delta = calloc(inputs*batch, sizeof(float)); l.delta = calloc(inputs*batch, sizeof(float));
l.cost = calloc(1, sizeof(float));
l.forward = forward_softmax_layer; l.forward = forward_softmax_layer;
l.backward = backward_softmax_layer; l.backward = backward_softmax_layer;
@ -28,6 +30,7 @@ softmax_layer make_softmax_layer(int batch, int inputs, int groups)
l.backward_gpu = backward_softmax_layer_gpu; l.backward_gpu = backward_softmax_layer_gpu;
l.output_gpu = cuda_make_array(l.output, inputs*batch); l.output_gpu = cuda_make_array(l.output, inputs*batch);
l.loss_gpu = cuda_make_array(l.loss, inputs*batch);
l.delta_gpu = cuda_make_array(l.delta, inputs*batch); l.delta_gpu = cuda_make_array(l.delta, inputs*batch);
#endif #endif
return l; return l;
@ -46,6 +49,11 @@ void forward_softmax_layer(const softmax_layer l, network net)
} else { } else {
softmax_cpu(net.input, l.inputs/l.groups, l.batch, l.inputs, l.groups, l.inputs/l.groups, 1, l.temperature, l.output); softmax_cpu(net.input, l.inputs/l.groups, l.batch, l.inputs, l.groups, l.inputs/l.groups, 1, l.temperature, l.output);
} }
if(net.truth){
softmax_x_ent_cpu(l.batch*l.inputs, l.output, net.truth, l.delta, l.loss);
l.cost[0] = sum_array(l.loss, l.batch*l.inputs);
}
} }
void backward_softmax_layer(const softmax_layer l, network net) void backward_softmax_layer(const softmax_layer l, network net)
@ -63,6 +71,8 @@ void pull_softmax_layer_output(const softmax_layer layer)
void forward_softmax_layer_gpu(const softmax_layer l, network net) void forward_softmax_layer_gpu(const softmax_layer l, network net)
{ {
if(l.softmax_tree){ if(l.softmax_tree){
softmax_tree(net.input_gpu, 1, l.batch, l.inputs, l.temperature, l.output_gpu, *l.softmax_tree);
/*
int i; int i;
int count = 0; int count = 0;
for (i = 0; i < l.softmax_tree->groups; ++i) { for (i = 0; i < l.softmax_tree->groups; ++i) {
@ -70,6 +80,7 @@ void forward_softmax_layer_gpu(const softmax_layer l, network net)
softmax_gpu(net.input_gpu + count, group_size, l.batch, l.inputs, 1, 0, 1, l.temperature, l.output_gpu + count); softmax_gpu(net.input_gpu + count, group_size, l.batch, l.inputs, 1, 0, 1, l.temperature, l.output_gpu + count);
count += group_size; count += group_size;
} }
*/
} else { } else {
if(l.spatial){ if(l.spatial){
softmax_gpu(net.input_gpu, l.c, l.batch*l.c, l.inputs/l.c, l.w*l.h, 1, l.w*l.h, 1, l.output_gpu); softmax_gpu(net.input_gpu, l.c, l.batch*l.c, l.inputs/l.c, l.w*l.h, 1, l.w*l.h, 1, l.output_gpu);
@ -77,6 +88,15 @@ void forward_softmax_layer_gpu(const softmax_layer l, network net)
softmax_gpu(net.input_gpu, l.inputs/l.groups, l.batch, l.inputs, l.groups, l.inputs/l.groups, 1, l.temperature, l.output_gpu); softmax_gpu(net.input_gpu, l.inputs/l.groups, l.batch, l.inputs, l.groups, l.inputs/l.groups, 1, l.temperature, l.output_gpu);
} }
} }
if(net.truth){
softmax_x_ent_gpu(l.batch*l.inputs, l.output_gpu, net.truth_gpu, l.delta_gpu, l.loss_gpu);
if(l.softmax_tree){
mask_gpu(l.batch*l.inputs, l.delta_gpu, SECRET_NUM, net.truth_gpu, 0);
mask_gpu(l.batch*l.inputs, l.loss_gpu, SECRET_NUM, net.truth_gpu, 0);
}
cuda_pull_array(l.loss_gpu, l.loss, l.batch*l.inputs);
l.cost[0] = sum_array(l.loss, l.batch*l.inputs);
}
} }
void backward_softmax_layer_gpu(const softmax_layer layer, network net) void backward_softmax_layer_gpu(const softmax_layer layer, network net)

99
src/upsample_layer.c Normal file
View File

@ -0,0 +1,99 @@
#include "upsample_layer.h"
#include "cuda.h"
#include "blas.h"
#include <stdio.h>
layer make_upsample_layer(int batch, int w, int h, int c, int stride)
{
layer l = {0};
l.type = UPSAMPLE;
l.batch = batch;
l.w = w;
l.h = h;
l.c = c;
l.stride = stride;
l.out_w = w*stride;
l.out_h = h*stride;
l.out_c = c;
l.outputs = l.out_w*l.out_h*l.out_c;
l.inputs = l.w*l.h*l.c;
l.delta = calloc(l.outputs*batch, sizeof(float));
l.output = calloc(l.outputs*batch, sizeof(float));;
l.forward = forward_upsample_layer;
l.backward = backward_upsample_layer;
#ifdef GPU
l.forward_gpu = forward_upsample_layer_gpu;
l.backward_gpu = backward_upsample_layer_gpu;
l.delta_gpu = cuda_make_array(l.delta, l.outputs*batch);
l.output_gpu = cuda_make_array(l.output, l.outputs*batch);
#endif
fprintf(stderr, "upsample %2dx %4d x%4d x%4d -> %4d x%4d x%4d\n", stride, w, h, c, l.out_w, l.out_h, l.out_c);
return l;
}
void resize_upsample_layer(layer *l, int w, int h)
{
l->w = w;
l->h = h;
l->out_w = w*l->stride;
l->out_h = h*l->stride;
l->outputs = l->out_w*l->out_h*l->out_c;
l->inputs = l->h*l->w*l->c;
l->delta = realloc(l->delta, l->outputs*l->batch*sizeof(float));
l->output = realloc(l->output, l->outputs*l->batch*sizeof(float));
#ifdef GPU
cuda_free(l->output_gpu);
cuda_free(l->delta_gpu);
l->output_gpu = cuda_make_array(l->output, l->outputs*l->batch);
l->delta_gpu = cuda_make_array(l->delta, l->outputs*l->batch);
#endif
}
void forward_upsample_layer(const layer l, network net)
{
int i, j, k, b;
for(b = 0; b < l.batch; ++b){
for(k = 0; k < l.c; ++k){
for(j = 0; j < l.h*l.stride; ++j){
for(i = 0; i < l.w*l.stride; ++i){
int in_index = b*l.inputs + k*l.w*l.h + (j/l.stride)*l.w + i/l.stride;
int out_index = b*l.inputs + k*l.w*l.h + j*l.w + i;
l.output[out_index] = net.input[in_index];
}
}
}
}
}
void backward_upsample_layer(const layer l, network net)
{
int i, j, k, b;
for(b = 0; b < l.batch; ++b){
for(k = 0; k < l.c; ++k){
for(j = 0; j < l.h*l.stride; ++j){
for(i = 0; i < l.w*l.stride; ++i){
int in_index = b*l.inputs + k*l.w*l.h + (j/l.stride)*l.w + i/l.stride;
int out_index = b*l.inputs + k*l.w*l.h + j*l.w + i;
net.delta[in_index] += l.delta[out_index];
}
}
}
}
}
#ifdef GPU
void forward_upsample_layer_gpu(const layer l, network net)
{
upsample_gpu(net.input_gpu, l.w, l.h, l.c, l.batch, l.stride, 1, l.output_gpu);
}
void backward_upsample_layer_gpu(const layer l, network net)
{
upsample_gpu(net.delta_gpu, l.w, l.h, l.c, l.batch, l.stride, 0, l.delta_gpu);
}
#endif

15
src/upsample_layer.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef UPSAMPLE_LAYER_H
#define UPSAMPLE_LAYER_H
#include "darknet.h"
layer make_upsample_layer(int batch, int w, int h, int c, int stride);
void forward_upsample_layer(const layer l, network net);
void backward_upsample_layer(const layer l, network net);
void resize_upsample_layer(layer *l, int w, int h);
#ifdef GPU
void forward_upsample_layer_gpu(const layer l, network net);
void backward_upsample_layer_gpu(const layer l, network net);
#endif
#endif

9
src/utils.c
View File

@ -627,6 +627,15 @@ int max_index(float *a, int n)
return max_i; return max_i;
} }
int int_index(int *a, int val, int n)
{
int i;
for(i = 0; i < n; ++i){
if(a[i] == val) return i;
}
return -1;
}
int rand_int(int min, int max) int rand_int(int min, int max)
{ {
if (max < min){ if (max < min){

2
src/utils.h
View File

@ -37,7 +37,6 @@ list *parse_csv_line(char *line);
char *copy_string(char *s); char *copy_string(char *s);
int count_fields(char *line); int count_fields(char *line);
float *parse_fields(char *line, int n); float *parse_fields(char *line, int n);
void scale_array(float *a, int n, float s);
void translate_array(float *a, int n, float s); void translate_array(float *a, int n, float s);
float constrain(float min, float max, float a); float constrain(float min, float max, float a);
int constrain_int(int a, int min, int max); int constrain_int(int a, int min, int max);
@ -49,6 +48,7 @@ float dist_array(float *a, float *b, int n, int sub);
float **one_hot_encode(float *a, int n, int k); float **one_hot_encode(float *a, int n, int k);
float sec(clock_t clocks); float sec(clock_t clocks);
void print_statistics(float *a, int n); void print_statistics(float *a, int n);
int int_index(int *a, int val, int n);
#endif #endif