[libfann] 27/242: new benchmark and version 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 160411c59717ba84d1fe2318ed1f7bbabd6f8dea
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Tue Dec 9 22:33:48 2003 +0000

    new benchmark and version stuff
---
 ChangeLog                 |  7 ++++++
 Makefile.in               | 55 +++++++++++------------------------------------
 benchmarks/Makefile       |  4 ++--
 benchmarks/README         | 20 +++++++++++++++++
 benchmarks/performance.cc |  4 ++--
 benchmarks/quality.cc     |  4 ++--
 6 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8726ae3..4dc2334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+libfann (1.1) stable; urgency=low
+	* Added FANN_SIGMOID_STEPWISE activation function (much faster)
+	* Moved files around and altered some files for easyer benchmarking
+	* Added a benchmark pdf file, benchmarking the new behavior.
+	
+ -- Steffen Nissen <lukesky at diku.dk>  Tue, 09 Dec 2003 23:30:45 +0100
+	
 libfann (1.0.2) stable; urgency=low
 	* Added configure script
 	* Moved files around, to make the transition to configure more easy
diff --git a/Makefile.in b/Makefile.in
index 31a1700..5ce6f7a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,10 +92,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 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 TODO aclocal.m4 config.guess config.in \
-config.sub configure configure.in install-sh ltmain.sh missing \
-mkinstalldirs
+DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \
+configure.in install-sh ltmain.sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -119,34 +118,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-src/include/config.h: src/include/stamp-h
-	@if test ! -f $@; then \
-		rm -f src/include/stamp-h; \
-		$(MAKE) src/include/stamp-h; \
-	else :; fi
-src/include/stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h:config.in \
-	     $(SHELL) ./config.status
-	@echo timestamp > src/include/stamp-h 2> /dev/null
-$(srcdir)/config.in: $(srcdir)/src/include/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/src/include/stamp-h.in; \
-		$(MAKE) $(srcdir)/src/include/stamp-h.in; \
-	else :; fi
-$(srcdir)/src/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/src/include/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f src/include/config.h
-
-maintainer-clean-hdr:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -336,33 +307,33 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+clean-am:  clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+distclean-am:  distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 2b1356f..23b9d61 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -16,13 +16,13 @@ LWNNDIR = ../libraries/lwneuralnet-0.6/source/
 all: $(TARGETS)
 
 quality: quality.cc
-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -llwneuralnet -ljneural -lfl
+	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann # -llwneuralnet -ljneural -lfl
 
 quality_fixed: quality_fixed.c
 	$(GCC) $(CFLAGS) $(LFLAGS) $< -o $@ -lfixedfann
 
 performance: performance.cc
-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -llwneuralnet -ljneural -lfl
+	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann # -llwneuralnet -ljneural -lfl
 
 performance_fixed: performance.cc
 	$(G++) $(CFLAGS) $(LFLAGS) -DFIXEDFANN $< -o $@ -lfixedfann
diff --git a/benchmarks/README b/benchmarks/README
new file mode 100644
index 0000000..ab663ae
--- /dev/null
+++ b/benchmarks/README
@@ -0,0 +1,20 @@
+Programs used to generate benchmarks.
+
+performance - Program to benchmark the performance of running the libraries
+quality - Program to benchmark the quality of the training algorithms
+benchmark.sh - Shell file that runs a series of benchmarks
+gnuplot - File containing gnuplot commands for displaying graphs
+
+In order to generate benchmarks against other libraries (jneural and
+lwneuralnet), these libraries need to be installed (they can be
+downloaded from http://voltar-confed.org/jneural/ and
+http://sourceforge.net/projects/lwneuralnet/). The Makefile need to be
+altered to point to these libraries and the performance.cc and
+quality.cc files need to be altered in order to use the libraries
+(just uncomment a few lines in the top).
+
+Pregenerated benchmarks are available in the benchmark.pdf file.
+These benchmarks are generated on a AMD Athlon XP 1600+ machine 
+(actually only 1400 MHz) with a 256 KB L2 cache and a 128 KB L1 cache.
+An earlier version of the library is benchmarked and commented in the 
+full report (this benchmark also include benchmarks on an iPAQ).
diff --git a/benchmarks/performance.cc b/benchmarks/performance.cc
index 4101c0e..251b261 100644
--- a/benchmarks/performance.cc
+++ b/benchmarks/performance.cc
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 //uncomment lines below to benchmark the libraries
 
-#define JNEURAL
-#define LWNN
+//#define JNEURAL
+//#define LWNN
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 8319558..9c57c68 100644
--- a/benchmarks/quality.cc
+++ b/benchmarks/quality.cc
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 //uncomment lines below to benchmark the libraries
 
-#define JNEURAL
-#define LWNN
+//#define JNEURAL
+//#define LWNN
 
 #include <stdio.h>
 #include <stdlib.h>

-- 
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