From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server
---
src/cnn.c | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/cnn.c b/src/cnn.c
index 7971b95..f40e9a9 100644
--- a/src/cnn.c
+++ b/src/cnn.c
@@ -374,7 +374,7 @@
void train_imagenet_distributed(char *address)
{
float avg_loss = 1;
- srand(0);
+ srand(time(0));
network net = parse_network_cfg("cfg/alexnet.client");
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
int imgs = 1000/net.batch+1;
@@ -412,11 +412,11 @@
{
float avg_loss = 1;
//network net = parse_network_cfg("/home/pjreddie/imagenet_backup/alexnet_1270.cfg");
- srand(0);
+ srand(time(0));
network net = parse_network_cfg("cfg/alexnet.cfg");
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
int imgs = 1000/net.batch+1;
- imgs=1;
+ //imgs=1;
int i = 0;
char **labels = get_labels("/home/pjreddie/data/imagenet/cls.labels.list");
list *plist = get_paths("/data/imagenet/cls.train.list");
@@ -651,19 +651,43 @@
network net = parse_network_cfg("cfg/nist.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 = 50000/net.batch;
+ iters = 1000/net.batch + 1;
while(++count <= 2000){
clock_t start = clock(), end;
- float loss = train_network_sgd(net, train, iters);
+ float loss = train_network_sgd_gpu(net, train, iters);
end = clock();
- float test_acc = network_accuracy(net, test);
+ float test_acc = network_accuracy_gpu(net, test);
+ //float test_acc = 0;
printf("%d: Loss: %f, Test Acc: %f, Time: %lf seconds\n", count, loss, test_acc,(float)(end-start)/CLOCKS_PER_SEC);
}
}
+void train_nist_distributed(char *address)
+{
+ srand(time(0));
+ network net = parse_network_cfg("cfg/nist.client");
+ 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);
+ int count = 0;
+ int iters = 50000/net.batch;
+ iters = 1000/net.batch + 1;
+ while(++count <= 2000){
+ clock_t start = clock(), end;
+ float loss = train_network_sgd_gpu(net, train, iters);
+ client_update(net, address);
+ end = clock();
+ //float test_acc = network_accuracy_gpu(net, test);
+ //float test_acc = 0;
+ printf("%d: Loss: %f, Time: %lf seconds\n", count, loss, (float)(end-start)/CLOCKS_PER_SEC);
+ }
+}
+
void test_ensemble()
{
int i;
@@ -872,8 +896,8 @@
void run_server()
{
- srand(0);
- network net = parse_network_cfg("cfg/alexnet.server");
+ srand(time(0));
+ network net = parse_network_cfg("cfg/nist.server");
server_update(net);
}
void test_client()
@@ -889,12 +913,23 @@
printf("Transfered: %lf seconds\n", sec(clock()-time));
}
+int find_int_arg(int argc, char* argv[], char *arg)
+{
+ int i;
+ for(i = 0; i < argc-1; ++i) if(0==strcmp(argv[i], arg)) return atoi(argv[i+1]);
+ return 0;
+}
+
int main(int argc, char *argv[])
{
if(argc < 2){
fprintf(stderr, "usage: %s <function>\n", argv[0]);
return 0;
}
+ int index = find_int_arg(argc, argv, "-i");
+ #ifdef GPU
+ cl_setup(index);
+ #endif
if(0==strcmp(argv[1], "train")) train_imagenet();
else if(0==strcmp(argv[1], "detection")) train_detection_net();
else if(0==strcmp(argv[1], "asirra")) train_asirra();
@@ -902,13 +937,17 @@
else if(0==strcmp(argv[1], "test_correct")) test_correct_alexnet();
else if(0==strcmp(argv[1], "test")) test_imagenet();
else if(0==strcmp(argv[1], "server")) run_server();
- else if(0==strcmp(argv[1], "client")) train_imagenet_distributed(argv[2]);
else if(0==strcmp(argv[1], "detect")) test_detection();
- else if(0==strcmp(argv[1], "visualize")) test_visualize(argv[2]);
- else if(0==strcmp(argv[1], "valid")) validate_imagenet(argv[2]);
#ifdef GPU
else if(0==strcmp(argv[1], "test_gpu")) test_gpu_blas();
#endif
+ else if(argc < 3){
+ fprintf(stderr, "usage: %s <function>\n", argv[0]);
+ return 0;
+ }
+ else if(0==strcmp(argv[1], "client")) train_nist_distributed(argv[2]);
+ else if(0==strcmp(argv[1], "visualize")) test_visualize(argv[2]);
+ else if(0==strcmp(argv[1], "valid")) validate_imagenet(argv[2]);
fprintf(stderr, "Success!\n");
return 0;
}
--
Gitblit v1.10.0