[Boost-commit] svn:boost r64085 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack boost/numeric/bindings/lapack/computational libs/numeric/bindings/tools libs/numeric/bindings/tools/templates/computational

Subject: [Boost-commit] svn:boost r64085 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack boost/numeric/bindings/lapack/computational libs/numeric/bindings/tools libs/numeric/bindings/tools/templates/computational
From: thomas.klimpel_at_[hidden]
Date: 2010-07-17 06:06:23

Author: klimpel
Date: 2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
New Revision: 64085
URL: http://svn.boost.org/trac/boost/changeset/64085

Log:
Further reduced required hand editing of lapack/computational.hpp to make include_test.cpp pass.
Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational.hpp             |     4 ++--                                    
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/ormbr.hpp       |     2 --                                      
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/unmbr.hpp       |     2 --                                      
   sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py                       |     2 +-                                      
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/orm.hpp |     5 +++++                                   
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/unm.hpp |     5 +++++                                   
   6 files changed, 13 insertions(+), 7 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational.hpp	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -50,9 +50,9 @@
 #include <boost/numeric/bindings/lapack/computational/gbbrd.hpp>
 #include <boost/numeric/bindings/lapack/computational/gebrd.hpp>
 #include <boost/numeric/bindings/lapack/computational/orgbr.hpp>
-// #include <boost/numeric/bindings/lapack/computational/ormbr.hpp>
+#include <boost/numeric/bindings/lapack/computational/ormbr.hpp>
 #include <boost/numeric/bindings/lapack/computational/ungbr.hpp>
-// #include <boost/numeric/bindings/lapack/computational/unmbr.hpp>
+#include <boost/numeric/bindings/lapack/computational/unmbr.hpp>
 #include <boost/numeric/bindings/lapack/computational/gebak.hpp>
 #include <boost/numeric/bindings/lapack/computational/gebal.hpp>
 #include <boost/numeric/bindings/lapack/computational/gehrd.hpp>

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/ormbr.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/ormbr.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/ormbr.hpp	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -118,8 +118,6 @@
                 typename remove_const< typename bindings::value_type<
                 MatrixC >::type >::type >::value) );
         BOOST_STATIC_ASSERT( (bindings::is_mutable< MatrixC >::value) );
-        BOOST_ASSERT( bindings::size(tau) >= std::min< std::ptrdiff_t >(?NQ,
-                k) );
         BOOST_ASSERT( bindings::size(work.select(real_type())) >=
                 min_size_work( side, bindings::size_row(c),
                 bindings::size_column(c) ));

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/unmbr.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/unmbr.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/computational/unmbr.hpp	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -120,8 +120,6 @@
                 typename remove_const< typename bindings::value_type<
                 MatrixC >::type >::type >::value) );
         BOOST_STATIC_ASSERT( (bindings::is_mutable< MatrixC >::value) );
-        BOOST_ASSERT( bindings::size(tau) >= std::min< std::ptrdiff_t >(?NQ,
-                k) );
         BOOST_ASSERT( bindings::size(work.select(value_type())) >=
                 min_size_work( side, bindings::size_row(c),
                 bindings::size_column(c) ));

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -415,7 +415,7 @@
       if use_arg_map:
         # mainly used by assert stuff
         if not arg_map.has_key( arg ):
-          return '?' + arg.upper()
+          return '?' + arg.upper() + 'no_assert'
         else:
           if arg_map[ arg ][ 'io' ] == [ 'output' ] and \
              arg_map[ arg ][ 'type' ] == 'scalar':

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/orm.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/orm.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/orm.hpp	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -1,3 +1,8 @@
+$TEMPLATE[ormbr.all.fixme]
+Declaring NQ as extra variables leads to a key error in the generator,
+so the init below is pretty useless right now. It only shows how it could work in theory.
+$TEMPLATE[ormbr.all.NQ.init]
+$INTEGER_TYPE nq = bindings::detail::if_left( side, bindings::size_row(c), bindings::size_column(c) );
 $TEMPLATE[ormbr.all.min_size_work.args]
 SIDE,M,N
 $TEMPLATE[ormbr.includes]

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/unm.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/unm.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/computational/unm.hpp	2010-07-17 06:06:22 EDT (Sat, 17 Jul 2010)
@@ -1,3 +1,8 @@
+$TEMPLATE[unmbr.all.fixme]
+Declaring NQ as extra variables leads to a key error in the generator,
+so the init below is pretty useless right now. It only shows how it could work in theory.
+$TEMPLATE[unmbr.all.NQ.init]
+$INTEGER_TYPE nq = bindings::detail::if_left( side, bindings::size_row(c), bindings::size_column(c) );
 $TEMPLATE[unmbr.all.min_size_work.args]
 SIDE,M,N
 $TEMPLATE[unmbr.includes]