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

fixed consistency darknet and python code

Browse Source
This commit is contained in:
AlexeyAB
2019-11-23 20:00:35 +03:00
parent 61f8f569b7
commit 3abbd85808
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/darknet/x64/darknet.py
View File

@ -60,7 +60,8 @@ class DETECTION(Structure):
("mask", POINTER(c_float)), ("mask", POINTER(c_float)),
("objectness", c_float), ("objectness", c_float),
("sort_class", c_int), ("sort_class", c_int),
("uc", POINTER(c_float))] ("uc", POINTER(c_float)),
("points", c_int)]
class IMAGE(Structure): class IMAGE(Structure):

3
darknet.py
View File

@ -60,7 +60,8 @@ class DETECTION(Structure):
("mask", POINTER(c_float)), ("mask", POINTER(c_float)),
("objectness", c_float), ("objectness", c_float),
("sort_class", c_int), ("sort_class", c_int),
("uc", POINTER(c_float))] ("uc", POINTER(c_float)),
("points", c_int)]
class IMAGE(Structure): class IMAGE(Structure):

8
src/gaussian_yolo_layer.c
View File

@ -136,10 +136,10 @@ box get_gaussian_yolo_box(float *x, float *biases, int n, int index, int i, int
b.w = exp(x[index + 4 * stride]) * biases[2 * n] / w; b.w = exp(x[index + 4 * stride]) * biases[2 * n] / w;
b.h = exp(x[index + 6 * stride]) * biases[2 * n + 1] / h; b.h = exp(x[index + 6 * stride]) * biases[2 * n + 1] / h;
b.x = (i + x[index + 0 * stride]) / lw;
b.y = (j + x[index + 2 * stride]) / lh;
if (yolo_point == YOLO_CENTER) { if (yolo_point == YOLO_CENTER) {
b.x = (i + x[index + 0 * stride]) / lw;
b.y = (j + x[index + 2 * stride]) / lh;
} }
else if (yolo_point == YOLO_LEFT_TOP) { else if (yolo_point == YOLO_LEFT_TOP) {
b.x = (i + x[index + 0 * stride]) / lw + b.w / 2; b.x = (i + x[index + 0 * stride]) / lw + b.w / 2;
@ -176,12 +176,12 @@ float delta_gaussian_yolo_box(box truth, float *x, float *biases, int n, int ind
float tx, ty, tw, th; float tx, ty, tw, th;
tx = (truth.x*lw - i);
ty = (truth.y*lh - j);
tw = log(truth.w*w / biases[2 * n]); tw = log(truth.w*w / biases[2 * n]);
th = log(truth.h*h / biases[2 * n + 1]); th = log(truth.h*h / biases[2 * n + 1]);
if (yolo_point == YOLO_CENTER) { if (yolo_point == YOLO_CENTER) {
tx = (truth.x*lw - i);
ty = (truth.y*lh - j);
} }
else if (yolo_point == YOLO_LEFT_TOP) { else if (yolo_point == YOLO_LEFT_TOP) {
tx = ((truth.x - truth.w / 2)*lw - i); tx = ((truth.x - truth.w / 2)*lw - i);