From f7a17f82eb43de864a4f980f235055da9685eef8 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 29 Jan 2014 00:28:42 +0000
Subject: [PATCH] Convolutional layers working w/ matrices
---
src/image.c | 205 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 154 insertions(+), 51 deletions(-)
diff --git a/src/image.c b/src/image.c
index a509d32..62ee5f7 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,4 +1,5 @@
#include "image.h"
+#include "utils.h"
#include <stdio.h>
int windows = 0;
@@ -9,22 +10,55 @@
for(i = 0; i < a.h*a.w*a.c; ++i) a.data[i] -= b.data[i];
}
+void embed_image(image source, image dest, int h, int w)
+{
+ int i,j,k;
+ for(k = 0; k < source.c; ++k){
+ for(i = 0; i < source.h; ++i){
+ for(j = 0; j < source.w; ++j){
+ float val = get_pixel(source, i,j,k);
+ set_pixel(dest, h+i, w+j, k, val);
+ }
+ }
+ }
+}
+
+image collapse_image_layers(image source, int border)
+{
+ int h = source.h;
+ h = (h+border)*source.c - border;
+ image dest = make_image(h, source.w, 1);
+ int i;
+ for(i = 0; i < source.c; ++i){
+ image layer = get_image_layer(source, i);
+ int h_offset = i*(source.h+border);
+ embed_image(layer, dest, h_offset, 0);
+ free_image(layer);
+ }
+ return dest;
+}
+
+void z_normalize_image(image p)
+{
+ normalize_array(p.data, p.h*p.w*p.c);
+}
+
void normalize_image(image p)
{
- double *min = calloc(p.c, sizeof(double));
- double *max = calloc(p.c, sizeof(double));
+ float *min = calloc(p.c, sizeof(float));
+ float *max = calloc(p.c, sizeof(float));
int i,j;
for(i = 0; i < p.c; ++i) min[i] = max[i] = p.data[i*p.h*p.w];
for(j = 0; j < p.c; ++j){
for(i = 0; i < p.h*p.w; ++i){
- double v = p.data[i+j*p.h*p.w];
+ float v = p.data[i+j*p.h*p.w];
if(v < min[j]) min[j] = v;
if(v > max[j]) max[j] = v;
}
}
for(i = 0; i < p.c; ++i){
- if(max[i] - min[i] < .00001){
+ if(max[i] - min[i] < .000000001){
min[i] = 0;
max[i] = 1;
}
@@ -38,17 +72,17 @@
free(max);
}
-double avg_image_layer(image m, int l)
+float avg_image_layer(image m, int l)
{
int i;
- double sum = 0;
+ float sum = 0;
for(i = 0; i < m.h*m.w; ++i){
sum += m.data[l*m.h*m.w + i];
}
return sum/(m.h*m.w);
}
-void threshold_image(image p, double t)
+void threshold_image(image p, float t)
{
int i;
for(i = 0; i < p.w*p.h*p.c; ++i){
@@ -59,8 +93,8 @@
image copy_image(image p)
{
image copy = p;
- copy.data = calloc(p.h*p.w*p.c, sizeof(double));
- memcpy(copy.data, p.data, p.h*p.w*p.c*sizeof(double));
+ copy.data = calloc(p.h*p.w*p.c, sizeof(float));
+ memcpy(copy.data, p.data, p.h*p.w*p.c*sizeof(float));
return copy;
}
@@ -71,12 +105,13 @@
normalize_image(copy);
char buff[256];
- sprintf(buff, "%s (%d)", name, windows);
+ //sprintf(buff, "%s (%d)", name, windows);
+ sprintf(buff, "%s", name);
IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
int step = disp->widthStep;
cvNamedWindow(buff, CV_WINDOW_AUTOSIZE);
- cvMoveWindow(buff, 100*(windows%10) + 200*(windows/10), 100*(windows%10));
+ //cvMoveWindow(buff, 100*(windows%10) + 200*(windows/10), 100*(windows%10));
++windows;
for(i = 0; i < p.h; ++i){
for(j = 0; j < p.w; ++j){
@@ -85,9 +120,16 @@
}
}
}
- if(disp->height < 100 || disp->width < 100){
+ free_image(copy);
+ if(disp->height < 500 || disp->width < 500){
+ int w = 1500;
+ int h = w*p.h/p.w;
+ if(h > 1000){
+ h = 1000;
+ w = h*p.w/p.h;
+ }
IplImage *buffer = disp;
- disp = cvCreateImage(cvSize(100,100*p.h/p.w), buffer->depth, buffer->nChannels);
+ disp = cvCreateImage(cvSize(w, h), buffer->depth, buffer->nChannels);
cvResize(buffer, disp, CV_INTER_NN);
cvReleaseImage(&buffer);
}
@@ -107,6 +149,13 @@
}
}
+void show_image_collapsed(image p, char *name)
+{
+ image c = collapse_image_layers(p, 1);
+ show_image(c, name);
+ free_image(c);
+}
+
image make_empty_image(int h, int w, int c)
{
image out;
@@ -119,11 +168,11 @@
image make_image(int h, int w, int c)
{
image out = make_empty_image(h,w,c);
- out.data = calloc(h*w*c, sizeof(double));
+ out.data = calloc(h*w*c, sizeof(float));
return out;
}
-image double_to_image(int h, int w, int c, double *data)
+image float_to_image(int h, int w, int c, float *data)
{
image out = make_empty_image(h,w,c);
out.data = data;
@@ -132,12 +181,12 @@
void zero_image(image m)
{
- memset(m.data, 0, m.h*m.w*m.c*sizeof(double));
+ memset(m.data, 0, m.h*m.w*m.c*sizeof(float));
}
void zero_channel(image m, int c)
{
- memset(&(m.data[c*m.h*m.w]), 0, m.h*m.w*sizeof(double));
+ memset(&(m.data[c*m.h*m.w]), 0, m.h*m.w*sizeof(float));
}
void rotate_image(image m)
@@ -145,7 +194,7 @@
int i,j;
for(j = 0; j < m.c; ++j){
for(i = 0; i < m.h*m.w/2; ++i){
- double swap = m.data[j*m.h*m.w + i];
+ float swap = m.data[j*m.h*m.w + i];
m.data[j*m.h*m.w + i] = m.data[j*m.h*m.w + (m.h*m.w-1 - i)];
m.data[j*m.h*m.w + (m.h*m.w-1 - i)] = swap;
}
@@ -157,16 +206,30 @@
image out = make_image(h,w,c);
int i;
for(i = 0; i < h*w*c; ++i){
- out.data[i] = (.5-(double)rand()/RAND_MAX);
+ out.data[i] = rand_normal();
+ //out.data[i] = rand()%3;
}
return out;
}
-image make_random_kernel(int size, int c)
+void add_scalar_image(image m, float s)
+{
+ int i;
+ for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
+}
+
+void scale_image(image m, float s)
+{
+ int i;
+ for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
+}
+
+image make_random_kernel(int size, int c, float scale)
{
int pad;
if((pad=(size%2==0))) ++size;
image out = make_random_image(size,size,c);
+ scale_image(out, scale);
int i,k;
if(pad){
for(k = 0; k < out.c; ++k){
@@ -217,58 +280,69 @@
return out;
}
-double get_pixel(image m, int x, int y, int c)
+float get_pixel(image m, int x, int y, int c)
{
assert(x < m.h && y < m.w && c < m.c);
return m.data[c*m.h*m.w + x*m.w + y];
}
-double get_pixel_extend(image m, int x, int y, int c)
+float get_pixel_extend(image m, int x, int y, int c)
{
if(x < 0 || x >= m.h || y < 0 || y >= m.w || c < 0 || c >= m.c) return 0;
return get_pixel(m, x, y, c);
}
-void set_pixel(image m, int x, int y, int c, double val)
+void set_pixel(image m, int x, int y, int c, float val)
{
assert(x < m.h && y < m.w && c < m.c);
m.data[c*m.h*m.w + x*m.w + y] = val;
}
-void set_pixel_extend(image m, int x, int y, int c, double val)
+void set_pixel_extend(image m, int x, int y, int c, float val)
{
if(x < 0 || x >= m.h || y < 0 || y >= m.w || c < 0 || c >= m.c) return;
set_pixel(m, x, y, c, val);
}
-void add_pixel(image m, int x, int y, int c, double val)
+void add_pixel(image m, int x, int y, int c, float val)
{
assert(x < m.h && y < m.w && c < m.c);
m.data[c*m.h*m.w + x*m.w + y] += val;
}
-void add_pixel_extend(image m, int x, int y, int c, double val)
+void add_pixel_extend(image m, int x, int y, int c, float val)
{
if(x < 0 || x >= m.h || y < 0 || y >= m.w || c < 0 || c >= m.c) return;
add_pixel(m, x, y, c, val);
}
-void two_d_convolve(image m, int mc, image kernel, int kc, int stride, image out, int oc)
+void two_d_convolve(image m, int mc, image kernel, int kc, int stride, image out, int oc, int edge)
{
int x,y,i,j;
- for(x = 0; x < m.h; x += stride){
- for(y = 0; y < m.w; y += stride){
- double sum = 0;
+ int xstart, xend, ystart, yend;
+ if(edge){
+ xstart = ystart = 0;
+ xend = m.h;
+ yend = m.w;
+ }else{
+ xstart = kernel.h/2;
+ ystart = kernel.w/2;
+ xend = m.h-kernel.h/2;
+ yend = m.w - kernel.w/2;
+ }
+ for(x = xstart; x < xend; x += stride){
+ for(y = ystart; y < yend; y += stride){
+ float sum = 0;
for(i = 0; i < kernel.h; ++i){
for(j = 0; j < kernel.w; ++j){
sum += get_pixel(kernel, i, j, kc)*get_pixel_extend(m, x+i-kernel.h/2, y+j-kernel.w/2, mc);
}
}
- add_pixel(out, x/stride, y/stride, oc, sum);
+ add_pixel(out, (x-xstart)/stride, (y-ystart)/stride, oc, sum);
}
}
}
-double single_convolve(image m, image kernel, int x, int y)
+float single_convolve(image m, image kernel, int x, int y)
{
- double sum = 0;
+ float sum = 0;
int i, j, k;
for(i = 0; i < kernel.h; ++i){
for(j = 0; j < kernel.w; ++j){
@@ -280,19 +354,19 @@
return sum;
}
-void convolve(image m, image kernel, int stride, int channel, image out)
+void convolve(image m, image kernel, int stride, int channel, image out, int edge)
{
assert(m.c == kernel.c);
int i;
zero_channel(out, channel);
for(i = 0; i < m.c; ++i){
- two_d_convolve(m, i, kernel, i, stride, out, channel);
+ two_d_convolve(m, i, kernel, i, stride, out, channel, edge);
}
/*
int j;
for(i = 0; i < m.h; i += stride){
for(j = 0; j < m.w; j += stride){
- double val = single_convolve(m, kernel, i, j);
+ float val = single_convolve(m, kernel, i, j);
set_pixel(out, i/stride, j/stride, channel, val);
}
}
@@ -306,67 +380,96 @@
for(k = 0; k < m.c; ++k){
for(i = 0; i < m.h; ++i){
for(j = 0; j< m.w; ++j){
- double val = get_pixel(m, i, j, k);
+ float val = get_pixel(m, i, j, k);
set_pixel(out, i*stride, j*stride, k, val);
}
}
}
}
-void single_update(image m, image update, int x, int y, double error)
+void single_update(image m, image update, int x, int y, float error)
{
int i, j, k;
for(i = 0; i < update.h; ++i){
for(j = 0; j < update.w; ++j){
for(k = 0; k < update.c; ++k){
- double val = get_pixel_extend(m, x+i-update.h/2, y+j-update.w/2, k);
+ float val = get_pixel_extend(m, x+i-update.h/2, y+j-update.w/2, k);
add_pixel(update, i, j, k, val*error);
}
}
}
}
-void kernel_update(image m, image update, int stride, int channel, image out)
+void kernel_update(image m, image update, int stride, int channel, image out, int edge)
{
assert(m.c == update.c);
zero_image(update);
- int i, j;
- for(i = 0; i < m.h; i += stride){
- for(j = 0; j < m.w; j += stride){
- double error = get_pixel(out, i/stride, j/stride, channel);
+ int i, j, istart, jstart, iend, jend;
+ if(edge){
+ istart = jstart = 0;
+ iend = m.h;
+ jend = m.w;
+ }else{
+ istart = update.h/2;
+ jstart = update.w/2;
+ iend = m.h-update.h/2;
+ jend = m.w - update.w/2;
+ }
+ for(i = istart; i < iend; i += stride){
+ for(j = jstart; j < jend; j += stride){
+ float error = get_pixel(out, (i-istart)/stride, (j-jstart)/stride, channel);
single_update(m, update, i, j, error);
}
}
+ /*
for(i = 0; i < update.h*update.w*update.c; ++i){
update.data[i] /= (m.h/stride)*(m.w/stride);
}
+ */
}
-void single_back_convolve(image m, image kernel, int x, int y, double val)
+void single_back_convolve(image m, image kernel, int x, int y, float val)
{
int i, j, k;
for(i = 0; i < kernel.h; ++i){
for(j = 0; j < kernel.w; ++j){
for(k = 0; k < kernel.c; ++k){
- double pval = get_pixel(kernel, i, j, k) * val;
+ float pval = get_pixel(kernel, i, j, k) * val;
add_pixel_extend(m, x+i-kernel.h/2, y+j-kernel.w/2, k, pval);
}
}
}
}
-void back_convolve(image m, image kernel, int stride, int channel, image out)
+void back_convolve(image m, image kernel, int stride, int channel, image out, int edge)
{
assert(m.c == kernel.c);
- int i, j;
- for(i = 0; i < m.h; i += stride){
- for(j = 0; j < m.w; j += stride){
- double val = get_pixel(out, i/stride, j/stride, channel);
+ int i, j, istart, jstart, iend, jend;
+ if(edge){
+ istart = jstart = 0;
+ iend = m.h;
+ jend = m.w;
+ }else{
+ istart = kernel.h/2;
+ jstart = kernel.w/2;
+ iend = m.h-kernel.h/2;
+ jend = m.w - kernel.w/2;
+ }
+ for(i = istart; i < iend; i += stride){
+ for(j = jstart; j < jend; j += stride){
+ float val = get_pixel(out, (i-istart)/stride, (j-jstart)/stride, channel);
single_back_convolve(m, kernel, i, j, val);
}
}
}
+void print_image(image m)
+{
+ int i;
+ for(i =0 ; i < m.h*m.w*m.c; ++i) printf("%lf, ", m.data[i]);
+ printf("\n");
+}
+
void free_image(image m)
{
free(m.data);
--
Gitblit v1.10.0