From 076009ebe308fde0156304e701f36e8bb04e4d6b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:14:59 +0000
Subject: [PATCH] Fixed batch stuff in conv layer
---
src/utils.c | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 3b8b5a8..67a9ba1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -123,9 +123,9 @@
return count;
}
-double *parse_fields(char *line, int n)
+float *parse_fields(char *line, int n)
{
- double *field = calloc(n, sizeof(double));
+ float *field = calloc(n, sizeof(float));
char *c, *p, *end;
int count = 0;
int done = 0;
@@ -143,36 +143,36 @@
return field;
}
-double mean_array(double *a, int n)
+float mean_array(float *a, int n)
{
int i;
- double sum = 0;
+ float sum = 0;
for(i = 0; i < n; ++i) sum += a[i];
return sum/n;
}
-double variance_array(double *a, int n)
+float variance_array(float *a, int n)
{
int i;
- double sum = 0;
- double mean = mean_array(a, n);
+ float sum = 0;
+ float mean = mean_array(a, n);
for(i = 0; i < n; ++i) sum += (a[i] - mean)*(a[i]-mean);
- double variance = sum/n;
+ float variance = sum/n;
return variance;
}
-double constrain(double a, double max)
+float constrain(float a, float max)
{
if(a > abs(max)) return abs(max);
if(a < -abs(max)) return -abs(max);
return a;
}
-void normalize_array(double *a, int n)
+void normalize_array(float *a, int n)
{
int i;
- double mu = mean_array(a,n);
- double sigma = sqrt(variance_array(a,n));
+ float mu = mean_array(a,n);
+ float sigma = sqrt(variance_array(a,n));
for(i = 0; i < n; ++i){
a[i] = (a[i] - mu)/sigma;
}
@@ -180,7 +180,7 @@
sigma = sqrt(variance_array(a,n));
}
-void translate_array(double *a, int n, double s)
+void translate_array(float *a, int n, float s)
{
int i;
for(i = 0; i < n; ++i){
@@ -188,18 +188,18 @@
}
}
-void scale_array(double *a, int n, double s)
+void scale_array(float *a, int n, float s)
{
int i;
for(i = 0; i < n; ++i){
a[i] *= s;
}
}
-int max_index(double *a, int n)
+int max_index(float *a, int n)
{
if(n <= 0) return -1;
int i, max_i = 0;
- double max = a[0];
+ float max = a[0];
for(i = 1; i < n; ++i){
if(a[i] > max){
max = a[i];
@@ -209,10 +209,27 @@
return max_i;
}
-double rand_normal()
+float rand_normal()
{
int i;
- double sum= 0;
- for(i = 0; i < 12; ++i) sum += (double)rand()/RAND_MAX;
+ float sum= 0;
+ for(i = 0; i < 12; ++i) sum += (float)rand()/RAND_MAX;
return sum-6.;
}
+float rand_uniform()
+{
+ return (float)rand()/RAND_MAX;
+}
+
+float **one_hot_encode(float *a, int n, int k)
+{
+ int i;
+ float **t = calloc(n, sizeof(float*));
+ for(i = 0; i < n; ++i){
+ t[i] = calloc(k, sizeof(float));
+ int index = (int)a[i];
+ t[i][index] = 1;
+ }
+ return t;
+}
+
--
Gitblit v1.10.0