Use half_float16 instead of float32 if defined both CUDNN and CUDNN_HALF. U...

AlexeyAB

2018-02-22 dda993f3dd3c753dfd580d485b39c1001830fee4

 src/detector.c

@@ -552,9 +552,14 @@
   args.h = net.h;
   args.type = IMAGE_DATA;

   const float thresh_calc_avg_iou = 0.24;
   float avg_iou = 0;
   int tp_for_thresh = 0;
   int fp_for_thresh = 0;

   box_prob *detections = calloc(1, sizeof(box_prob));
   int detections_count = 0;
   int unique_truth_index = 0;
   int unique_truth_count = 0;

   int *truth_classes_count = calloc(classes, sizeof(int));

@@ -642,7 +647,7 @@
                     if (current_iou > iou_thresh && class_id == truth[j].id) {
                        if (current_iou > max_iou) {
                           max_iou = current_iou;
                           truth_index = unique_truth_index + j;
                           truth_index = unique_truth_count + j;
                        }
                     }
                  }
@@ -659,14 +664,25 @@
                        float current_iou = box_iou(boxes[i], t);
                        if (current_iou > iou_thresh && class_id == truth_dif[j].id) {
                           --detections_count;
                           break;
                        }
                     }
                  }

                  // calc avg IoU, true-positives, false-positives for required Threshold
                  if (prob > thresh_calc_avg_iou) {
                     if (truth_index > -1) {
                        avg_iou += max_iou;
                        ++tp_for_thresh;
                     }
                     else
                        fp_for_thresh++;
                  }
               }
            }
         }
         
         unique_truth_index += num_labels;
         unique_truth_count += num_labels;

         free(id);
         free_image(val[t]);
@@ -674,6 +690,8 @@
      }
   }

   avg_iou = avg_iou / (tp_for_thresh + fp_for_thresh);

   
   // SORT(detections)
   qsort(detections, detections_count, sizeof(box_prob), detections_comparator);
@@ -689,10 +707,10 @@
   for (i = 0; i < classes; ++i) {
      pr[i] = calloc(detections_count, sizeof(pr_t));
   }
   printf("detections_count = %d, unique_truth_index = %d  \n", detections_count, unique_truth_index);
   printf("detections_count = %d, unique_truth_count = %d  \n", detections_count, unique_truth_count);


   int *truth_flags = calloc(unique_truth_index, sizeof(int));
   int *truth_flags = calloc(unique_truth_count, sizeof(int));

   int rank;
   for (rank = 0; rank < detections_count; ++rank) {
@@ -763,6 +781,9 @@
      mean_average_precision += avg_precision;
   }
   
   printf(" for thresh = %0.2f, TP = %d, FP = %d, FN = %d, average IoU = %2.2f %% \n", 
      thresh_calc_avg_iou, tp_for_thresh, fp_for_thresh, unique_truth_count - tp_for_thresh, avg_iou * 100);

   mean_average_precision = mean_average_precision / classes;
   printf("\n mean average precision (mAP) = %f, or %2.2f %% \n", mean_average_precision, mean_average_precision*100);

@@ -838,6 +859,7 @@

void run_detector(int argc, char **argv)
{
   int http_stream_port = find_int_arg(argc, argv, "-http_port", -1);
   char *out_filename = find_char_arg(argc, argv, "-out_filename", 0);
    char *prefix = find_char_arg(argc, argv, "-prefix", 0);
    float thresh = find_float_arg(argc, argv, "-thresh", .24);
@@ -890,6 +912,6 @@
        char **names = get_labels(name_list);
      if(filename)
         if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0;
        demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename);
        demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename, http_stream_port);
    }
}