Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58476 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test
From: thomas.klimpel_at_[hidden]
Date: 2009-12-21 10:42:05


Author: klimpel
Date: 2009-12-21 10:42:04 EST (Mon, 21 Dec 2009)
New Revision: 58476
URL: http://svn.boost.org/trac/boost/changeset/58476

Log:
Continue of regression tests update
Text files modified:
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc | 11 ++++++++++-
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc | 11 ++++++++++-
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc | 11 ++++++++++-
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc | 8 +++++---
   4 files changed, 35 insertions(+), 6 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc 2009-12-21 10:42:04 EST (Mon, 21 Dec 2009)
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm>
-#include <boost/numeric/bindings/lapack/gesdd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesdd.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
@@ -42,6 +42,7 @@
   m_t u (m, m);
   m_t vt (n, n);
 
+/*
   size_t lw;
 
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
@@ -68,6 +69,8 @@
   std::vector<integer_t> iw (liw);
   
   lapack::gesdd ('A', a, s, u, vt, w, iw);
+*/
+ lapack::gesdd ('A', a, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -90,11 +93,14 @@
 
   cout << endl << "part 2" << endl << endl;
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesdd ('A', a2, s, u, vt);
 #else
   lapack::gesdd ('M', 'A', a2, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('A', a2, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -116,6 +122,7 @@
 
   cout << endl << "part 3" << endl << endl;
 
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesdd_work ('O', 'N', a3) << endl << endl;
   lapack::gesdd (a3, s);
@@ -123,6 +130,8 @@
   cout << "min lw: " << lapack::gesdd_work ('M', 'N', a3) << endl << endl;
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('N', a3, s, u, vt);
 
   print_v (s, "singular values only");
   cout << endl;

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc 2009-12-21 10:42:04 EST (Mon, 21 Dec 2009)
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <algorithm>
 #include <complex>
-#include <boost/numeric/bindings/lapack/gesdd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesdd.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
@@ -46,6 +46,7 @@
   m_t u (m, m);
   m_t vt (n, n);
 
+/*
   size_t lw;
 
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
@@ -76,6 +77,8 @@
   std::vector<integer_t> iw (liw);
 
   lapack::gesdd ('A', a, s, u, vt, w, rw, iw);
+*/
+ lapack::gesdd ('A', a, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -98,11 +101,14 @@
 
   cout << endl << "part 2" << endl << endl;
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesdd ('A', a2, s, u, vt);
 #else
   lapack::gesdd ('M', 'A', a2, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('A', a2, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -124,6 +130,7 @@
 
   cout << endl << "part 3" << endl << endl;
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesdd_work ('O', 'N', a3) << endl << endl;
   lapack::gesdd (a3, s);
@@ -131,6 +138,8 @@
   cout << "min lw: " << lapack::gesdd_work ('M', 'N', a3) << endl << endl;
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('N', a3, s, u, vt);
 
   print_v (s, "singular value only");
   cout << endl;

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc 2009-12-21 10:42:04 EST (Mon, 21 Dec 2009)
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm>
-#include <boost/numeric/bindings/lapack/gesdd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesdd.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
@@ -46,6 +46,7 @@
   m_t u (m, m);
   m_t vt (n, n);
 
+/*
   size_t lw;
 
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
@@ -72,6 +73,8 @@
   std::vector<integer_t> iw (liw);
 
   lapack::gesdd ('A', a, s, u, vt, w, iw);
+*/
+ lapack::gesdd ('A', a, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -91,11 +94,14 @@
 
   cout << endl << "part 2" << endl << endl;
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesdd ('A', a2, s, u, vt);
 #else
   lapack::gesdd ('M', 'A', a2, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('A', a2, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -121,6 +127,7 @@
 
   cout << endl << "part 4" << endl << endl;
 
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesdd_work ('O', 'N', a3) << endl << endl;
   lapack::gesdd ('N', a3, s, u, vt);
@@ -128,6 +135,8 @@
   cout << "min lw: " << lapack::gesdd_work ('M', 'N', a3) << endl << endl;
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif
+*/
+ lapack::gesdd ('N', a3, s, u, vt);
 
   print_v (s, "singular values only");
   cout << endl;

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc 2009-12-21 10:42:04 EST (Mon, 21 Dec 2009)
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm>
-#include <boost/numeric/bindings/lapack/gesdd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesdd.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/std_vector.hpp>
@@ -42,7 +42,8 @@
   m_t u (m, minmn);
   m_t vt (minmn, n);
 
- lapack::gesdd (a, s, u, vt);
+// lapack::gesdd (a, s, u, vt);
+ lapack::gesdd ('A', a, s, u, vt);
 
   print_v (s, "s");
   cout << endl;
@@ -77,7 +78,8 @@
   
   // part 3
   
- lapack::gesdd (a2, s);
+// lapack::gesdd (a2, s);
+ lapack::gesdd ('N', a2, s, u, vt);
   
   print_v (s, "singular values only");
   cout << endl;


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