[Boost-commit] svn:boost r58482 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test

Subject: [Boost-commit] svn:boost r58482 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test
From: thomas.klimpel_at_[hidden]
Date: 2009-12-21 14:35:07

Author: klimpel
Date: 2009-12-21 14:35:06 EST (Mon, 21 Dec 2009)
New Revision: 58482
URL: http://svn.boost.org/trac/boost/changeset/58482

Log:
Continue of regression tests update
Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc  |     4 ++--                                    
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc |     4 ++--                                    
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc |     4 ++--                                    
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd4.cc |     2 +-                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd.cc  |    11 ++++++++++-                             
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc |    11 ++++++++++-                             
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc |    11 ++++++++++-                             
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc |     8 +++++---                                
   8 files changed, 42 insertions(+), 13 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 14:35:06 EST (Mon, 21 Dec 2009)
@@ -100,7 +100,7 @@
   lapack::gesdd ('M', 'A', a2, s, u, vt);  
 #endif
 */
-  lapack::gesdd ('A', a2, s, u, vt);
+  lapack::gesdd ('A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -131,7 +131,7 @@
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif 
 */
-  lapack::gesdd ('N', a3, s, u, vt);
+  lapack::gesdd ('N', a3, s, u, vt, lapack::minimal_workspace());
 
   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 14:35:06 EST (Mon, 21 Dec 2009)
@@ -108,7 +108,7 @@
   lapack::gesdd ('M', 'A', a2, s, u, vt);  
 #endif
 */
-  lapack::gesdd ('A', a2, s, u, vt);
+  lapack::gesdd ('A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -139,7 +139,7 @@
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif 
 */
-  lapack::gesdd ('N', a3, s, u, vt);
+  lapack::gesdd ('N', a3, s, u, vt, lapack::minimal_workspace());
 
   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 14:35:06 EST (Mon, 21 Dec 2009)
@@ -101,7 +101,7 @@
   lapack::gesdd ('M', 'A', a2, s, u, vt);  
 #endif
 */
-  lapack::gesdd ('A', a2, s, u, vt);
+  lapack::gesdd ('A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -136,7 +136,7 @@
   lapack::gesdd ('M', 'N', a3, s, u, vt);
 #endif 
 */
-  lapack::gesdd ('N', a3, s, u, vt);
+  lapack::gesdd ('N', a3, s, u, vt, lapack::minimal_workspace());
 
   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 14:35:06 EST (Mon, 21 Dec 2009)
@@ -43,7 +43,7 @@
   m_t vt (minmn, n);
 
 //  lapack::gesdd (a, s, u, vt);
-  lapack::gesdd ('A', a, s, u, vt);
+  lapack::gesdd ('S', a, s, u, vt);
 
   print_v (s, "s"); 
   cout << endl; 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd.cc	2009-12-21 14:35:06 EST (Mon, 21 Dec 2009)
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm> 
-#include <boost/numeric/bindings/lapack/gesvd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesvd.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
@@ -66,6 +67,8 @@
   std::vector<real_t> w (lw); 
 
   lapack::gesvd ('A', 'A', a, s, u, vt, w);  
+*/
+  lapack::gesvd ('A', 'A', a, s, u, vt);
 
   print_v (s, "s"); 
   cout << endl; 
@@ -88,11 +91,14 @@
 
   cout << endl << "part 2" << endl << endl; 
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesvd ('A', 'A', a2, s, u, vt);  
 #else
   lapack::gesvd ('M', 'A', 'A', a2, s, u, vt);  
 #endif
+*/
+  lapack::gesvd ('A', 'A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -114,6 +120,7 @@
 
   cout << endl << "part 3" << endl << endl; 
 
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesvd_work ('O', 'N', 'N', a3) 
        << endl << endl; 
@@ -123,6 +130,8 @@
        << endl << endl; 
   lapack::gesvd ('M', 'N', 'N', a3, s, u, vt);
 #endif 
+*/
+  lapack::gesvd ('N', 'N', a3, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "singular values only"); 
   cout << endl; 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd2.cc	2009-12-21 14:35:06 EST (Mon, 21 Dec 2009)
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <algorithm> 
 #include <complex>
-#include <boost/numeric/bindings/lapack/gesvd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesvd.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>
@@ -47,6 +47,7 @@
   m_t u (m, m);
   m_t vt (n, n);
 
+/*
   size_t lw; 
 
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
@@ -75,6 +76,8 @@
   std::vector<real_t> rw (lrw);
 
   lapack::gesvd ('A', 'A', a, s, u, vt, w, rw);  
+*/
+  lapack::gesvd ('A', 'A', a, s, u, vt);
 
   print_v (s, "s"); 
   cout << endl; 
@@ -97,11 +100,14 @@
 
   cout << endl << "part 2" << endl << endl; 
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesvd ('A', 'A', a2, s, u, vt);  
 #else
   lapack::gesvd ('M', 'A', 'A', a2, s, u, vt);  
 #endif
+*/
+  lapack::gesvd ('A', 'A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -123,6 +129,7 @@
 
   cout << endl << "part 3" << endl << endl; 
 
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesvd_work ('O', 'N', 'N', a3) 
        << endl << endl; 
@@ -132,6 +139,8 @@
        << endl << endl; 
   lapack::gesvd ('M', 'N', 'N', a3, s, u, vt);
 #endif 
+*/
+  lapack::gesvd ('N', 'N', a3, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "singular values only"); 
   cout << endl; 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd3.cc	2009-12-21 14:35:06 EST (Mon, 21 Dec 2009)
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm> 
-#include <boost/numeric/bindings/lapack/gesvd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesvd.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
@@ -70,6 +71,8 @@
   std::vector<real_t> w (lw); 
 
   lapack::gesvd ('A', 'A', a, s, u, vt, w);  
+*/
+  lapack::gesvd ('A', 'A', a, s, u, vt);
 
   print_v (s, "s"); 
   cout << endl; 
@@ -89,11 +92,14 @@
 
   cout << endl << "part 2" << endl << endl; 
  
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   lapack::gesvd ('A', 'A', a2, s, u, vt);  
 #else
   lapack::gesvd ('M', 'A', 'A', a2, s, u, vt);  
 #endif
+*/
+  lapack::gesvd ('A', 'A', a2, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "s"); 
   cout << endl; 
@@ -120,6 +126,7 @@
 
   cout << endl << "part 4" << endl << endl; 
 
+/*
 #ifndef BOOST_NUMERIC_BINDINGS_LAPACK_2
   cout << "opt lw: " << lapack::gesvd_work ('O', 'N', 'N', a3) 
        << endl << endl; 
@@ -129,6 +136,8 @@
        << endl << endl; 
   lapack::gesvd ('M', 'N', 'N', a3, s, u, vt);
 #endif 
+*/
+  lapack::gesvd ('N', 'N', a3, s, u, vt, lapack::minimal_workspace());
 
   print_v (s, "singular values only"); 
   cout << endl; 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesvd4.cc	2009-12-21 14:35:06 EST (Mon, 21 Dec 2009)
@@ -2,7 +2,7 @@
 #include <cstddef>
 #include <iostream>
 #include <algorithm> 
-#include <boost/numeric/bindings/lapack/gesvd.hpp>
+#include <boost/numeric/bindings/lapack/driver/gesvd.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>
@@ -40,7 +40,8 @@
   m_t u (m, minmn);
   m_t vt (minmn, n);
 
-  lapack::gesvd (a, s, u, vt);  
+//  lapack::gesvd (a, s, u, vt);
+  lapack::gesvd ('S', 'S', a, s, u, vt);
 
   print_v (s, "s"); 
   cout << endl; 
@@ -75,7 +76,8 @@
   
   // part 3 
   
-  lapack::gesvd (a2, s);  
+//  lapack::gesvd (a2, s);
+  lapack::gesvd ('N', 'N', a2, s, u, vt);
   
   print_v (s, "singular values only"); 
   cout << endl;