From f88baf4a3a756140cef3ca07be98cabb803d80ae Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 18 Dec 2014 23:46:45 +0000
Subject: [PATCH] 99 problems
---
src/cnn.c | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/cnn.c b/src/cnn.c
index ab4b259..fd83ee8 100644
--- a/src/cnn.c
+++ b/src/cnn.c
@@ -151,10 +151,10 @@
//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, .000001, .9, .0005);
+ set_learning_network(&net, net.learning_rate, .5, .0005);
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
int imgs = 1024;
- int i = 20590;
+ int i = 23030;
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);
@@ -177,7 +177,7 @@
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);
free_data(train);
- if(i%10==0){
+ if(i%100==0){
char buff[256];
sprintf(buff, "/home/pjreddie/imagenet_backup/net_%d.cfg", i);
save_network(net, buff);
@@ -355,6 +355,16 @@
free_data(train);
}
+void compare_nist(char *p1,char *p2)
+{
+ srand(222222);
+ network n1 = parse_network_cfg(p1);
+ network n2 = parse_network_cfg(p2);
+ data test = load_categorical_data_csv("data/mnist/mnist_test.csv",0,10);
+ normalize_data_rows(test);
+ compare_networks(n1, n2, test);
+}
+
void test_nist(char *path)
{
srand(222222);
@@ -367,24 +377,30 @@
printf("Accuracy: %f, Time: %lf seconds\n", test_acc,(float)(end-start)/CLOCKS_PER_SEC);
}
-void train_nist()
+void train_nist(char *cfgfile)
{
srand(222222);
- network net = parse_network_cfg("cfg/nist.cfg");
+ // srand(time(0));
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);
- normalize_data_rows(train);
- normalize_data_rows(test);
+ network net = parse_network_cfg(cfgfile);
int count = 0;
int iters = 60000/net.batch + 1;
- while(++count <= 2000){
+ while(++count <= 10){
clock_t start = clock(), end;
+ normalize_data_rows(train);
+ normalize_data_rows(test);
float loss = train_network_sgd(net, train, iters);
- end = clock();
float test_acc = 0;
if(count%1 == 0) test_acc = network_accuracy(net, test);
+ end = clock();
printf("%d: Loss: %f, Test Acc: %f, Time: %lf seconds\n", count, loss, test_acc,(float)(end-start)/CLOCKS_PER_SEC);
}
+ free_data(train);
+ free_data(test);
+ char buff[256];
+ sprintf(buff, "%s.trained", cfgfile);
+ save_network(net, buff);
}
void train_nist_distributed(char *address)
@@ -601,7 +617,6 @@
#endif
if(0==strcmp(argv[1], "detection")) train_detection_net();
- else if(0==strcmp(argv[1], "nist")) train_nist();
else if(0==strcmp(argv[1], "cifar")) train_cifar10();
else if(0==strcmp(argv[1], "test_correct")) test_correct_alexnet();
else if(0==strcmp(argv[1], "test")) test_imagenet();
@@ -615,6 +630,7 @@
fprintf(stderr, "usage: %s <function> <filename>\n", argv[0]);
return 0;
}
+ else if(0==strcmp(argv[1], "nist")) train_nist(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], "detect")) test_detection(argv[2]);
@@ -622,6 +638,11 @@
else if(0==strcmp(argv[1], "visualize")) test_visualize(argv[2]);
else if(0==strcmp(argv[1], "valid")) validate_imagenet(argv[2]);
else if(0==strcmp(argv[1], "testnist")) test_nist(argv[2]);
+ else if(argc < 4){
+ fprintf(stderr, "usage: %s <function> <filename> <filename>\n", argv[0]);
+ return 0;
+ }
+ else if(0==strcmp(argv[1], "compare")) compare_nist(argv[2], argv[3]);
fprintf(stderr, "Success!\n");
return 0;
}
--
Gitblit v1.10.0