mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

improve compatibility with c++ compilers, prepare for CMake

Browse Source
This commit is contained in:
Stefano Sinigardi
2019-02-14 17:28:23 +01:00
parent 3d9c8530a0
commit b3579380dc
128 changed files with 1871 additions and 2258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/yolo_v2_class.cpp
View File

@ -20,7 +20,6 @@ extern "C" {
#include <iostream>
#include <algorithm>
#define FRAMES 3
//static Detector* detector = NULL;
static std::unique_ptr<Detector> detector;
@ -93,9 +92,9 @@ void check_cuda(cudaError_t status) {
struct detector_gpu_t {
network net;
image images[FRAMES];
image images[NFRAMES];
float *avg;
float *predictions[FRAMES];
float* predictions[NFRAMES];
int demo_index;
unsigned int *track_id;
};
@ -135,8 +134,8 @@ LIB_API Detector::Detector(std::string cfg_filename, std::string weight_filename
int j;
detector_gpu.avg = (float *)calloc(l.outputs, sizeof(float));
for (j = 0; j < FRAMES; ++j) detector_gpu.predictions[j] = (float *)calloc(l.outputs, sizeof(float));
for (j = 0; j < FRAMES; ++j) detector_gpu.images[j] = make_image(1, 1, 3);
for (j = 0; j < NFRAMES; ++j) detector_gpu.predictions[j] = (float*)calloc(l.outputs, sizeof(float));
for (j = 0; j < NFRAMES; ++j) detector_gpu.images[j] = make_image(1, 1, 3);
detector_gpu.track_id = (unsigned int *)calloc(l.classes, sizeof(unsigned int));
for (j = 0; j < l.classes; ++j) detector_gpu.track_id[j] = 1;
@ -155,8 +154,8 @@ LIB_API Detector::~Detector()
free(detector_gpu.track_id);
free(detector_gpu.avg);
for (int j = 0; j < FRAMES; ++j) free(detector_gpu.predictions[j]);
for (int j = 0; j < FRAMES; ++j) if(detector_gpu.images[j].data) free(detector_gpu.images[j].data);
for (int j = 0; j < NFRAMES; ++j) free(detector_gpu.predictions[j]);
for (int j = 0; j < NFRAMES; ++j) if (detector_gpu.images[j].data) free(detector_gpu.images[j].data);
int old_gpu_index;
#ifdef GPU
@ -275,9 +274,9 @@ LIB_API std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool use
if (use_mean) {
memcpy(detector_gpu.predictions[detector_gpu.demo_index], prediction, l.outputs * sizeof(float));
mean_arrays(detector_gpu.predictions, FRAMES, l.outputs, detector_gpu.avg);
mean_arrays(detector_gpu.predictions, NFRAMES, l.outputs, detector_gpu.avg);
l.output = detector_gpu.avg;
detector_gpu.demo_index = (detector_gpu.demo_index + 1) % FRAMES;
detector_gpu.demo_index = (detector_gpu.demo_index + 1) % NFRAMES;
}
//get_region_boxes(l, 1, 1, thresh, detector_gpu.probs, detector_gpu.boxes, 0, 0);
//if (nms) do_nms_sort(detector_gpu.boxes, detector_gpu.probs, l.w*l.h*l.n, l.classes, nms);
@ -378,4 +377,4 @@ LIB_API std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_v
}
return cur_bbox_vec;
}
}