Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50290 - sandbox/boost/numeric/bindings/lapack
From: thomas.klimpel_at_[hidden]
Date: 2008-12-16 05:03:01


Author: klimpel
Date: 2008-12-16 05:03:00 EST (Tue, 16 Dec 2008)
New Revision: 50290
URL: http://svn.boost.org/trac/boost/changeset/50290

Log:
minor modifications, to make lapack regression tests pass with gcc-4.2.2 on linux64

Text files modified:
   sandbox/boost/numeric/bindings/lapack/gelsd.hpp | 26 +++++++++++++-------------
   sandbox/boost/numeric/bindings/lapack/gelss.hpp | 20 ++++++++++----------
   2 files changed, 23 insertions(+), 23 deletions(-)

Modified: sandbox/boost/numeric/bindings/lapack/gelsd.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/lapack/gelsd.hpp (original)
+++ sandbox/boost/numeric/bindings/lapack/gelsd.hpp 2008-12-16 05:03:00 EST (Tue, 16 Dec 2008)
@@ -191,8 +191,8 @@
                     const int nrhs = traits::matrix_size2(B);
 
                     const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
 
                     // query for maximum size of subproblems
                     const int smlsiz = ilaenv(9, "GELSD", "");
@@ -212,13 +212,13 @@
                     typedef typename MatrA::value_type val_t;
                     typedef typename traits::type_traits<val_t>::real_type real_t;
 
- const int m = traits::matrix_size1(A);
- const int n = traits::matrix_size2(A);
- const int nrhs = traits::matrix_size2(B);
-
- const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
+ //const int m = traits::matrix_size1(A);
+ //const int n = traits::matrix_size2(A);
+ //const int nrhs = traits::matrix_size2(B);
+
+ //const int minmn = std::min(m, n); // minmn = m < n ? m : n
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
 
                     val_t temp_work;
                     int temp_iwork;
@@ -282,8 +282,8 @@
                     const int nrhs = traits::matrix_size2(B);
 
                     const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
 
                     // query for maximum size of subproblems
                     const int smlsiz = ilaenv(9, "GELSD", "");
@@ -310,8 +310,8 @@
                     const int nrhs = traits::matrix_size2(B);
 
                     const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, nrhs); // maxmnr = maxmn > nrhs ? maxmn : nrhs
 
                     val_t temp_work;
                     real_t temp_rwork;

Modified: sandbox/boost/numeric/bindings/lapack/gelss.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/lapack/gelss.hpp (original)
+++ sandbox/boost/numeric/bindings/lapack/gelss.hpp 2008-12-16 05:03:00 EST (Tue, 16 Dec 2008)
@@ -186,13 +186,13 @@
                     typedef typename MatrA::value_type val_t;
                     typedef typename traits::type_traits<val_t>::real_type real_t;
 
- const int m = traits::matrix_size1(A);
- const int n = traits::matrix_size2(A);
- const int rhs = traits::matrix_size2(B);
-
- const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, rhs); // maxmnr = maxmn > rhs ? maxmn : rhs
+ //const int m = traits::matrix_size1(A);
+ //const int n = traits::matrix_size2(A);
+ //const int rhs = traits::matrix_size2(B);
+
+ //const int minmn = std::min(m, n); // minmn = m < n ? m : n
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, rhs); // maxmnr = maxmn > rhs ? maxmn : rhs
 
                     val_t temp_work;
 
@@ -263,11 +263,11 @@
 
                     const int m = traits::matrix_size1(A);
                     const int n = traits::matrix_size2(A);
- const int rhs = traits::matrix_size2(B);
+ //const int rhs = traits::matrix_size2(B);
 
                     const int minmn = std::min(m, n); // minmn = m < n ? m : n
- const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
- const int maxmnr = std::max(maxmn, rhs); // maxmnr = maxmn > rhs ? maxmn : rhs
+ //const int maxmn = std::max(m, n); // maxmn = m > n ? m : n
+ //const int maxmnr = std::max(maxmn, rhs); // maxmnr = maxmn > rhs ? maxmn : rhs
 
                     val_t temp_work;
                     real_t temp_rwork;


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