From: thomas.klimpel_at_[hidden]
Date: 2008-06-26 05:44:05
Author: klimpel
Date: 2008-06-26 05:44:04 EDT (Thu, 26 Jun 2008)
New Revision: 46708
URL: http://svn.boost.org/trac/boost/changeset/46708
Log:
execute more regression tests
Text files modified:
sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 | 1 +
sandbox/libs/numeric/bindings/numeric-bindings.jam | 34 +++++++++++++++++++++++-----------
sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2 | 8 ++++----
3 files changed, 28 insertions(+), 15 deletions(-)
Modified: sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 2008-06-26 05:44:04 EDT (Thu, 26 Jun 2008)
@@ -14,6 +14,7 @@
[ run lapack.cpp ]
[ run hseqr.cpp ]
+ [ run ublas_geev.cpp ]
[ run ublas_gees.cpp ]
[ run ublas_geqrf.cpp ]
[ run ublas_hbev.cpp ]
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-26 05:44:04 EDT (Thu, 26 Jun 2008)
@@ -8,24 +8,32 @@
project.initialize $(__name__) ;
project numeric-bindings ;
-AMOS_PATH ?= /usr/lib ;
+NUMERIC_LIB_PATH ?= /usr/lib ;
+NUMERIC_INCLUDE ?= /usr/local/lib ;
+SUITESPARSE_INCLUDE ?= $(NUMERIC_INCLUDE)/SuiteSparse ;
+
+AMOS_PATH ?= $(NUMERIC_LIB_PATH) ;
AMOS_LIB ?= amos ;
-ATLAS_INCLUDE ?= /usr/local/lib/ATLAS/include ;
-ATLAS_PATH ?= /usr/lib ;
+ATLAS_INCLUDE ?= $(NUMERIC_INCLUDE)/ATLAS/include ;
+ATLAS_PATH ?= $(NUMERIC_LIB_PATH) ;
ATLAS_LIB ?= atlas ;
CBLAS_LIB ?= cblas ;
LAPACK_ATLAS_LIB ?= lapack ;
-BLAS_PATH ?= /usr/lib ;
+BLAS_PATH ?= $(NUMERIC_LIB_PATH) ;
BLAS_LIB ?= blas ;
-LAPACK_PATH ?= /usr/lib ;
+LAPACK_PATH ?= $(NUMERIC_LIB_PATH) ;
LAPACK_LIB ?= lapack ;
-UMFPACK_INCLUDE = /usr/local/lib/UMFPACK/include ;
-UFCONFIG_INCLUDE = /usr/local/lib/UFCONFIG ;
-AMD_INCLUDE = /usr/local/lib/AMD/include ;
+UMFPACK_INCLUDE ?= $(SUITESPARSE_INCLUDE)/UMFPACK/Include ;
+UFCONFIG_INCLUDE ?= $(SUITESPARSE_INCLUDE)/UFconfig ;
+AMD_INCLUDE ?= $(SUITESPARSE_INCLUDE)/AMD/Include ;
+UMFPACK_PATH ?= $(NUMERIC_LIB_PATH) ;
+UMFPACK_LIB ?= umfpack ;
+AMD_PATH ?= $(NUMERIC_LIB_PATH) ;
+AMD_LIB ?= amd ;
lib fortran_lib : : <name>g2c ;
@@ -41,6 +49,10 @@
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) ;
+lib amd_lib : : <name>$(AMD_LIB) <search>$(AMD_PATH)
+ : : <include>$(AMD_INCLUDE)
+ <include>$(UFCONFIG_INCLUDE) ;
+lib umfpack_lib : amd_lib blas_lib
+ : <name>$(UMFPACK_LIB) <search>$(UMFPACK_PATH)
+ : : <include>$(UMFPACK_INCLUDE)
+ <include>$(UFCONFIG_INCLUDE) ;
Modified: sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2
==============================================================================
--- sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2 (original)
+++ sandbox/libs/numeric/bindings/umfpack/test/Jamfile.v2 2008-06-26 05:44:04 EDT (Thu, 26 Jun 2008)
@@ -11,9 +11,9 @@
import testing ;
alias bindings-umfpack-tests :
- [ compile umf4.cc ]
- [ compile umfpack_di_demo.cc ]
- [ compile umfpack_simple.cc ]
- [ compile umfpack_zi_demo.cc ]
+ [ link umf4.cc ]
+ [ link umfpack_di_demo.cc ]
+ [ run umfpack_simple.cc ]
+ [ link umfpack_zi_demo.cc ]
;