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

Subject: [Boost-commit] svn:boost r58727 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates
From: rutger_at_[hidden]
Date: 2010-01-05 15:23:37

Author: rutger
Date: 2010-01-05 15:23:36 EST (Tue, 05 Jan 2010)
New Revision: 58727
URL: http://svn.boost.org/trac/boost/changeset/58727

Log:
removed $INCLUDE_TEMPLATES stuff from lapack default, added extra condition to assertion on size and stride (the matrix should at least have a leading dimension / strides)

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py            |     9 +++++----                               
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp |     2 --                                      
   2 files changed, 5 insertions(+), 6 deletions(-)

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-01-05 15:23:36 EST (Tue, 05 Jan 2010)
@@ -171,9 +171,8 @@
   elif properties.has_key( 'trait_type' ):
     if properties[ 'trait_type' ] == 'lda':
       #
-      # TODO this should be stride_column or stride_row, whatever the orientation
-      # of the library is. In case of LAPACK, stride_column.
-      # Unless this matrix may be transposed, then it is stride_major
+      # stride_major is equal to stride_column or stride_row, whatever the orientation
+      # of the library is.
       # 
       result = "stride_major(" + properties[ 'trait_of' ][ 0 ].lower() + ")"
       #result = "traits::leading_dimension(" + properties[ 'trait_of' ][ 0 ].lower() + ")"
@@ -454,7 +453,9 @@
     result += [ "BOOST_ASSERT( size(" + call_level1_type( name, properties ) + ") >= " + \
       expand_nested_list( properties[ 'assert_size' ], arg_map ) + ' );' ]
 
-  if properties[ 'type' ] == 'matrix' and call_level1_type( name, properties ) != None:
+  if properties[ 'type' ] == 'matrix' and \
+     call_level1_type( name, properties ) != None and \
+     'ref_lda' in properties:
     result += [ "BOOST_ASSERT( " + \
         "size_minor(" + call_level1_type( name, properties ) +") == 1 || " + \
         "stride_minor(" + call_level1_type( name, properties ) +") == 1 );"

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp	2010-01-05 15:23:36 EST (Tue, 05 Jan 2010)
@@ -104,7 +104,6 @@
     typedef typename remove_imaginary< Value >::type real_type;
     typedef tag::column_major order;
 
-$INCLUDE_TEMPLATES
     //
     // Static member function for user-defined workspaces, that
     // * Deduces the required arguments for dispatching to LAPACK, and
@@ -198,7 +197,6 @@
     typedef typename remove_imaginary< Value >::type real_type;
     typedef tag::column_major order;
 
-$INCLUDE_TEMPLATES
     //
     // Static member function, that
     // * Deduces the required arguments for dispatching to LAPACK, and