From 8b5344ee2dc551dbe673020a33021e7f84f305f1 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 14 May 2018 10:34:40 +0000
Subject: [PATCH] Added BFLOPs output for network configurations
---
src/convolutional_layer.c | 4 +++-
src/parser.c | 5 ++++-
src/layer.h | 1 +
src/maxpool_layer.c | 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/convolutional_layer.c b/src/convolutional_layer.c
index b8065fd..a349454 100644
--- a/src/convolutional_layer.c
+++ b/src/convolutional_layer.c
@@ -397,7 +397,9 @@
l.workspace_size = get_workspace_size(l);
l.activation = activation;
- fprintf(stderr, "conv %5d %2d x%2d /%2d %4d x%4d x%4d -> %4d x%4d x%4d\n", n, size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c);
+ //fprintf(stderr, "conv %5d %2d x%2d /%2d %4d x%4d x%4d -> %4d x%4d x%4d\n", n, size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c);
+ l.bflops = (2.0 * l.n * l.size*l.size*l.c * l.out_h*l.out_w) / 1000000000.;
+ fprintf(stderr, "conv %5d %2d x%2d /%2d %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", n, size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
return l;
}
diff --git a/src/layer.h b/src/layer.h
index 81e27ad..8a58c92 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -113,6 +113,7 @@
int tanh;
int *mask;
int total;
+ float bflops;
int adam;
float B1;
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 031d116..41f7a79 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -47,7 +47,8 @@
l.output_gpu = cuda_make_array(l.output, output_size);
l.delta_gpu = cuda_make_array(l.delta, output_size);
#endif
- fprintf(stderr, "max %d x %d / %d %4d x%4d x%4d -> %4d x%4d x%4d\n", size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c);
+ l.bflops = (l.size*l.size*l.c * l.out_h*l.out_w) / 1000000000.;
+ fprintf(stderr, "max %d x %d / %d %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
return l;
}
diff --git a/src/parser.c b/src/parser.c
index 7441ae2..2b013de 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -712,6 +712,7 @@
params.time_steps = net.time_steps;
params.net = net;
+ float bflops = 0;
size_t workspace_size = 0;
n = n->next;
int count = 0;
@@ -719,7 +720,7 @@
fprintf(stderr, "layer filters size input output\n");
while(n){
params.index = count;
- fprintf(stderr, "%5d ", count);
+ fprintf(stderr, "%4d ", count);
s = (section *)n->val;
options = s->options;
layer l = {0};
@@ -796,10 +797,12 @@
params.c = l.out_c;
params.inputs = l.outputs;
}
+ if (l.bflops > 0) bflops += l.bflops;
}
free_list(sections);
net.outputs = get_network_output_size(net);
net.output = get_network_output(net);
+ printf("Total BFLOPS %5.3f \n", bflops);
if(workspace_size){
//printf("%ld\n", workspace_size);
#ifdef GPU
--
Gitblit v1.10.0