From 65bff2683bdffe7ec82eacd8144c70c09d19c88d Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 16 Feb 2018 20:55:37 +0000
Subject: [PATCH] It takes into account the Difficult for calculating mAP for PascalVOC
---
src/blas.c | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/src/blas.c b/src/blas.c
index 31bd86b..cb6501f 100644
--- a/src/blas.c
+++ b/src/blas.c
@@ -1,5 +1,6 @@
#include "blas.h"
-#include "math.h"
+
+#include <math.h>
#include <assert.h>
#include <float.h>
#include <stdio.h>
@@ -54,6 +55,16 @@
}
}
+void weighted_delta_cpu(float *a, float *b, float *s, float *da, float *db, float *ds, int n, float *dc)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ if(da) da[i] += dc[i] * s[i];
+ if(db) db[i] += dc[i] * (1-s[i]);
+ ds[i] += dc[i] * (a[i] - b[i]);
+ }
+}
+
void shortcut_cpu(int batch, int w1, int h1, int c1, float *add, int w2, int h2, int c2, float *out)
{
int stride = w1/w2;
@@ -161,12 +172,48 @@
for(i = 0; i < N; ++i) X[i*INCX] = ALPHA;
}
+void deinter_cpu(int NX, float *X, int NY, float *Y, int B, float *OUT)
+{
+ int i, j;
+ int index = 0;
+ for(j = 0; j < B; ++j) {
+ for(i = 0; i < NX; ++i){
+ if(X) X[j*NX + i] += OUT[index];
+ ++index;
+ }
+ for(i = 0; i < NY; ++i){
+ if(Y) Y[j*NY + i] += OUT[index];
+ ++index;
+ }
+ }
+}
+
+void inter_cpu(int NX, float *X, int NY, float *Y, int B, float *OUT)
+{
+ int i, j;
+ int index = 0;
+ for(j = 0; j < B; ++j) {
+ for(i = 0; i < NX; ++i){
+ OUT[index++] = X[j*NX + i];
+ }
+ for(i = 0; i < NY; ++i){
+ OUT[index++] = Y[j*NY + i];
+ }
+ }
+}
+
void copy_cpu(int N, float *X, int INCX, float *Y, int INCY)
{
int i;
for(i = 0; i < N; ++i) Y[i*INCY] = X[i*INCX];
}
+void mult_add_into_cpu(int N, float *X, float *Y, float *Z)
+{
+ int i;
+ for(i = 0; i < N; ++i) Z[i] += X[i]*Y[i];
+}
+
void smooth_l1_cpu(int n, float *pred, float *truth, float *delta, float *error)
{
int i;
@@ -179,11 +226,21 @@
}
else {
error[i] = 2*abs_val - 1;
- delta[i] = (diff < 0) ? -1 : 1;
+ delta[i] = (diff < 0) ? 1 : -1;
}
}
}
+void l1_cpu(int n, float *pred, float *truth, float *delta, float *error)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ float diff = truth[i] - pred[i];
+ error[i] = fabs(diff);
+ delta[i] = diff > 0 ? 1 : -1;
+ }
+}
+
void l2_cpu(int n, float *pred, float *truth, float *delta, float *error)
{
int i;
@@ -202,21 +259,32 @@
return dot;
}
-void softmax(float *input, int n, float temp, float *output)
+void softmax(float *input, int n, float temp, float *output, int stride)
{
int i;
float sum = 0;
float largest = -FLT_MAX;
for(i = 0; i < n; ++i){
- if(input[i] > largest) largest = input[i];
+ if(input[i*stride] > largest) largest = input[i*stride];
}
for(i = 0; i < n; ++i){
- float e = exp(input[i]/temp - largest/temp);
+ float e = exp(input[i*stride]/temp - largest/temp);
sum += e;
- output[i] = e;
+ output[i*stride] = e;
}
for(i = 0; i < n; ++i){
- output[i] /= sum;
+ output[i*stride] /= sum;
+ }
+}
+
+
+void softmax_cpu(float *input, int n, int batch, int batch_offset, int groups, int group_offset, int stride, float temp, float *output)
+{
+ int g, b;
+ for(b = 0; b < batch; ++b){
+ for(g = 0; g < groups; ++g){
+ softmax(input + b*batch_offset + g*group_offset, n, temp, output + b*batch_offset + g*group_offset, stride);
+ }
}
}
--
Gitblit v1.10.0