[Boost-commit] svn:boost r59066 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates templates/level1

Subject: [Boost-commit] svn:boost r59066 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates templates/level1
From: rutger_at_[hidden]
Date: 2010-01-16 04:05:46

Author: rutger
Date: 2010-01-16 04:05:42 EST (Sat, 16 Jan 2010)
New Revision: 59066
URL: http://svn.boost.org/trac/boost/changeset/59066

Log:
generator update for support of complex variants of rot

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py           |    11 ++++++++---                             
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas_grouping.hpp |     4 ++++                                    
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/level1/rot.hpp    |     6 +++++-                                  
   3 files changed, 17 insertions(+), 4 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	2010-01-16 04:05:42 EST (Sat, 16 Jan 2010)
@@ -97,7 +97,10 @@
             print "Subroutine ", subroutine, " arg ", arg
             arg_list += [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'level_0' ] ]
             blas_arg_list += [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'call_blas_header' ] ]
-            cblas_arg_list += [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'call_cblas_header' ] ]
+            if 'call_cblas_header' in info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ]:
+                cblas_arg_list += [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'call_cblas_header' ] ]
+            else:
+                print "WARNING: couldn't find cblas call."
 
             if info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'level_0_typename' ] != None:
                 typename_list +=  [ info_map[ subroutine ][ 'argument_map' ][ arg ][ 'code' ][ 'level_0_typename' ] ]
@@ -305,7 +308,8 @@
             includes += [ '#include <boost/numeric/bindings/bandwidth.hpp>' ]
 
       # Insert the order_type() if appropriate
-      if info_map[ subroutine ][ "has_cblas_order_arg" ]:
+      if "has_cblas_order_arg" in info_map[ subroutine ] and \
+             info_map[ subroutine ][ 'has_cblas_order_arg' ]:
           level0_arg_list.insert( 0, "order()" )
 
       # Level 1 replacements
@@ -478,7 +482,8 @@
 
 # Unable to find zdrot in cblas.h and cublas.h
 # Unable to find crotg, csrot, in cblas.h
-skip_blas_files = [ 'zdrot.f', 'crotg.f', 'zrotg.f', 'csrot.f' ]
+#skip_blas_files = []
+skip_blas_files = [ 'crotg.f', 'zrotg.f' ]
 
 templates = {}
 templates[ 'PARSERMODE' ] = 'BLAS'

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas_grouping.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas_grouping.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas_grouping.hpp	2010-01-16 04:05:42 EST (Sat, 16 Jan 2010)
@@ -1,3 +1,7 @@
+$TEMPLATE[blas.group.ZDROT]
+ROT
+$TEMPLATE[blas.group.CSROT]
+ROT
 $TEMPLATE[blas.group.CDOTU]
 DOT
 $TEMPLATE[blas.group.ZDOTU]

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/level1/rot.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/level1/rot.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/level1/rot.hpp	2010-01-16 04:05:42 EST (Sat, 16 Jan 2010)
@@ -10,5 +10,9 @@
  C        (input) DATATYPE variable alpha
  S        (input) DATATYPE variable alpha
  X        (input/output) DATATYPE array of length (N)
- Y        (output) DATATYPE array of length (N)
+ Y        (input/output) DATATYPE array of length (N)
+$TEMPLATE[rot.all.X.io]
+input,output
+$TEMPLATE[rot.all.Y.io]
+input,output
 $TEMPLATE[end]