[libfann] 26/242: *** empty log message ***
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 189b4fbc73088b95eedccbe7a86d0fa4a45bfc44
Author: Steffen Nissen <lukesky at diku.dk>
Date: Tue Dec 9 22:18:04 2003 +0000
*** empty log message ***
---
Makefile.am | 1 +
Makefile.in | 3 ++-
benchmarks/performance.cc | 28 ++++++++++++++++++++++++----
benchmarks/quality.cc | 36 +++++++++++++++++++++++++++++-------
configure | 2 +-
configure.in | 2 +-
libtool | 2 +-
src/Makefile | 2 +-
8 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5f3b57e..5a53815 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = src
EXTRA_DIST = doc examples benchmarks
dist-hook:
+ rm -rf `find $(distdir) -name "*~" -o -name ".#*"`
rm -rf `find $(distdir)/doc -name CVS`
rm -rf `find $(distdir)/examples -name CVS`
rm -rf `find $(distdir)/benchmarks -name CVS`
diff --git a/Makefile.in b/Makefile.in
index 7222bda..31a1700 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./src/include/config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS aclocal.m4 config.guess config.in \
+Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.in \
config.sub configure configure.in install-sh ltmain.sh missing \
mkinstalldirs
@@ -373,6 +373,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
dist-hook:
+ rm -rf `find $(distdir) -name "*~" -o -name ".#*"`
rm -rf `find $(distdir)/doc -name CVS`
rm -rf `find $(distdir)/examples -name CVS`
rm -rf `find $(distdir)/benchmarks -name CVS`
diff --git a/benchmarks/performance.cc b/benchmarks/performance.cc
index 21d7bef..4101c0e 100644
--- a/benchmarks/performance.cc
+++ b/benchmarks/performance.cc
@@ -17,6 +17,11 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+//uncomment lines below to benchmark the libraries
+
+#define JNEURAL
+#define LWNN
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,9 +31,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifndef FIXEDFANN
+#ifdef JNEURAL
#include "nets/backprop.h"
+#endif
+
+#ifdef LWNN
#include "lwneuralnet.h"
+#endif
+#ifdef JNEURAL
void performance_benchmark_jneural(FILE *out, fann_type *input,
unsigned int num_neurons, unsigned int seconds_per_test)
{
@@ -53,7 +64,9 @@ void performance_benchmark_jneural(FILE *out, fann_type *input,
delete ann;
}
+#endif
+#ifdef LWNN
void performance_benchmark_lwnn(FILE *out, fann_type *input,
unsigned int num_neurons, unsigned int seconds_per_test)
{
@@ -79,6 +92,7 @@ void performance_benchmark_lwnn(FILE *out, fann_type *input,
net_free(ann);
free(output);
}
+#endif
void performance_benchmark_fann_noopt(FILE *out, fann_type *input,
unsigned int num_neurons, unsigned int seconds_per_test)
@@ -209,10 +223,7 @@ int main(int argc, char* argv[])
num_neurons <= num_neurons_last; num_neurons = (int)(num_neurons * multiplier)){
#ifndef FIXEDFANN
- if(strcmp(argv[1], "lwnn") == 0){
- performance_benchmark_lwnn(out, input,
- num_neurons, seconds_per_test);
- }else if(strcmp(argv[1], "fann") == 0){
+ if(strcmp(argv[1], "fann") == 0){
#endif
performance_benchmark_fann(false, out, input,
num_neurons, seconds_per_test);
@@ -226,9 +237,18 @@ int main(int argc, char* argv[])
}else if(strcmp(argv[1], "fann_thres") == 0){
performance_benchmark_fann_thres(out, input,
num_neurons, seconds_per_test);
+#ifdef LWNN
+ }else if(strcmp(argv[1], "lwnn") == 0){
+ performance_benchmark_lwnn(out, input,
+ num_neurons, seconds_per_test);
+#endif
+#ifdef JNEURAL
}else if(strcmp(argv[1], "jneural") == 0){
performance_benchmark_jneural(out, input,
num_neurons, seconds_per_test);
+#endif
+ }else{
+ printf("unrecognized option %s\n", argv[1]);
}
#endif
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 2a06d0b..8319558 100644
--- a/benchmarks/quality.cc
+++ b/benchmarks/quality.cc
@@ -17,13 +17,24 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+//uncomment lines below to benchmark the libraries
+
+#define JNEURAL
+#define LWNN
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef JNEURAL
#include "nets/backprop.h"
-#include "ctimer.h"
+#endif
+
+#ifdef LWNN
#include "lwneuralnet.h"
+#endif
+
+#include "ctimer.h"
#include "floatfann.h"
unsigned int num_errors = 0;
@@ -51,6 +62,7 @@ double mean_error()
}
+#ifdef JNEURAL
void quality_benchmark_jneural(
struct fann_train_data *train_data,
struct fann_train_data *test_data,
@@ -115,6 +127,7 @@ void quality_benchmark_jneural(
delete ann;
}
+#endif
void quality_benchmark_fann(bool stepwise,
char *filename,
@@ -204,6 +217,7 @@ void quality_benchmark_fann(bool stepwise,
fann_destroy(ann);
}
+#ifdef LWNN
void quality_benchmark_lwnn(
struct fann_train_data *train_data,
struct fann_train_data *test_data,
@@ -279,6 +293,7 @@ void quality_benchmark_lwnn(
net_free(ann);
}
+#endif
int main(int argc, char* argv[])
{
@@ -318,30 +333,37 @@ int main(int argc, char* argv[])
fprintf(stderr, "Quality test of %s %s ", argv[1], argv[2]);
- if(strcmp(argv[1], "lwnn") == 0){
- quality_benchmark_lwnn(train_data, test_data,
+ if(strcmp(argv[1], "fann") == 0){
+ quality_benchmark_fann(false, argv[4], train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
seconds_of_training, seconds_between_reports);
- }else if(strcmp(argv[1], "fann") == 0){
- quality_benchmark_fann(false, argv[4], train_data, test_data,
+ }else if(strcmp(argv[1], "fann_stepwise") == 0){
+ quality_benchmark_fann(true, NULL, train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
seconds_of_training, seconds_between_reports);
- }else if(strcmp(argv[1], "fann_stepwise") == 0){
- quality_benchmark_fann(true, NULL, train_data, test_data,
+#ifdef LWNN
+ }else if(strcmp(argv[1], "lwnn") == 0){
+ quality_benchmark_lwnn(train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
seconds_of_training, seconds_between_reports);
+#endif
+
+#ifdef JNEURAL
}else if(strcmp(argv[1], "jneural") == 0){
quality_benchmark_jneural(train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
seconds_of_training, seconds_between_reports);
+#endif
+ }else{
+ printf("unrecognized option %s\n", argv[1]);
}
fprintf(stderr, "\n");
diff --git a/configure b/configure
index 688bfb6..190a171 100755
--- a/configure
+++ b/configure
@@ -1652,7 +1652,7 @@ fi
PACKAGE=fann
-VERSION=1.0.2
+VERSION=1.1
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
diff --git a/configure.in b/configure.in
index b46dc07..e42a50d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
AC_INIT(src/fann.c)
-AM_INIT_AUTOMAKE(fann, 1.0.2)
+AM_INIT_AUTOMAKE(fann, 1.1)
AM_CONFIG_HEADER(src/include/config.h:config.in)
AC_PROG_RANLIB
AC_PROG_CC
diff --git a/libtool b/libtool
index ac32a06..3d5df9a 100755
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
#! /bin/sh
# libtoolT - Provide generalized library-building support services.
-# Generated automatically by (GNU fann 1.0.2)
+# Generated automatically by (GNU fann 1.1)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
diff --git a/src/Makefile b/src/Makefile
index 7dad3b5..c704e04 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -83,7 +83,7 @@ PACKAGE = fann
RANLIB = ranlib
RC = @RC@
STRIP = strip
-VERSION = 1.0.2
+VERSION = 1.1
SUBDIRS = include
--
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