Mercurial > forge

changeset 9489:de5dd5c21b36 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparsersb: fixup to the octave benchmarking script: it called sparsersb in an obsolete way. including a minimal matrix just for testing purposes. update to the makedile in order to call the octave benchmarking script on the tiny matrix at test time.
author michelemartone
date Thu, 23 Feb 2012 18:03:36 +0000
parents 11df638d10e0
children 3e924351cff1
files main/sparsersb/src/Makefile main/sparsersb/src/octavebench.m main/sparsersb/src/pd.mtx
diffstat 3 files changed, 51 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/Makefile	Thu Feb 23 17:19:15 2012 +0000
+++ b/main/sparsersb/src/Makefile	Thu Feb 23 18:03:36 2012 +0000
@@ -17,6 +17,7 @@
 
 rtest: $(SPARSERSB_OCT)
 	$(OCTAVE) --silent sparsersbtester.m
+	$(OCTAVE) --silent octavebench.m pd.mtx
 
 bench: $(SPARSERSB_OCT)
 	$(OCTAVE) --silent obench.m
--- a/main/sparsersb/src/octavebench.m	Thu Feb 23 17:19:15 2012 +0000
+++ b/main/sparsersb/src/octavebench.m	Thu Feb 23 18:03:36 2012 +0000
@@ -43,8 +43,9 @@
 	# FIXME: what about symmetry ?
 	sparsekw="sparse";
 	if(ski==2)sparsekw="sparsersb";endif
+	mrc=rows(nm); mcc=columns(nm);
 	tic();
-	eval(["for i=1:n;  om=",sparsekw,"(ia,ja,va,\"summation\"); end"]);
+	eval(["for i=1:n;  om=",sparsekw,"(ia,ja,va,mrc,mcc,\"summation\"); end"]);
 	at=toc();
 	mnz=nnz(om);
 	amflops=n*2.0*mnz/(10^6 * at);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/sparsersb/src/pd.mtx	Thu Feb 23 18:03:36 2012 +0000
@@ -0,0 +1,48 @@
+%%MatrixMarket matrix coordinate real general
+% a positive definitive matrix, as in
+% http://www.ncsa.uiuc.edu/UserInfo/Resources/Hardware/IBMp690/IBM/usr/lpp/essl.html.en_US/html/essl43.html
+% *                        *
+% | 99  12  13  14  15  16 |
+% | 12  99  12  13  14  15 |
+% | 13  12  99  12  13  14 |
+% | 14  13  12  99  12  13 |
+% | 15  14  13  12  99  12 |
+% | 16  15  14  13  12  99 |
+% *                        *
+6 6 36
+1 1 99
+1 2 12
+1 3 13
+1 4 14
+1 5 15
+1 6 16
+2 1 12
+2 2 99
+2 3 12
+2 4 13
+2 5 14
+2 6 15
+3 1 13
+3 2 12
+3 3 99
+3 4 12
+3 5 13
+3 6 14
+4 1 14
+4 2 13
+4 3 12
+4 4 99
+4 5 12
+4 6 13
+5 1 15
+5 2 14
+5 3 13
+5 4 12
+5 5 99
+5 6 12
+6 1 16
+6 2 15
+6 3 14
+6 4 13
+6 5 12
+6 6 99