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

Maxpool fixes

Browse Source
This commit is contained in:
AlexeyAB
2018-08-07 23:19:50 +03:00
parent b3b78afb8f
commit e6c97a53a7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/maxpool_layer.c
View File

@ -80,8 +80,8 @@ void resize_maxpool_layer(maxpool_layer *l, int w, int h)
void forward_maxpool_layer(const maxpool_layer l, network_state state) void forward_maxpool_layer(const maxpool_layer l, network_state state)
{ {
int b,i,j,k,m,n; int b,i,j,k,m,n;
int w_offset = -l.pad / l.stride; int w_offset = -l.pad / 2;
int h_offset = -l.pad / l.stride; int h_offset = -l.pad / 2;
int h = l.out_h; int h = l.out_h;
int w = l.out_w; int w = l.out_w;

7
src/utils.c
View File

@ -210,6 +210,9 @@ void replace_image_to_label(char *input_path, char *output_path) {
find_replace(input_path, "/images/train2014/", "/labels/train2014/", output_path); // COCO find_replace(input_path, "/images/train2014/", "/labels/train2014/", output_path); // COCO
find_replace(output_path, "/images/val2014/", "/labels/val2014/", output_path); // COCO find_replace(output_path, "/images/val2014/", "/labels/val2014/", output_path); // COCO
find_replace(output_path, "/JPEGImages/", "/labels/", output_path); // PascalVOC find_replace(output_path, "/JPEGImages/", "/labels/", output_path); // PascalVOC
find_replace(input_path, "\\images\\train2014\\", "\\labels\\train2014\\", output_path); // COCO
find_replace(output_path, "\\images\\val2014\\", "\\labels\\val2014\\", output_path); // COCO
find_replace(output_path, "\\JPEGImages\\", "\\labels\\", output_path); // PascalVOC
//find_replace(output_path, "/VOC2007/JPEGImages/", "/VOC2007/labels/", output_path); // PascalVOC //find_replace(output_path, "/VOC2007/JPEGImages/", "/VOC2007/labels/", output_path); // PascalVOC
//find_replace(output_path, "/VOC2012/JPEGImages/", "/VOC2012/labels/", output_path); // PascalVOC //find_replace(output_path, "/VOC2012/JPEGImages/", "/VOC2012/labels/", output_path); // PascalVOC
@ -578,7 +581,7 @@ float mag_array(float *a, int n)
int i; int i;
float sum = 0; float sum = 0;
for(i = 0; i < n; ++i){ for(i = 0; i < n; ++i){
sum += a[i]*a[i]; sum += a[i]*a[i];
} }
return sqrt(sum); return sqrt(sum);
} }
@ -673,7 +676,7 @@ float rand_normal()
size_t rand_size_t() size_t rand_size_t()
{ {
return ((size_t)(rand()&0xff) << 56) | return ((size_t)(rand()&0xff) << 56) |
((size_t)(rand()&0xff) << 48) | ((size_t)(rand()&0xff) << 48) |
((size_t)(rand()&0xff) << 40) | ((size_t)(rand()&0xff) << 40) |
((size_t)(rand()&0xff) << 32) | ((size_t)(rand()&0xff) << 32) |