From 153705226d8ca746478b69eeac9bc854766daa11 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 27 Jan 2015 21:31:06 +0000
Subject: [PATCH] Bias updates bug fix
---
src/cnn.c | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/src/cnn.c b/src/cnn.c
index e587a1b..4f575dc 100644
--- a/src/cnn.c
+++ b/src/cnn.c
@@ -7,7 +7,7 @@
#include "data.h"
#include "matrix.h"
#include "utils.h"
-#include "mini_blas.h"
+#include "blas.h"
#include "matrix.h"
#include "server.h"
@@ -105,7 +105,7 @@
time=clock();
float loss = train_network(net, train);
avg_loss = avg_loss*.9 + loss*.1;
- printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), i*imgs*net.batch);
+ printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), i*imgs);
if(i%100==0){
char buff[256];
sprintf(buff, "/home/pjreddie/imagenet_backup/detnet_%d.cfg", i);
@@ -165,6 +165,7 @@
free_data(val);
}
}
+/*
void train_imagenet_distributed(char *address)
{
@@ -203,6 +204,7 @@
free_data(train);
}
}
+*/
void train_imagenet(char *cfgfile)
{
@@ -210,10 +212,11 @@
//network net = parse_network_cfg("/home/pjreddie/imagenet_backup/alexnet_1270.cfg");
srand(time(0));
network net = parse_network_cfg(cfgfile);
- set_learning_network(&net, net.learning_rate, 0, net.decay);
+ //test_learn_bias(*(convolutional_layer *)net.layers[1]);
+ //set_learning_network(&net, net.learning_rate, 0, net.decay);
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
- int imgs = 1024;
- int i = 77700;
+ int imgs = 3072;
+ int i = net.seen/imgs;
char **labels = get_labels("/home/pjreddie/data/imagenet/cls.labels.list");
list *plist = get_paths("/data/imagenet/cls.train.list");
char **paths = (char **)list_to_array(plist);
@@ -224,23 +227,24 @@
data buffer;
load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
while(1){
- i += 1;
+ ++i;
time=clock();
pthread_join(load_thread, 0);
train = buffer;
//normalize_data_rows(train);
- translate_data_rows(train, -128);
- scale_data_rows(train, 1./128);
+ //translate_data_rows(train, -128);
+ //scale_data_rows(train, 1./128);
load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
float loss = train_network(net, train);
+ net.seen += imgs;
avg_loss = avg_loss*.9 + loss*.1;
- printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), i*imgs);
+ printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), net.seen);
free_data(train);
if(i%100==0){
char buff[256];
- sprintf(buff, "/home/pjreddie/imagenet_backup/net_%d.cfg", i);
+ sprintf(buff, "/home/pjreddie/imagenet_backup/alexnet_%d.cfg", i);
save_network(net, buff);
}
}
@@ -272,7 +276,7 @@
pthread_join(load_thread, 0);
val = buffer;
- normalize_data_rows(val);
+ //normalize_data_rows(val);
num = (i+1)*m/splits - i*m/splits;
char **part = paths+(i*m/splits);
@@ -380,25 +384,26 @@
cvWaitKey(0);
}
-void test_cifar10()
+void test_cifar10(char *cfgfile)
{
- network net = parse_network_cfg("cfg/cifar10_part5.cfg");
+ network net = parse_network_cfg(cfgfile);
data test = load_cifar10_data("data/cifar10/test_batch.bin");
clock_t start = clock(), end;
- float test_acc = network_accuracy(net, test);
+ float test_acc = network_accuracy_multi(net, test, 10);
end = clock();
- printf("%f in %f Sec\n", test_acc, (float)(end-start)/CLOCKS_PER_SEC);
- visualize_network(net);
- cvWaitKey(0);
+ printf("%f in %f Sec\n", test_acc, sec(end-start));
+ //visualize_network(net);
+ //cvWaitKey(0);
}
-void train_cifar10()
+void train_cifar10(char *cfgfile)
{
srand(555555);
- network net = parse_network_cfg("cfg/cifar10.cfg");
+ srand(time(0));
+ network net = parse_network_cfg(cfgfile);
data test = load_cifar10_data("data/cifar10/test_batch.bin");
int count = 0;
- int iters = 10000/net.batch;
+ int iters = 50000/net.batch;
data train = load_all_cifar10();
while(++count <= 10000){
clock_t time = clock();
@@ -407,9 +412,9 @@
if(count%10 == 0){
float test_acc = network_accuracy(net, test);
printf("%d: Loss: %f, Test Acc: %f, Time: %lf seconds\n", count, loss, test_acc,sec(clock()-time));
- //char buff[256];
- //sprintf(buff, "unikitty/cifar10_%d.cfg", count);
- //save_network(net, buff);
+ char buff[256];
+ sprintf(buff, "/home/pjreddie/imagenet_backup/cifar10_%d.cfg", count);
+ save_network(net, buff);
}else{
printf("%d: Loss: %f, Time: %lf seconds\n", count, loss, sec(clock()-time));
}
@@ -466,6 +471,7 @@
save_network(net, buff);
}
+/*
void train_nist_distributed(char *address)
{
srand(time(0));
@@ -487,6 +493,7 @@
printf("%d: Loss: %f, Time: %lf seconds\n", count, loss, (float)(end-start)/CLOCKS_PER_SEC);
}
}
+*/
void test_ensemble()
{
@@ -537,14 +544,33 @@
cvWaitKey(0);
}
+void test_convolutional_layer()
+{
+ network net = parse_network_cfg("cfg/nist_conv.cfg");
+ int size = get_network_input_size(net);
+ float *in = calloc(size, sizeof(float));
+ int i;
+ for(i = 0; i < size; ++i) in[i] = rand_normal();
+ float *in_gpu = cuda_make_array(in, size);
+ convolutional_layer layer = *(convolutional_layer *)net.layers[0];
+ int out_size = convolutional_out_height(layer)*convolutional_out_width(layer)*layer.batch;
+ cuda_compare(layer.output_gpu, layer.output, out_size, "nothing");
+ cuda_compare(layer.biases_gpu, layer.biases, layer.n, "biases");
+ cuda_compare(layer.filters_gpu, layer.filters, layer.n*layer.size*layer.size*layer.c, "filters");
+ bias_output(layer);
+ bias_output_gpu(layer);
+ cuda_compare(layer.output_gpu, layer.output, out_size, "biased output");
+}
+
void test_correct_nist()
{
+ network net = parse_network_cfg("cfg/nist_conv.cfg");
srand(222222);
- network net = parse_network_cfg("cfg/nist.cfg");
+ net = parse_network_cfg("cfg/nist_conv.cfg");
data train = load_categorical_data_csv("data/mnist/mnist_train.csv", 0, 10);
data test = load_categorical_data_csv("data/mnist/mnist_test.csv",0,10);
- translate_data_rows(train, -144);
- translate_data_rows(test, -144);
+ normalize_data_rows(train);
+ normalize_data_rows(test);
int count = 0;
int iters = 1000/net.batch;
@@ -555,11 +581,12 @@
float test_acc = network_accuracy(net, test);
printf("%d: Loss: %f, Test Acc: %f, Time: %lf seconds, LR: %f, Momentum: %f, Decay: %f\n", count, loss, test_acc,(float)(end-start)/CLOCKS_PER_SEC, net.learning_rate, net.momentum, net.decay);
}
+ save_network(net, "cfg/nist_gpu.cfg");
gpu_index = -1;
count = 0;
srand(222222);
- net = parse_network_cfg("cfg/nist.cfg");
+ net = parse_network_cfg("cfg/nist_conv.cfg");
while(++count <= 5){
clock_t start = clock(), end;
float loss = train_network_sgd(net, train, iters);
@@ -567,6 +594,7 @@
float test_acc = network_accuracy(net, test);
printf("%d: Loss: %f, Test Acc: %f, Time: %lf seconds, LR: %f, Momentum: %f, Decay: %f\n", count, loss, test_acc,(float)(end-start)/CLOCKS_PER_SEC, net.learning_rate, net.momentum, net.decay);
}
+ save_network(net, "cfg/nist_cpu.cfg");
}
void test_correct_alexnet()
@@ -612,6 +640,7 @@
}
}
+/*
void run_server()
{
srand(time(0));
@@ -632,6 +661,7 @@
printf("3\n");
printf("Transfered: %lf seconds\n", sec(clock()-time));
}
+*/
void del_arg(int argc, char **argv, int index)
{
@@ -665,6 +695,7 @@
int main(int argc, char **argv)
{
+ //test_convolutional_layer();
if(argc < 2){
fprintf(stderr, "usage: %s <function>\n", argv[0]);
return 0;
@@ -676,15 +707,14 @@
gpu_index = -1;
#else
if(gpu_index >= 0){
- cl_setup();
+ cudaSetDevice(gpu_index);
}
#endif
- if(0==strcmp(argv[1], "cifar")) train_cifar10();
- else if(0==strcmp(argv[1], "test_correct")) test_correct_alexnet();
+ if(0==strcmp(argv[1], "test_correct")) test_correct_alexnet();
else if(0==strcmp(argv[1], "test_correct_nist")) test_correct_nist();
else if(0==strcmp(argv[1], "test")) test_imagenet();
- else if(0==strcmp(argv[1], "server")) run_server();
+ //else if(0==strcmp(argv[1], "server")) run_server();
#ifdef GPU
else if(0==strcmp(argv[1], "test_gpu")) test_gpu_blas();
@@ -695,9 +725,11 @@
return 0;
}
else if(0==strcmp(argv[1], "detection")) train_detection_net(argv[2]);
+ else if(0==strcmp(argv[1], "ctrain")) train_cifar10(argv[2]);
else if(0==strcmp(argv[1], "nist")) train_nist(argv[2]);
+ else if(0==strcmp(argv[1], "ctest")) test_cifar10(argv[2]);
else if(0==strcmp(argv[1], "train")) train_imagenet(argv[2]);
- else if(0==strcmp(argv[1], "client")) train_imagenet_distributed(argv[2]);
+ //else if(0==strcmp(argv[1], "client")) train_imagenet_distributed(argv[2]);
else if(0==strcmp(argv[1], "detect")) test_detection(argv[2]);
else if(0==strcmp(argv[1], "init")) test_init(argv[2]);
else if(0==strcmp(argv[1], "visualize")) test_visualize(argv[2]);
--
Gitblit v1.10.0