Mercurial > forge

changeset 8923:ba575291987f octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparsersb: added the --with-verbosity-level configure switch, to activate sparsersb (debug) verbosity at build time.
author michelemartone
date Tue, 15 Nov 2011 19:09:20 +0000
parents a0db8e48d873
children caddf4cd12de
files main/sparsersb/src/Makeconf.in main/sparsersb/src/Makefile main/sparsersb/src/configure.base main/sparsersb/src/sparsersb.cc
diffstat 4 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/Makeconf.in	Tue Nov 15 16:30:17 2011 +0000
+++ b/main/sparsersb/src/Makeconf.in	Tue Nov 15 19:09:20 2011 +0000
@@ -71,6 +71,7 @@
 ALTOPATH = @altopath@
 
 LIBRSB_CXXFLAGS = @LIBRSB_CXXFLAGS@
+RSBOI_CXXFLAGS = @RSBOI_CXXFLAGS@
 LIBRSB_LIBS = @LIBRSB_LIBS@
 
 SWIG = @SWIG@
--- a/main/sparsersb/src/Makefile	Tue Nov 15 16:30:17 2011 +0000
+++ b/main/sparsersb/src/Makefile	Tue Nov 15 19:09:20 2011 +0000
@@ -13,7 +13,7 @@
 #LIBRSB_LIBS=$(RSBLIBDIR)/librsb.a
 
 $(SPARSERSB_OCT): sparsersb.cc
-	$(MKOCTFILE) -D''RSB_SPARSERSB_LABEL=sparsersb $(LIBRSB_CXXFLAGS) -o $@ $< $(LIBRSB_LIBS)
+	$(MKOCTFILE) -D''RSB_SPARSERSB_LABEL=sparsersb $(RSBOI_CXXFLAGS) $(LIBRSB_CXXFLAGS) -o $@ $< $(LIBRSB_LIBS)
 
 rtest: $(SPARSERSB_OCT)
 	$(OCTAVE) --silent rsb.m
--- a/main/sparsersb/src/configure.base	Tue Nov 15 16:30:17 2011 +0000
+++ b/main/sparsersb/src/configure.base	Tue Nov 15 19:09:20 2011 +0000
@@ -60,7 +60,11 @@
 AC_SUBST(altopath)
 AC_SUBST(LIBRSB_LIBS)
 AC_SUBST(LIBRSB_CXXFLAGS)
+AC_SUBST(RSBOI_CXXFLAGS)
 
+AC_ARG_WITH(verbosity-level, 
+	[  --with-verbosity-level       verbosity level (0,1,..)],
+	[ RSBOI_VERBOSE_CONFIG=$withval ])
 AC_ARG_WITH(path, 
 	[  --with-path             install path prefix],
 	[ path=$withval ])
@@ -181,6 +185,10 @@
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CPICFLAG)
+RSBOI_CXXFLAGS=""
+if test x$RSBOI_VERBOSE_CONFIG != x ; then
+	RSBOI_CXXFLAGS="$RSBOI_CXXFLAGS -D''RSBOI_VERBOSE_CONFIG=$RSBOI_VERBOSE_CONFIG"; 
+fi
 
 dnl Fortran compiler and flags
 F77=`$MKOCTFILE -p F77`
--- a/main/sparsersb/src/sparsersb.cc	Tue Nov 15 16:30:17 2011 +0000
+++ b/main/sparsersb/src/sparsersb.cc	Tue Nov 15 19:09:20 2011 +0000
@@ -44,7 +44,11 @@
 #include <octave/ov-typeinfo.h>
 #include <rsb.h>
 
-//#define RSBOI_VERBOSE 1
+#ifdef RSBOI_VERBOSE_CONFIG
+#if (RSBOI_VERBOSE_CONFIG>0)
+#define RSBOI_VERBOSE RSBOI_VERBOSE_CONFIG
+#endif
+#endif
 
 #define RSBOI_PRINTF( ... ) printf( __VA_ARGS__ )
 #if RSBOI_VERBOSE
@@ -231,8 +235,9 @@
 			//		sm.data(), (rsb_coo_index_t*)IA.data(),  (rsb_coo_index_t*)JA.data(), sm.nnz(), RSBOI_TYPECODE , nr, nc, br, bc);
 
 			if(!(this->A=rsb_allocate_rsb_sparse_matrix_const(sm.data(), (rsb_coo_index_t*)IA.data(), (rsb_coo_index_t*)JA.data(), nnz, RSBOI_TYPECODE , nr, nc, RSBOI_RB, RSBOI_CB, eflags,&errval)))
-				RSBOI_ERROR("error in %s!\n","rsb");
-								 // FIXME: need to set symmetry/triangle flags
+				RSBOI_ERROR("error allocating matrix!\n");
+			/* FIXME: what to do in case of such an error ? */
+			// FIXME: need to set symmetry/triangle flags
 			//rsb_mark_matrix_with_type_flags(this->A);
 			rsb_perror(errval);
 		}