[libfann] 24/242: changed some benchmark stuff
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
chrisk-guest pushed a commit to tag Version2_0_0
in repository libfann.
commit 665291dfc9fe93b2e82516068f785caf94c5455b
Author: Steffen Nissen <lukesky at diku.dk>
Date: Tue Dec 9 11:23:12 2003 +0000
changed some benchmark stuff
---
benchmarks/benchmark.sh | 18 ++++++++++++------
benchmarks/performance.cc | 39 ++++++++++-----------------------------
benchmarks/quality.cc | 2 +-
3 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/benchmarks/benchmark.sh b/benchmarks/benchmark.sh
index 33e9c40..df6c868 100755
--- a/benchmarks/benchmark.sh
+++ b/benchmarks/benchmark.sh
@@ -12,38 +12,44 @@
#./performance_arm lwnn lwnn_performance_arm.out 1 512 2 20
#./performance_arm jneural jneural_performance_arm.out 1 512 2 20
+rm -f *_fixed.net
./quality fann datasets/building.train datasets/building.test building_fann_train.out building_fann_test.out 16 0 200 1
-./quality_fixed building_fann_train.out_fixed_train building_fann_train.out_fixed_test building_fann_fixed_train.out building_fann_fixed_test.out *_fixed
+./quality_fixed building_fann_train.out_fixed_train building_fann_train.out_fixed_test building_fann_fixed_train.out building_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/building.train datasets/building.test building_fann_stepwise_train.out building_fann_stepwise_test.out 16 0 200 1
./quality lwnn datasets/building.train datasets/building.test building_lwnn_train.out building_lwnn_test.out 16 0 200 1
./quality jneural datasets/building.train datasets/building.test building_jneural_train.out building_jneural_test.out 16 0 200 1
+rm -f *_fixed.net
./quality fann datasets/card.train datasets/card.test card_fann_train.out card_fann_test.out 32 0 200 1
-./quality_fixed card_fann_train.out_fixed_train card_fann_train.out_fixed_test card_fann_fixed_train.out card_fann_fixed_test.out *_fixed
+./quality_fixed card_fann_train.out_fixed_train card_fann_train.out_fixed_test card_fann_fixed_train.out card_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/card.train datasets/card.test card_fann_stepwise_train.out card_fann_stepwise_test.out 32 0 200 1
./quality lwnn datasets/card.train datasets/card.test card_lwnn_train.out card_lwnn_test.out 32 0 200 1
./quality jneural datasets/card.train datasets/card.test card_jneural_train.out card_jneural_test.out 32 0 200 1
+rm -f *_fixed.net
./quality fann datasets/gene.train datasets/gene.test gene_fann_train.out gene_fann_test.out 4 2 200 1
-./quality_fixed gene_fann_train.out_fixed_train gene_fann_train.out_fixed_test gene_fann_fixed_train.out gene_fann_fixed_test.out *_fixed
+./quality_fixed gene_fann_train.out_fixed_train gene_fann_train.out_fixed_test gene_fann_fixed_train.out gene_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/gene.train datasets/gene.test gene_fann_stepwise_train.out gene_fann_stepwise_test.out 4 2 200 1
./quality lwnn datasets/gene.train datasets/gene.test gene_lwnn_train.out gene_lwnn_test.out 4 2 200 1
./quality jneural datasets/gene.train datasets/gene.test gene_jneural_train.out gene_jneural_test.out 4 2 200 1
+rm -f *_fixed.net
./quality fann datasets/mushroom.train datasets/mushroom.test mushroom_fann_train.out mushroom_fann_test.out 32 0 200 1
-./quality_fixed mushroom_fann_train.out_fixed_train mushroom_fann_train.out_fixed_test mushroom_fann_fixed_train.out mushroom_fann_fixed_test.out *_fixed
+./quality_fixed mushroom_fann_train.out_fixed_train mushroom_fann_train.out_fixed_test mushroom_fann_fixed_train.out mushroom_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/mushroom.train datasets/mushroom.test mushroom_fann_stepwise_train.out mushroom_fann_stepwise_test.out 32 0 200 1
./quality lwnn datasets/mushroom.train datasets/mushroom.test mushroom_lwnn_train.out mushroom_lwnn_test.out 32 0 200 1
./quality jneural datasets/mushroom.train datasets/mushroom.test mushroom_jneural_train.out mushroom_jneural_test.out 32 0 200 1
+rm -f *_fixed.net
./quality fann datasets/soybean.train datasets/soybean.test soybean_fann_train.out soybean_fann_test.out 16 8 200 1
-./quality_fixed soybean_fann_train.out_fixed_train soybean_fann_train.out_fixed_test soybean_fann_fixed_train.out soybean_fann_fixed_test.out *_fixed
+./quality_fixed soybean_fann_train.out_fixed_train soybean_fann_train.out_fixed_test soybean_fann_fixed_train.out soybean_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/soybean.train datasets/soybean.test soybean_fann_stepwise_train.out soybean_fann_stepwise_test.out 16 8 200 1
./quality lwnn datasets/soybean.train datasets/soybean.test soybean_lwnn_train.out soybean_lwnn_test.out 16 8 200 1
./quality jneural datasets/soybean.train datasets/soybean.test soybean_jneural_train.out soybean_jneural_test.out 16 8 200 1
+rm -f *_fixed.net
./quality fann datasets/thyroid.train datasets/thyroid.test thyroid_fann_train.out thyroid_fann_test.out 16 8 200 1
-./quality_fixed thyroid_fann_train.out_fixed_train thyroid_fann_train.out_fixed_test thyroid_fann_fixed_train.out thyroid_fann_fixed_test.out *_fixed
+./quality_fixed thyroid_fann_train.out_fixed_train thyroid_fann_train.out_fixed_test thyroid_fann_fixed_train.out thyroid_fann_fixed_test.out *_fixed.net
./quality fann_stepwise datasets/thyroid.train datasets/thyroid.test thyroid_fann_stepwise_train.out thyroid_fann_stepwise_test.out 16 8 200 1
./quality lwnn datasets/thyroid.train datasets/thyroid.test thyroid_lwnn_train.out thyroid_lwnn_test.out 16 8 200 1
./quality jneural datasets/thyroid.train datasets/thyroid.test thyroid_jneural_train.out thyroid_jneural_test.out 16 8 200 1
diff --git a/benchmarks/performance.cc b/benchmarks/performance.cc
index 2c3bbd9..21d7bef 100644
--- a/benchmarks/performance.cc
+++ b/benchmarks/performance.cc
@@ -136,7 +136,7 @@ void performance_benchmark_fann_thres(FILE *out, fann_type *input,
#endif
-void performance_benchmark_fann(FILE *out, fann_type *input,
+void performance_benchmark_fann(bool stepwise, FILE *out, fann_type *input,
unsigned int num_neurons, unsigned int seconds_per_test)
{
unsigned int i, total_connections;
@@ -144,34 +144,15 @@ void performance_benchmark_fann(FILE *out, fann_type *input,
struct fann *ann = fann_create(1, 0.7, 4,
num_neurons, num_neurons, num_neurons, num_neurons);
-
- total_connections = (num_neurons+1) * num_neurons * 3;
-
- start_timer();
-
- for(i = 0; time_elapsed() < (double)seconds_per_test; i++){
- output = fann_run(ann, input);
- }
-
- stop_timer();
- fprintf(out, "%d %.20e\n", num_neurons, getNanoPerN(i)/total_connections);
- fprintf(stderr, "%d ", num_neurons);
- fann_destroy(ann);
-}
-
-void performance_benchmark_fann_stepwise(FILE *out, fann_type *input,
- unsigned int num_neurons, unsigned int seconds_per_test)
-{
- unsigned int i, total_connections;
- fann_type *output;
-
- struct fann *ann = fann_create(1, 0.7, 4,
- num_neurons, num_neurons, num_neurons, num_neurons);
+ if(stepwise){
+ fann_set_activation_function_hidden(ann, FANN_SIGMOID_STEPWISE);
+ fann_set_activation_function_output(ann, FANN_SIGMOID_STEPWISE);
+ }else{
+ fann_set_activation_function_hidden(ann, FANN_SIGMOID);
+ fann_set_activation_function_output(ann, FANN_SIGMOID);
+ }
- fann_set_activation_function_hidden(ann, FANN_SIGMOID_STEPWISE);
- fann_set_activation_function_output(ann, FANN_SIGMOID_STEPWISE);
-
total_connections = (num_neurons+1) * num_neurons * 3;
start_timer();
@@ -233,14 +214,14 @@ int main(int argc, char* argv[])
num_neurons, seconds_per_test);
}else if(strcmp(argv[1], "fann") == 0){
#endif
- performance_benchmark_fann(out, input,
+ performance_benchmark_fann(false, out, input,
num_neurons, seconds_per_test);
#ifndef FIXEDFANN
}else if(strcmp(argv[1], "fann_noopt") == 0){
performance_benchmark_fann_noopt(out, input,
num_neurons, seconds_per_test);
}else if(strcmp(argv[1], "fann_stepwise") == 0){
- performance_benchmark_fann_stepwise(out, input,
+ performance_benchmark_fann(true, out, input,
num_neurons, seconds_per_test);
}else if(strcmp(argv[1], "fann_thres") == 0){
performance_benchmark_fann_thres(out, input,
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 63bbdb3..2a06d0b 100644
--- a/benchmarks/quality.cc
+++ b/benchmarks/quality.cc
@@ -190,7 +190,7 @@ void quality_benchmark_fann(bool stepwise,
a fixed point graph */
if(!stepwise){
/* buffer overflow could occur here */
- sprintf(fixed_point_file, "%05d_%f_%s_fixed", epochs, total_elapsed, filename);
+ sprintf(fixed_point_file, "%05d_%f_%s_fixed.net", epochs, total_elapsed, filename);
decimal_point = fann_save_to_fixed(ann, fixed_point_file);
sprintf(fixed_point_file, "%s_fixed_train_%d", filename, decimal_point);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git
More information about the debian-science-commits
mailing list