From 1b5afb45838e603fa6780762eb8cc59246dc2d81 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Tue, 08 May 2018 11:09:35 +0000
Subject: [PATCH] Output improvements for detector results: When printing detector results, output was done in random order, obfuscating results for interpreting. Now: 1. Text output includes coordinates of rects in (left,right,top,bottom in pixels) along with label and score 2. Text output is sorted by rect lefts to simplify finding appropriate rects on image 3. If several class probs are > thresh for some detection, the most probable is written first and coordinates for others are not repeated 4. Rects are imprinted in image in order by their best class prob, so most probable rects are always on top and not overlayed by less probable ones 5. Most probable label for rect is always written first Also: 6. Message about low GPU memory include required amount
---
src/activations.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index 7da5ce2..0cbb2f5 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -10,14 +10,30 @@
switch(a){
case LOGISTIC:
return "logistic";
+ case LOGGY:
+ return "loggy";
case RELU:
return "relu";
+ case ELU:
+ return "elu";
+ case RELIE:
+ return "relie";
case RAMP:
return "ramp";
case LINEAR:
return "linear";
case TANH:
return "tanh";
+ case PLSE:
+ return "plse";
+ case LEAKY:
+ return "leaky";
+ case STAIR:
+ return "stair";
+ case HARDTAN:
+ return "hardtan";
+ case LHTAN:
+ return "lhtan";
default:
break;
}
@@ -27,10 +43,18 @@
ACTIVATION get_activation(char *s)
{
if (strcmp(s, "logistic")==0) return LOGISTIC;
+ if (strcmp(s, "loggy")==0) return LOGGY;
if (strcmp(s, "relu")==0) return RELU;
+ if (strcmp(s, "elu")==0) return ELU;
+ if (strcmp(s, "relie")==0) return RELIE;
+ if (strcmp(s, "plse")==0) return PLSE;
+ if (strcmp(s, "hardtan")==0) return HARDTAN;
+ if (strcmp(s, "lhtan")==0) return LHTAN;
if (strcmp(s, "linear")==0) return LINEAR;
if (strcmp(s, "ramp")==0) return RAMP;
+ if (strcmp(s, "leaky")==0) return LEAKY;
if (strcmp(s, "tanh")==0) return TANH;
+ if (strcmp(s, "stair")==0) return STAIR;
fprintf(stderr, "Couldn't find activation function %s, going with ReLU\n", s);
return RELU;
}
@@ -42,12 +66,28 @@
return linear_activate(x);
case LOGISTIC:
return logistic_activate(x);
+ case LOGGY:
+ return loggy_activate(x);
case RELU:
return relu_activate(x);
+ case ELU:
+ return elu_activate(x);
+ case RELIE:
+ return relie_activate(x);
case RAMP:
return ramp_activate(x);
+ case LEAKY:
+ return leaky_activate(x);
case TANH:
return tanh_activate(x);
+ case PLSE:
+ return plse_activate(x);
+ case STAIR:
+ return stair_activate(x);
+ case HARDTAN:
+ return hardtan_activate(x);
+ case LHTAN:
+ return lhtan_activate(x);
}
return 0;
}
@@ -67,12 +107,28 @@
return linear_gradient(x);
case LOGISTIC:
return logistic_gradient(x);
+ case LOGGY:
+ return loggy_gradient(x);
case RELU:
return relu_gradient(x);
+ case ELU:
+ return elu_gradient(x);
+ case RELIE:
+ return relie_gradient(x);
case RAMP:
return ramp_gradient(x);
+ case LEAKY:
+ return leaky_gradient(x);
case TANH:
return tanh_gradient(x);
+ case PLSE:
+ return plse_gradient(x);
+ case STAIR:
+ return stair_gradient(x);
+ case HARDTAN:
+ return hardtan_gradient(x);
+ case LHTAN:
+ return lhtan_gradient(x);
}
return 0;
}
--
Gitblit v1.10.0