[Boost-commit] svn:boost r50304 - in sandbox/libs/numeric/bindings: amos/test lapack/test

Subject: [Boost-commit] svn:boost r50304 - in sandbox/libs/numeric/bindings: amos/test lapack/test
From: thomas.klimpel_at_[hidden]
Date: 2008-12-17 11:25:43

Author: klimpel
Date: 2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
New Revision: 50304
URL: http://svn.boost.org/trac/boost/changeset/50304

Log:
64-bit support, first version
Text files modified: 
   sandbox/libs/numeric/bindings/amos/test/amos.cpp                 |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp         |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd.cc         |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc        |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc        |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_gesv.cc          |     4 ++--                                    
   sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc   |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp        |    10 +++++-----                              
   sandbox/libs/numeric/bindings/lapack/test/ublas_heevd.cpp        |     4 ++--                                    
   sandbox/libs/numeric/bindings/lapack/test/ublas_heevx.cpp        |    10 +++++-----                              
   sandbox/libs/numeric/bindings/lapack/test/ublas_hesv.cc          |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc   |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_hpsv.cc          |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc   |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_spsv.cc          |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc   |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_sysv.cc          |     2 +-                                      
   sandbox/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc   |     2 +-                                      
   19 files changed, 29 insertions(+), 29 deletions(-)

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -9,7 +9,7 @@
   //boost::numeric::ublas::vector< value_type > z(10) ; 
   value_type z ;
   boost::numeric::ublas::vector< value_type > cy(10) ; 
-  int nz;
+  integer_t nz;
   boost::numeric::bindings::amos::besi( z, 1.0, 1, cy, nz ) ;
 
   return 0;

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -15,7 +15,7 @@
 template <typename MatrA, typename MatrB>
 void InPlaceSolve(MatrA& a, MatrB& b)
 {
-  std::vector<int> piv(a.size1());
+  std::vector<integer_t> piv(a.size1());
   int ret = lapack::gbtrf(a, piv);
   if (ret < 0) {
     //CStdString err;

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -65,7 +65,7 @@
 
   size_t liw = lapack::gesdd_iwork (a); 
   cout << "liw: " << liw << endl << endl; 
-  std::vector<int> iw (liw); 
+  std::vector<integer_t> iw (liw); 
   
   lapack::gesdd ('A', a, s, u, vt, w, iw);  
 

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -73,7 +73,7 @@
 
   size_t liw = lapack::gesdd_iwork (a);
   cout << "liw: " << liw << endl << endl; 
-  std::vector<int> iw (liw);
+  std::vector<integer_t> iw (liw);
 
   lapack::gesdd ('A', a, s, u, vt, w, rw, iw);
 

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -69,7 +69,7 @@
 
   size_t liw = lapack::gesdd_iwork (a);
   cout << "liw: " << liw << endl << endl; 
-  std::vector<int> iw (liw);
+  std::vector<integer_t> iw (liw);
 
   lapack::gesdd ('A', a, s, u, vt, w, iw);
 

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_gesv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_gesv.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_gesv.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -33,7 +33,7 @@
   size_t nrhs = 2; 
   m_t x (n, nrhs), b (n, nrhs);  // b -- right-hand side matrix
 
-  std::vector<int> ipiv (n);  // pivot vector
+  std::vector<integer_t> ipiv (n);  // pivot vector
 
   init_symm (a); 
   //     [n   n-1 n-2  ... 1]
@@ -68,7 +68,7 @@
   cout << endl; 
   cout << "complex system:" << endl << endl; 
   cm_t ca (3, 3), cb (3, 1), cx (3, 1);
-  std::vector<int> ipiv2 (3); 
+  std::vector<integer_t> ipiv2 (3); 
 
   ca (0, 0) = cmpx_t (3, 0);
   ca (0, 1) = cmpx_t (4, 2);

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -76,7 +76,7 @@
   print_m (b, "B"); 
   cout << endl; 
 
-  std::vector<int> ipiv (n);  // pivot vector
+  std::vector<integer_t> ipiv (n);  // pivot vector
 
   lapack::getrf (a, ipiv);      // factor a
   m_t ia (a);

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -10,7 +10,7 @@
 
   numerics::matrix< value_type > a( lu ) ; // tmp to verify result
   numerics::matrix< value_type > b( x ) ;  // tmp to verify result
-  std::vector< int > ipiv( x.size1() ) ;
+  std::vector< integer_t > ipiv( x.size1() ) ;
 
   boost::numeric::bindings::lapack::getrf( lu, ipiv ) ;
   matrix_type ia( lu );

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -64,8 +64,8 @@
 
    ublas::hermitian_adaptor<banded_type, UPLO> h( a ), h2( a2 );
    real_type vl = 0, vu = 1, abstol = 1e-28;
-   int il = 1, iu = n-1, m;
-   ublas::vector<int> ifail(n);
+   integer_t il = 1, iu = n-1, m;
+   ublas::vector<integer_t> ifail(n);
 
 
    // Compute Schur decomposition.
@@ -86,7 +86,7 @@
    ublas::hermitian_adaptor< banded_range, UPLO> h_r( a_r );
    ublas::vector_range< vector_type> e_r( e1, r );
    ublas::matrix_range< matrix_type> z_r( z, r, r );
-   ublas::vector<int> ifail_r(n-2);
+   ublas::vector<integer_t> ifail_r(n-2);
 
    lapack::hbevx( 'V', 'A', h_r, q, vl, vu, il, iu, abstol, m, e_r, z_r, ifail_r, workspace ) ;
 
@@ -110,7 +110,7 @@
 template <typename T>
 struct Workspace {
    typedef ublas::vector< T >                                               array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace1< array_type >                         first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;
@@ -132,7 +132,7 @@
 struct Workspace< std::complex<T> > {
    typedef ublas::vector< std::complex<T> >                                 complex_array_type ;
    typedef ublas::vector< T >                                               real_array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace2< complex_array_type,real_array_type > first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_heevd.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_heevd.cpp	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_heevd.cpp	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -79,7 +79,7 @@
 template <typename T>
 struct Workspace {
    typedef ublas::vector< T >                                               array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace1< array_type >                         first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;
@@ -101,7 +101,7 @@
 struct Workspace< std::complex<T> > {
    typedef ublas::vector< std::complex<T> >                                 complex_array_type ;
    typedef ublas::vector< T >                                               real_array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace2< complex_array_type,real_array_type > first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_heevx.cpp
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_heevx.cpp	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_heevx.cpp	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -43,8 +43,8 @@
    matrix_type z( a );
 
    // Compute Schur decomposition.
-   int m;
-   ublas::vector<int> ifail(n);
+   integer_t m;
+   ublas::vector<integer_t> ifail(n);
    
    hermitian_type h_a( a );
    lapack::heevx( 'V', 'A', h_a, real_type(0.0), real_type(1.0), 2, n-1, real_type(1e-28), m,
@@ -67,7 +67,7 @@
    matrix_range a_r( a, r, r );
    matrix_range z_r( z, r, r );
    ublas::vector_range< vector_type> e_r( e1, r );
-   ublas::vector<int> ifail_r(n-2);
+   ublas::vector<integer_t> ifail_r(n-2);
 
    hermitian_range_type h_a_r( a_r );
    lapack::heevx( 'V', 'A', h_a_r, real_type(0.0), real_type(1.0), 2, n-1, real_type(1e-28), m,
@@ -93,7 +93,7 @@
 template <typename T>
 struct Workspace {
    typedef ublas::vector< T >                                               array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace1< array_type >                         first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;
@@ -115,7 +115,7 @@
 struct Workspace< std::complex<T> > {
    typedef ublas::vector< std::complex<T> >                                 complex_array_type ;
    typedef ublas::vector< T >                                               real_array_type ;
-   typedef ublas::vector< int >                                             int_array_type ;
+   typedef ublas::vector< integer_t >                                       int_array_type ;
    typedef lapack::detail::workspace2< complex_array_type,real_array_type > first_type;
    typedef lapack::detail::workspace1< int_array_type >                     second_type;
    typedef std::pair<first_type, second_type>                               type ;

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hesv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hesv.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hesv.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -77,7 +77,7 @@
          << ierr << endl;
   cout << endl; 
 
-  std::vector<int> ipiv (3); 
+  std::vector<integer_t> ipiv (3); 
   std::vector<cmplx_t> cwork (3*64); 
   // 3*64 -- optimal size
 

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -69,7 +69,7 @@
   cm_t cal2 (hcal), cau2 (hcau);  // for part 2
   cm_t cbl2 (cbl), cbu2 (cbu); 
 
-  std::vector<int> ipiv (3); 
+  std::vector<integer_t> ipiv (3); 
 
   int ierr = lapack::hetrf (hcal, ipiv); 
   if (ierr == 0) {

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hpsv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hpsv.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hpsv.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -75,7 +75,7 @@
          << ierr << endl;
   cout << endl; 
 
-  std::vector<int> ipiv (3); 
+  std::vector<integer_t> ipiv (3); 
 
   ierr = lapack::hpsv (hcau, ipiv, cbu); 
   if (ierr == 0) {

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -66,7 +66,7 @@
   print_m (cbu, "cbu"); 
   cout << endl; 
 
-  std::vector<int> ipiv (3); 
+  std::vector<integer_t> ipiv (3); 
 
   int ierr = lapack::hptrf (hcal, ipiv); 
   if (ierr == 0) {

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_spsv.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_spsv.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_spsv.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -100,7 +100,7 @@
 
   // part 2 
 
-  std::vector<int> ipiv (n); 
+  std::vector<integer_t> ipiv (n); 
 
   int err = lapack::spsv (sal1, ipiv, bl1);  
   print_m (sal1, "sal1 factored"); 

Modified: sandbox/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc
==============================================================================
--- sandbox/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc	(original)
+++ sandbox/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc	2008-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -86,7 +86,7 @@
   print_m (bu, "bu"); 
   cout << endl; 
 
-  std::vector<int> ipiv (n); 
+  std::vector<integer_t> ipiv (n); 
   
   int err = lapack::sptrf (sal, ipiv);  
   if (err == 0) {

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -103,7 +103,7 @@
 
   // part 2 
 
-  std::vector<int> ipiv (n); 
+  std::vector<integer_t> ipiv (n); 
   std::vector<real_t> work (1); 
 
   int err = lapack::sysv ('L', al1, ipiv, bl1, work);  

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-12-17 11:25:41 EST (Wed, 17 Dec 2008)
@@ -93,7 +93,7 @@
   m_t al1 (al), au1 (au);  // for part 2
   m_t bl1 (bl), bu1 (bu); 
 
-  std::vector<int> ipiv (n); 
+  std::vector<integer_t> ipiv (n); 
   
   int err = lapack::sytrf (sal, ipiv);  
   if (err == 0) {