|
|
Boost-Commit : |
From: thomas.klimpel_at_[hidden]
Date: 2008-04-08 18:14:23
Author: klimpel
Date: 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
New Revision: 44116
URL: http://svn.boost.org/trac/boost/changeset/44116
Log:
ported build system for tests to boost.build.v2
-fixed compile errors
-verified test results
-currently excluded tests are those that expect input from std::cin
-all tests passed successful with atlas-3.8.1, lapack-3.1.1 and gcc-4.1.3
Added:
sandbox/libs/numeric/bindings/Jamfile.v2
- copied, changed from r43794, /sandbox/libs/numeric/bindings/Jamfile
sandbox/libs/numeric/bindings/amos/test/Jamfile.v2
- copied, changed from r43794, /sandbox/libs/numeric/bindings/amos/test/Jamfile
sandbox/libs/numeric/bindings/atlas/Jamfile.v2
- copied, changed from r43794, /sandbox/libs/numeric/bindings/atlas/Jamfile
sandbox/libs/numeric/bindings/blas/test/Jamfile.v2
- copied, changed from r43794, /sandbox/libs/numeric/bindings/blas/test/Jamfile
sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2
- copied, changed from r43794, /sandbox/libs/numeric/bindings/lapack/test/Jamfile
Removed:
sandbox/libs/numeric/bindings/Jamfile
sandbox/libs/numeric/bindings/amos/Jamfile
sandbox/libs/numeric/bindings/amos/test/Jamfile
sandbox/libs/numeric/bindings/atlas/Jamfile
sandbox/libs/numeric/bindings/blas/Jamfile
sandbox/libs/numeric/bindings/blas/test/Jamfile
sandbox/libs/numeric/bindings/lapack/Jamfile
sandbox/libs/numeric/bindings/lapack/test/Jamfile
Text files modified:
sandbox/libs/numeric/bindings/Jamfile.v2 | 15 +
sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 | 26 ++-
sandbox/libs/numeric/bindings/amos/test/amos.cpp | 19 ++
sandbox/libs/numeric/bindings/atlas/Jamfile.v2 | 292 +++++++++++++--------------------------
sandbox/libs/numeric/bindings/atlas/others.cc | 2
sandbox/libs/numeric/bindings/atlas/ublas_cmatr2.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_gesv.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_gesv2.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_gesv5.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc | 3
sandbox/libs/numeric/bindings/atlas/ublas_matr1.cc | 2
sandbox/libs/numeric/bindings/atlas/ublas_matr22.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_matr3.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_posv.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc | 1
sandbox/libs/numeric/bindings/atlas/ublas_vct.cc | 1
sandbox/libs/numeric/bindings/atlas/utils.h | 5
sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 | 54 +++---
sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 | 160 ++++++++++++---------
sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_gesv2.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_hbev.cpp | 6
sandbox/libs/numeric/bindings/lapack/test/ublas_heev.cpp | 7
sandbox/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_posv.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_syev.cpp | 7
sandbox/libs/numeric/bindings/lapack/test/ublas_sysv.cc | 1
sandbox/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc | 1
sandbox/libs/numeric/bindings/lapack/test/utils.h | 5
34 files changed, 307 insertions(+), 316 deletions(-)
Deleted: sandbox/libs/numeric/bindings/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,4 +0,0 @@
-subproject libs/numeric/bindings ;
-subinclude libs/numeric/bindings/amos ;
-subinclude libs/numeric/bindings/blas ;
-subinclude libs/numeric/bindings/lapack ;
Copied: sandbox/libs/numeric/bindings/Jamfile.v2 (from r43794, /sandbox/libs/numeric/bindings/Jamfile)
==============================================================================
--- /sandbox/libs/numeric/bindings/Jamfile (original)
+++ sandbox/libs/numeric/bindings/Jamfile.v2 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -1,4 +1,11 @@
-subproject libs/numeric/bindings ;
-subinclude libs/numeric/bindings/amos ;
-subinclude libs/numeric/bindings/blas ;
-subinclude libs/numeric/bindings/lapack ;
+# 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 ;
+
+build-project amos/test ;
+build-project atlas ;
+build-project blas/test ;
+build-project lapack/test ;
Deleted: sandbox/libs/numeric/bindings/amos/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/amos/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,8 +0,0 @@
-subproject libs/numeric/bindings/amos ;
-subinclude libs/numeric/bindings/amos/test ;
-
-lib bindings_amos
- : amos.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- ;
Deleted: sandbox/libs/numeric/bindings/amos/test/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/amos/test/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,15 +0,0 @@
-subproject libs/numeric/bindings/amos/test ;
-
-AMOS_PATH = /usr/lib ;
-AMOS_LIB = amos ;
-
-exe amos
- : amos.cpp
- <lib>../bindings_amos
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(AMOS_PATH)
- <find-library>$(AMOS_LIB)
- ;
-
-
Copied: sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 (from r43794, /sandbox/libs/numeric/bindings/amos/test/Jamfile)
==============================================================================
--- /sandbox/libs/numeric/bindings/amos/test/Jamfile (original)
+++ sandbox/libs/numeric/bindings/amos/test/Jamfile.v2 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -1,15 +1,19 @@
-subproject libs/numeric/bindings/amos/test ;
+# 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)
-AMOS_PATH = /usr/lib ;
-AMOS_LIB = amos ;
+AMOS_PATH ?= /usr/lib ;
+AMOS_LIB ?= amos ;
-exe amos
- : amos.cpp
- <lib>../bindings_amos
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(AMOS_PATH)
- <find-library>$(AMOS_LIB)
- ;
+lib g2c ;
+lib amos_lib : g2c : <name>$(AMOS_LIB) <search>$(AMOS_PATH) ;
+project libs/numeric/bindings/amos/test : requirements
+ <include>$(BOOST_ROOT)
+ <include>$(B_ROOT)
+ <library>amos_lib ;
+
+exe amos : amos.cpp ;
+
Modified: sandbox/libs/numeric/bindings/amos/test/amos.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/amos/test/amos.cpp (original)
+++ sandbox/libs/numeric/bindings/amos/test/amos.cpp 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -2,12 +2,23 @@
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/amos/amos.hpp>
-int main()
+template <class T>
+int do_value_type()
{
- boost::numeric::ublas::vector< std::complex< double > > z(10) ;
- boost::numeric::ublas::vector< std::complex< double > > cy(10) ;
+ typedef T value_type;
+ //boost::numeric::ublas::vector< value_type > z(10) ;
+ value_type z ;
+ boost::numeric::ublas::vector< value_type > cy(10) ;
int nz;
boost::numeric::bindings::amos::besi( z, 1.0, 1, cy, nz ) ;
- return 0 ;
+ return 0;
+}
+
+int main()
+{
+ if (do_value_type< std::complex<float> >()) return 255;
+// if (do_value_type< double >()) return 255;
+ return 0;
}
+
Deleted: sandbox/libs/numeric/bindings/atlas/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,195 +0,0 @@
-subproject libs/numeric/bindings/atlas ;
-
-ATLAS_INCLUDE = /usr/local/lib/ATLAS/include ;
-ATLAS_PATH = /usr/lib ;
-ATLAS_LIB = lapack_atlas cblas atlas g2c ;
-
-exe init
- : init.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe others
- : others.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe tnt2
-# : tnt2.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-# exe tnt3
-# : tnt3.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_cmatr2
- : ublas_cmatr2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_cmatr3
- : ublas_cmatr3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_cvct
- : ublas_cvct.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_gesv
- : ublas_gesv.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_gesv2
- : ublas_gesv2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_getrf_getrs
- : ublas_getrf_getrs.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe ublas_getri
-# : ublas_getri.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_matr1
- : ublas_matr1.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr2
- : ublas_matr2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr22
- : ublas_matr22.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr3
- : ublas_matr3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_posv
- : ublas_posv.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_potrf_potrs
- : ublas_potrf_potrs.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe ublas_potri
-# : ublas_potri.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_symm2
- : ublas_symm2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_symm3
- : ublas_symm3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_vct
- : ublas_vct.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
Copied: sandbox/libs/numeric/bindings/atlas/Jamfile.v2 (from r43794, /sandbox/libs/numeric/bindings/atlas/Jamfile)
==============================================================================
--- /sandbox/libs/numeric/bindings/atlas/Jamfile (original)
+++ sandbox/libs/numeric/bindings/atlas/Jamfile.v2 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -1,195 +1,107 @@
-subproject libs/numeric/bindings/atlas ;
+# 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)
ATLAS_INCLUDE = /usr/local/lib/ATLAS/include ;
ATLAS_PATH = /usr/lib ;
-ATLAS_LIB = lapack_atlas cblas atlas g2c ;
+#ATLAS_LIB = lapack_atlas cblas atlas g2c ;
-exe init
- : init.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe others
- : others.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe tnt2
-# : tnt2.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-# exe tnt3
-# : tnt3.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_cmatr2
- : ublas_cmatr2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_cmatr3
- : ublas_cmatr3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_cvct
- : ublas_cvct.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_gesv
- : ublas_gesv.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_gesv2
- : ublas_gesv2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_getrf_getrs
- : ublas_getrf_getrs.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe ublas_getri
-# : ublas_getri.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_matr1
- : ublas_matr1.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr2
- : ublas_matr2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr22
- : ublas_matr22.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_matr3
- : ublas_matr3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_posv
- : ublas_posv.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_potrf_potrs
- : ublas_potrf_potrs.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-# exe ublas_potri
-# : ublas_potri.cc
-# : <include>$(BOOST_ROOT)
-# <include>$(B_ROOT)
-# <include>$(ATLAS_INCLUDE)
-# <library-path>$(ATLAS_PATH)
-# <find-library>$(ATLAS_LIB)
-# ;
-
-exe ublas_symm2
- : ublas_symm2.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_symm3
- : ublas_symm3.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
-
-exe ublas_vct
- : ublas_vct.cc
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <include>$(ATLAS_INCLUDE)
- <library-path>$(ATLAS_PATH)
- <find-library>$(ATLAS_LIB)
- ;
+lib g2c ;
+lib atlas_lib : : <name>atlas <search>$(ATLAS_PATH) ;
+lib cblas_lib : : <name>cblas <search>$(ATLAS_PATH) ;
+lib lapack_atlas_lib : g2c : <name>lapack <search>$(ATLAS_PATH) ;
+
+project libs/numeric/bindings/atlas : requirements
+ <include>$(BOOST_ROOT)
+ <include>$(B_ROOT)
+ <include>$(ATLAS_INCLUDE)
+ <library>lapack_atlas_lib
+ <library>cblas_lib
+ <library>atlas_lib ;
+
+import testing ;
+
+#exe init : init.cc ;
+#exe others : others.cc ;
+
+# exe tnt2 : tnt2.cc ;
+# exe tnt3 : tnt3.cc ;
+
+#exe ublas_cmatr2 : ublas_cmatr2.cc ;
+#exe ublas_cmatr2ger : ublas_cmatr2ger.cc ;
+#exe ublas_cmatr3 : ublas_cmatr3.cc ;
+#exe ublas_cvct : ublas_cvct.cc ;
+#exe ublas_gesv : ublas_gesv.cc ;
+#exe ublas_gesv2 : ublas_gesv2.cc ;
+#exe ublas_gesv3 : ublas_gesv3.cc ;
+#exe ublas_gesv4 : ublas_gesv4.cc ;
+#exe ublas_gesv5 : ublas_gesv5.cc ;
+#exe ublas_getrf_getrs : ublas_getrf_getrs.cc ;
+
+exe ublas_getri : ublas_getri.cc ;
+
+#exe ublas_matr1 : ublas_matr1.cc ;
+#exe ublas_matr2 : ublas_matr2.cc ;
+#exe ublas_matr22 : ublas_matr22.cc ;
+exe ublas_matr2_bench : ublas_matr2_bench.cc ;
+#exe ublas_matr2ger : ublas_matr2ger.cc ;
+#exe ublas_matr3 : ublas_matr3.cc ;
+#exe ublas_posv : ublas_posv.cc ;
+#exe ublas_potrf_potrs : ublas_potrf_potrs.cc ;
+
+exe ublas_potri : ublas_potri.cc ;
+
+exe ublas_herm3 : ublas_herm3.cc ;
+#exe ublas_herm3h2k : ublas_herm3h2k.cc ;
+#exe ublas_herm3herk : ublas_herm3herk.cc ;
+
+exe ublas_symm2 : ublas_symm2.cc ;
+exe ublas_symm3 : ublas_symm3.cc ;
+exe ublas_symm2syr : ublas_symm2syr.cc ;
+exe ublas_symm32 : ublas_symm32.cc ;
+exe ublas_symm33 : ublas_symm33.cc ;
+exe ublas_symm3s2k : ublas_symm3s2k.cc ;
+exe ublas_symm3syrk : ublas_symm3syrk.cc ;
+exe ublas_symmc3 : ublas_symmc3.cc ;
+#exe ublas_vct : ublas_vct.cc ;
+
+test-suite atlas-bindings :
+ [ run init.cc ]
+ [ run others.cc ]
+
+ [ run ublas_cmatr2.cc ]
+ [ run ublas_cmatr2ger.cc ]
+ [ run ublas_cmatr3.cc ]
+ [ run ublas_cvct.cc ]
+ [ run ublas_gesv.cc ]
+ [ run ublas_gesv2.cc ]
+ [ run ublas_gesv3.cc ]
+ [ run ublas_gesv4.cc ]
+ [ run ublas_gesv5.cc ]
+ [ run ublas_getrf_getrs.cc ]
+
+ [ run ublas_matr1.cc ]
+ [ run ublas_matr2.cc ]
+ [ run ublas_matr22.cc ]
+# [ run ublas_matr2_bench.cc ]
+ [ run ublas_matr2ger.cc ]
+ [ run ublas_matr3.cc ]
+ [ run ublas_posv.cc ]
+ [ run ublas_potrf_potrs.cc ]
+
+# [ run ublas_herm3.cc ]
+ [ run ublas_herm3h2k.cc ]
+ [ run ublas_herm3herk.cc ]
+
+# [ run ublas_symm2.cc ]
+# [ run ublas_symm3.cc ]
+# [ run ublas_symm2syr.cc ]
+# [ run ublas_symm32.cc ]
+# [ run ublas_symm33.cc ]
+# [ run ublas_symm3s2k.cc ]
+# [ run ublas_symm3syrk.cc ]
+# [ run ublas_symmc3.cc ]
+ [ run ublas_vct.cc ]
+;
Modified: sandbox/libs/numeric/bindings/atlas/others.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/others.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/others.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -56,7 +56,7 @@
cout << endl;
#endif
- atlas::scal (2, sv);
+ atlas::scal (real_t(2), sv);
print_v (sv, "scal(): 2 sv");
cout << endl;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_cmatr2.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_cmatr2.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_cmatr2.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/atlas/cblas2.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#ifdef F_USE_STD_VECTOR
#include <vector>
#include <boost/numeric/bindings/traits/std_vector.hpp>
Modified: sandbox/libs/numeric/bindings/atlas/ublas_gesv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_gesv.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_gesv.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -12,6 +12,7 @@
#include <boost/numeric/bindings/atlas/clapack.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_gesv2.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_gesv2.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_gesv2.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/atlas/cblas.hpp>
#include <boost/numeric/bindings/atlas/clapack.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_gesv5.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_gesv5.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_gesv5.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -17,6 +17,7 @@
# include <boost/numeric/bindings/traits/ublas_vector2.hpp>
#endif
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/ublas/io.hpp>
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/atlas/cblas.hpp>
#include <boost/numeric/bindings/atlas/clapack.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
#include "utils.h"
@@ -50,7 +51,7 @@
// [ ... ]
// [1 2 ... n-1 n]
ublas::matrix_row<m_t> ar1 (a, 0), ar3 (a, 3);
- ublas::swap (ar1, ar3); // swap rows to force pivoting
+ swap (ar1, ar3); // swap rows to force pivoting
ublas::matrix_column<m_t> xc0 (x, 0), xc1 (x, 1);
atlas::set (1., xc0); // x[.,0] = 1
Modified: sandbox/libs/numeric/bindings/atlas/ublas_matr1.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_matr1.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_matr1.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -7,6 +7,8 @@
#include <iostream>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/vector_proxy.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/bindings/atlas/cblas1.hpp>
#include "utils.h"
Modified: sandbox/libs/numeric/bindings/atlas/ublas_matr22.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_matr22.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_matr22.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -9,6 +9,7 @@
#include <boost/numeric/bindings/atlas/cblas2.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#ifdef F_USE_STD_VECTOR
#include <vector>
#include <boost/numeric/bindings/traits/std_vector.hpp>
Modified: sandbox/libs/numeric/bindings/atlas/ublas_matr3.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_matr3.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_matr3.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -9,6 +9,7 @@
#include <iostream>
#include <boost/numeric/bindings/atlas/cblas3.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#ifdef F_USE_STD_VECTOR
#include <vector>
#include <boost/numeric/bindings/traits/std_vector.hpp>
Modified: sandbox/libs/numeric/bindings/atlas/ublas_posv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_posv.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_posv.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -19,6 +19,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/ublas_hermitian.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -19,6 +19,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/ublas_hermitian.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/atlas/ublas_vct.cc
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/ublas_vct.cc (original)
+++ sandbox/libs/numeric/bindings/atlas/ublas_vct.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -6,6 +6,7 @@
#include <iostream>
#include <boost/numeric/ublas/vector.hpp>
+#include <boost/numeric/ublas/vector_proxy.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/atlas/cblas1.hpp>
#ifdef F_USE_STD_VECTOR
Modified: sandbox/libs/numeric/bindings/atlas/utils.h
==============================================================================
--- sandbox/libs/numeric/bindings/atlas/utils.h (original)
+++ sandbox/libs/numeric/bindings/atlas/utils.h 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -112,8 +112,9 @@
template <typename M>
struct matr_access_traits {
typedef typename
- boost::numeric::bindings::traits::matrix_traits<M>::value_type val_t;
- typedef val_t& ref_t;
+ M::reference ref_t;
+ //boost::numeric::bindings::traits::matrix_traits<M>::value_type val_t;
+ //typedef val_t& ref_t;
static ref_t elem (M& m, size_t i, size_t j) { return m (i, j); }
};
Deleted: sandbox/libs/numeric/bindings/blas/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/blas/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-subproject libs/numeric/bindings/blas ;
-subinclude libs/numeric/bindings/blas/test ;
Deleted: sandbox/libs/numeric/bindings/blas/test/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/blas/test/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,28 +0,0 @@
-subproject libs/numeric/bindings/blas/test ;
-
-BLAS_PATH ?= /usr/lib ;
-BLAS_LIB ?= blas g2c ;
-
-exe scal
- : scal.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
-
-exe blas1
- : blas1.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
-
-exe blas3
- : blas3.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
Copied: sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 (from r43794, /sandbox/libs/numeric/bindings/blas/test/Jamfile)
==============================================================================
--- /sandbox/libs/numeric/bindings/blas/test/Jamfile (original)
+++ sandbox/libs/numeric/bindings/blas/test/Jamfile.v2 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -1,28 +1,32 @@
-subproject libs/numeric/bindings/blas/test ;
+# 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)
BLAS_PATH ?= /usr/lib ;
-BLAS_LIB ?= blas g2c ;
+BLAS_LIB ?= blas ;
+
+lib g2c ;
+lib blas_lib : g2c : <name>$(BLAS_LIB) <search>$(BLAS_PATH) ;
+
+
+project libs/numeric/bindings/blas/test : requirements
+ <include>$(BOOST_ROOT)
+ <include>$(BOOST)
+ <library>blas_lib ;
+
+import testing ;
+
+
+#exe blas2 : blas2.cpp ;
+
+#exe scal : scal.cpp ;
+#exe blas1 : blas1.cpp ;
+#exe blas3 : blas3.cpp ;
+
+test-suite bindings-blas :
+ [ run scal.cpp ]
+ [ run blas1.cpp ]
+ [ run blas3.cpp ]
+;
-exe scal
- : scal.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
-
-exe blas1
- : blas1.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
-
-exe blas3
- : blas3.cpp
- : <include>$(BOOST_ROOT)
- <include>$(BOOST)
- <library-path>$(BLAS_PATH)
- <find-library>$(BLAS_LIB)
- ;
Deleted: sandbox/libs/numeric/bindings/lapack/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-subproject libs/numeric/bindings/lapack ;
-subinclude libs/numeric/blasbindings/tst ;
Deleted: sandbox/libs/numeric/bindings/lapack/test/Jamfile
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/Jamfile 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
+++ (empty file)
@@ -1,71 +0,0 @@
-subproject libs/numeric/bindings/lapack/test ;
-
-LAPACK_PATH = /usr/lib ;
-LAPACK_LIB = lapack ;
-
-BLAS_PATH = /usr/lib ;
-BLAS_LIB = blas g2c ;
-
-exe lapack
- : lapack.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <find-library>$(LAPACK_LIB)
- ;
-
-exe ublas_gees
- : ublas_gees.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-exe ublas_geqrf
- : ublas_geqrf.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-exe ublas_hbev
- : ublas_hbev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-
-
-exe ublas_heev
- : ublas_heev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-
-
-exe ublas_syev
- : ublas_syev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-
Copied: sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 (from r43794, /sandbox/libs/numeric/bindings/lapack/test/Jamfile)
==============================================================================
--- /sandbox/libs/numeric/bindings/lapack/test/Jamfile (original)
+++ sandbox/libs/numeric/bindings/lapack/test/Jamfile.v2 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -1,71 +1,91 @@
-subproject libs/numeric/bindings/lapack/test ;
-
-LAPACK_PATH = /usr/lib ;
-LAPACK_LIB = lapack ;
-
-BLAS_PATH = /usr/lib ;
-BLAS_LIB = blas g2c ;
-
-exe lapack
- : lapack.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <find-library>$(LAPACK_LIB)
- ;
-
-exe ublas_gees
- : ublas_gees.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-exe ublas_geqrf
- : ublas_geqrf.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-exe ublas_hbev
- : ublas_hbev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-
-
-exe ublas_heev
- : ublas_heev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
-
-
-exe ublas_syev
- : ublas_syev.cpp
- : <include>$(BOOST_ROOT)
- <include>$(B_ROOT)
- <library-path>$(LAPACK_PATH)
- <library-path>$(BLAS_PATH)
- <find-library>$(LAPACK_LIB)
- <find-library>$(BLAS_LIB)
- ;
-
+# 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)
+
+LAPACK_PATH ?= /usr/lib ;
+LAPACK_LIB ?= lapack ;
+
+BLAS_PATH ?= /usr/lib ;
+BLAS_LIB ?= blas ;
+
+lib g2c ;
+lib blas_lib : g2c : <name>$(BLAS_LIB) <search>$(BLAS_PATH) ;
+lib lapack_lib : g2c : <name>$(LAPACK_LIB) <search>$(LAPACK_PATH) <use>blas_lib : : <library>blas_lib ;
+
+
+project libs/numeric/bindings/lapack/test : requirements
+ <include>$(BOOST_ROOT)
+ <include>$(B_ROOT)
+ <library>lapack_lib ;
+
+import testing ;
+
+#exe lapack : lapack.cpp ;
+
+#exe ublas_gees : ublas_gees.cpp ;
+#exe ublas_geqrf : ublas_geqrf.cpp ;
+#exe ublas_hbev : ublas_hbev.cpp ;
+#exe ublas_heev : ublas_heev.cpp ;
+#exe ublas_syev : ublas_syev.cpp ;
+
+#exe ublas_gesdd : ublas_gesdd.cc ;
+#exe ublas_gesdd2 : ublas_gesdd2.cc ;
+#exe ublas_gesdd3 : ublas_gesdd3.cc ;
+#exe ublas_gesdd4 : ublas_gesdd4.cc ;
+#exe ublas_gesv : ublas_gesv.cc ;
+#exe ublas_gesv2 : ublas_gesv2.cc ;
+#exe ublas_gesvd : ublas_gesvd.cc ;
+#exe ublas_gesvd2 : ublas_gesvd2.cc ;
+#exe ublas_gesvd3 : ublas_gesvd3.cc ;
+#exe ublas_gesvd4 : ublas_gesvd4.cc ;
+
+#exe ublas_hesv : ublas_hesv.cc ;
+#exe ublas_hpsv : ublas_hpsv.cc ;
+#exe ublas_posv : ublas_posv.cc ;
+#exe ublas_ppsv : ublas_ppsv.cc ;
+exe ublas_spsv : ublas_spsv.cc ;
+exe ublas_sysv : ublas_sysv.cc ;
+
+exe ublas_getrf_getrs : ublas_getrf_getrs.cc ;
+#exe ublas_hetrf_hetrs : ublas_hetrf_hetrs.cc ;
+#exe ublas_hptrf_hptrs : ublas_hptrf_hptrs.cc ;
+#exe ublas_potrf_potrs : ublas_potrf_potrs.cc ;
+#exe ublas_pptrf_pptrs : ublas_pptrf_pptrs.cc ;
+exe ublas_sptrf_sptrs : ublas_sptrf_sptrs.cc ;
+exe ublas_sytrf_sytrs : ublas_sytrf_sytrs.cc ;
+
+test-suite bindings-lapack :
+ [ run ublas_gees.cpp ]
+ [ run ublas_geqrf.cpp ]
+ [ run ublas_hbev.cpp ]
+ [ run ublas_heev.cpp ]
+ [ run ublas_syev.cpp ]
+
+ [ run ublas_gesdd.cc ]
+ [ run ublas_gesdd2.cc ]
+ [ run ublas_gesdd3.cc ]
+ [ run ublas_gesdd4.cc ]
+ [ run ublas_gesv.cc ]
+ [ run ublas_gesv2.cc ]
+ [ run ublas_gesvd.cc ]
+ [ run ublas_gesvd2.cc ]
+ [ run ublas_gesvd3.cc ]
+ [ run ublas_gesvd4.cc ]
+
+ [ run ublas_hesv.cc ]
+ [ run ublas_hpsv.cc ]
+ [ run ublas_posv.cc ]
+ [ run ublas_ppsv.cc ]
+# [ run ublas_spsv.cc ]
+# [ run ublas_sysv.cc ]
+
+# [ run ublas_getrf_getrs.cc ]
+ [ run ublas_hetrf_hetrs.cc ]
+ [ run ublas_hptrf_hptrs.cc ]
+ [ run ublas_potrf_potrs.cc ]
+ [ run ublas_pptrf_pptrs.cc ]
+# [ run ublas_sptrf_sptrs.cc ]
+# [ run ublas_sytrf_sytrs.cc ]
+;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesv2.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesv2.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesv2.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,7 @@
#include <boost/numeric/bindings/lapack/gesv.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -9,6 +9,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -6,6 +6,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,7 @@
#include <boost/numeric/bindings/lapack/gesv.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hbev.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hbev.cpp (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hbev.cpp 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -74,7 +74,7 @@
assert( norm_frobenius( error - herm( error ) ) == 0.0 ) ;
for (int i=0; i<n; ++i) {
- error .minus_assign( outer_prod( z.column(i), e(i) * conj( z.column(i) ) ) ) ;
+ error .minus_assign( outer_prod( column(z, i), e(i) * conj( column(z, i) ) ) ) ;
}
return (norm_frobenius( error )
>= n* norm_2( e ) * std::numeric_limits< real_type >::epsilon() ) ;
@@ -121,7 +121,9 @@
lapack::hbev( h_r, e_r, z_r, workspace );
- if (check_residual( h2(r,r), e_r, z_r )) return 255 ;
+ banded_range a2_r( a2, r, r );
+ ublas::hermitian_adaptor< banded_range, UPLO> h2_r( a2_r );
+ if (check_residual( h2_r, e_r, z_r )) return 255 ;
return 0 ;
} // do_memory_uplo()
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_heev.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_heev.cpp (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_heev.cpp 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,8 @@
#include <boost/numeric/bindings/lapack/heev.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
+#include <boost/numeric/ublas/vector_proxy.hpp>
#include <boost/numeric/ublas/io.hpp>
#include <iostream>
@@ -54,7 +56,7 @@
assert( norm_frobenius( error - herm( error ) ) == 0.0 ) ;
for (int i=0; i<n; ++i) {
- error .minus_assign( outer_prod( z.column(i), e(i) * conj( z.column(i) ) ) ) ;
+ error .minus_assign( outer_prod( column(z, i), e(i) * conj( column(z, i) ) ) ) ;
}
return (norm_frobenius( error )
>= n* norm_2( e ) * std::numeric_limits< real_type >::epsilon() ) ;
@@ -95,7 +97,8 @@
lapack::heev( 'V', UPLO, a_r, e_r, workspace );
- if (check_residual( a2(r,r), e_r, a_r )) return 255 ;
+ matrix_range a2_r( a2, r, r );
+ if (check_residual( a2_r, e_r, a_r )) return 255 ;
return 0 ;
} // do_memory_uplo()
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_hermitian.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_posv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_posv.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_posv.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/ublas_hermitian.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_syev.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_syev.cpp (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_syev.cpp 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,8 @@
#include <boost/numeric/bindings/lapack/syev.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
+#include <boost/numeric/ublas/vector_proxy.hpp>
#include <boost/numeric/ublas/io.hpp>
#include <iostream>
@@ -54,7 +56,7 @@
assert( norm_frobenius( error - trans( error ) ) == 0.0 ) ;
for (int i=0; i<n; ++i) {
- error .minus_assign( outer_prod( z.column(i), e(i) * conj( z.column(i) ) ) ) ;
+ error .minus_assign( outer_prod( column(z, i), e(i) * conj( column(z, i) ) ) ) ;
}
return (norm_frobenius( error )
>= n* norm_2( e ) * std::numeric_limits< real_type >::epsilon() ) ;
@@ -95,7 +97,8 @@
lapack::syev('V', UPLO, a_r, e_r, workspace );
- if (check_residual( a2(r,r), e_r, a_r )) return 255 ;
+ matrix_range a2_r( a2, r, r );
+ if (check_residual( a2_r, e_r, a_r )) return 255 ;
return 0 ;
} // do_memory_uplo()
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_sysv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_sysv.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_sysv.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc (original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/ublas/matrix_proxy.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
Modified: sandbox/libs/numeric/bindings/lapack/test/utils.h
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/utils.h (original)
+++ sandbox/libs/numeric/bindings/lapack/test/utils.h 2008-04-08 18:14:19 EDT (Tue, 08 Apr 2008)
@@ -101,8 +101,9 @@
template <typename M>
struct matr_access_traits {
typedef typename
- boost::numeric::bindings::traits::matrix_traits<M>::value_type val_t;
- typedef val_t& ref_t;
+ M::reference ref_t;
+ //boost::numeric::bindings::traits::matrix_traits<M>::value_type val_t;
+ //typedef val_t& ref_t;
static ref_t elem (M& m, size_t i, size_t j) { return m (i, j); }
};
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk