[Boost-commit] svn:boost r46605 - in sandbox/libs/numeric/bindings: . umfpack/test

From: thomas.klimpel_at_[hidden]
Date: 2008-06-22 08:25:08

Author: klimpel
Date: 2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
New Revision: 46605
URL: http://svn.boost.org/trac/boost/changeset/46605

Log:
add compiling of umfpack tests to regression tests

Added:
   sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2   (contents, props changed)
Text files modified: 
   sandbox/libs/numeric/bindings/Jamfile.v2                      |     1 +                                       
   sandbox/libs/numeric/bindings/numeric-bindings.jam            |     8 ++++++++                                
   sandbox/libs/numeric/bindings/umfpack/test/umf4.cc            |     4 +++-                                    
   sandbox/libs/numeric/bindings/umfpack/test/umfpack_di_demo.cc |     1 +                                       
   sandbox/libs/numeric/bindings/umfpack/test/umfpack_zi_demo.cc |     1 +                                       
   5 files changed, 14 insertions(+), 1 deletions(-)

Modified: sandbox/libs/numeric/bindings/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/Jamfile.v2	(original)
+++ sandbox/libs/numeric/bindings/Jamfile.v2	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -11,3 +11,4 @@
 build-project atlas ;
 build-project blas/test ;
 build-project lapack/test ;
+build-project umfpack/test ;

Modified: sandbox/libs/numeric/bindings/numeric-bindings.jam
==============================================================================
--- sandbox/libs/numeric/bindings/numeric-bindings.jam	(original)
+++ sandbox/libs/numeric/bindings/numeric-bindings.jam	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -23,6 +23,10 @@
 LAPACK_PATH ?= /usr/lib ;
 LAPACK_LIB  ?= lapack ;
 
+UMFPACK_INCLUDE = /usr/local/lib/UMFPACK/include ;
+UFCONFIG_INCLUDE = /usr/local/lib/UFCONFIG ;
+AMD_INCLUDE = /usr/local/lib/AMD/include ;
+
 lib fortran_lib : : <name>g2c ;
 
 lib amos_lib : fortran_lib : <name>$(AMOS_LIB) <search>$(AMOS_PATH) ;
@@ -36,3 +40,7 @@
 
 lib blas_lib   : fortran_lib : <name>$(BLAS_LIB)   <search>$(BLAS_PATH) ;
 lib lapack_lib : fortran_lib : <name>$(LAPACK_LIB) <search>$(LAPACK_PATH) <use>blas_lib : : <library>blas_lib ;
+
+lib umfpack_lib : : : :  <include>$(UMFPACK_INCLUDE)
+                         <include>$(UFCONFIG_INCLUDE)
+                         <include>$(AMD_INCLUDE) ;

Added: sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2
==============================================================================
--- (empty file)
+++ sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -0,0 +1,19 @@
+# Copyright Thomas Klimpel 2008.
+# Use, modification and distribution are subject to the
+# Boost Software License, Version 1.0. (See accompanying file
+# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+project libs/numeric/bindings/umfpack/test : requirements
+        <include>$(BOOST_ROOT)
+        <include>$(BOOST)
+        <library>/numeric-bindings//umfpack_lib ;
+
+import testing ;
+
+alias bindings-umfpack-tests :
+    [ compile umf4.cc ]
+    [ compile umfpack_di_demo.cc ]
+    [ compile umfpack_simple.cc ]
+    [ compile umfpack_zi_demo.cc ]
+;
+

Modified: sandbox/libs/numeric/bindings/umfpack/test/umf4.cc
==============================================================================
--- sandbox/libs/numeric/bindings/umfpack/test/umf4.cc	(original)
+++ sandbox/libs/numeric/bindings/umfpack/test/umf4.cc	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -268,7 +268,9 @@
   int r, c;
   for (int i = 0; i < nz; ++i) {
     f >> r >> c;
-    f >> A (r, c); 
+    double val;
+    f >> val;
+    A (r, c) = val;
   }
   Control[UMFPACK_PRL] = (nz > 20) ? 4 : 5; 
   cout << "matrix A: "; 

Modified: sandbox/libs/numeric/bindings/umfpack/test/umfpack_di_demo.cc
==============================================================================
--- sandbox/libs/numeric/bindings/umfpack/test/umfpack_di_demo.cc	(original)
+++ sandbox/libs/numeric/bindings/umfpack/test/umfpack_di_demo.cc	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -75,6 +75,7 @@
 #include <cstdlib>
 #include <algorithm> 
 #include <math.h>
+#include <boost/mpl/and.hpp>
 #include <boost/numeric/bindings/traits/c_array.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
 #include <boost/numeric/bindings/traits/ublas_sparse.hpp>

Modified: sandbox/libs/numeric/bindings/umfpack/test/umfpack_zi_demo.cc
==============================================================================
--- sandbox/libs/numeric/bindings/umfpack/test/umfpack_zi_demo.cc	(original)
+++ sandbox/libs/numeric/bindings/umfpack/test/umfpack_zi_demo.cc	2008-06-22 08:25:07 EDT (Sun, 22 Jun 2008)
@@ -76,6 +76,7 @@
 #include <algorithm> 
 #include <complex> 
 #include <math.h>
+#include <boost/mpl/and.hpp>
 #include <boost/numeric/bindings/traits/c_array.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
 #include <boost/numeric/bindings/traits/ublas_sparse.hpp>