[Boost-commit] svn:boost r58550 - sandbox/numeric_bindings/libs/numeric/bindings/tools

Subject: [Boost-commit] svn:boost r58550 - sandbox/numeric_bindings/libs/numeric/bindings/tools
From: rutger_at_[hidden]
Date: 2009-12-28 13:12:49

Author: rutger
Date: 2009-12-28 13:12:48 EST (Mon, 28 Dec 2009)
New Revision: 58550
URL: http://svn.boost.org/trac/boost/changeset/58550

Log:
fixed cblas generator (added Order arg to each function)

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py |    11 ++++++-----                             
   sandbox/numeric_bindings/libs/numeric/bindings/tools/cblas.py          |     2 ++                                      
   2 files changed, 8 insertions(+), 5 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py	2009-12-28 13:12:48 EST (Mon, 28 Dec 2009)
@@ -93,11 +93,12 @@
                 typename_list +=  [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'level_0_typename' ] ]
 
         if "has_cblas_order_arg" in info_map[ subroutine ]:
-            arg_list.insert( 0, "Order" )
-            cblas_arg_list.insert( 0, "cblas_option< Order >::value" )
-            typename_list.insert( 0, "typename Order" )
-            level0_static_asserts.append( "BOOST_STATIC_ASSERT( (is_column_major<Order>::value) );" )
-            includes += [ "#include <boost/numeric/bindings/is_column_major.hpp>" ]
+            if info_map[ subroutine ][ "has_cblas_order_arg" ] == True:
+                arg_list.insert( 0, "Order" )
+                cblas_arg_list.insert( 0, "cblas_option< Order >::value" )
+                typename_list.insert( 0, "typename Order" )
+                level0_static_asserts.append( "BOOST_STATIC_ASSERT( (is_column_major<Order>::value) );" )
+                includes += [ "#include <boost/numeric/bindings/is_column_major.hpp>" ]
 
         sub_template = sub_template.replace( "$TYPES", ", ".join( typename_list ) )
         sub_template = sub_template.replace( "template<  >\n", "" )

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/cblas.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/cblas.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/cblas.py	2009-12-28 13:12:48 EST (Mon, 28 Dec 2009)
@@ -91,8 +91,10 @@
                     exit(0)
 
             if "ORDER" in arguments:
+                print "Adding order argument."
                 info_map[ blas_routine ][ "has_cblas_order_arg" ] = True
             else:
+                print "Not adding order argument."
                 info_map[ blas_routine ][ "has_cblas_order_arg" ] = False