Reverted _obj_is_[row|col]_stored() macros.

Details:
- Rolled back recent changes to bli_obj_is_row_stored() and
  bli_obj_is_col_stored() so that those macros now only inspect the
  strides (row or column). It turns out that the more sophisticated
  definitions introduced in a51e32e are not necessary, because these
  "obj" macros are virtually never used on packed matrices, and when
  they are, they can use bli_obj_is_[row|col}_packed() macros, which
  inspect the info bitfield.
This commit is contained in:
Field G. Van Zee
2014-08-07 18:20:40 -05:00
parent 45692e3ad4
commit 43d5e419e1
2 changed files with 11 additions and 10 deletions

View File

@@ -54,7 +54,7 @@ void bli_packm_acquire_mpart_t2b( subpart_t requested_part,
// Partitioning top-to-bottom through packed column panels (which are
// row-stored) is not yet supported.
if ( bli_obj_is_row_stored( *obj ) )
if ( bli_obj_is_row_packed( *obj ) )
{
bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED );
}
@@ -130,7 +130,7 @@ void bli_packm_acquire_mpart_l2r( subpart_t requested_part,
// Partitioning left-to-right through packed row panels (which are
// column-stored) is not yet supported.
if ( bli_obj_is_col_stored( *obj ) )
if ( bli_obj_is_col_packed( *obj ) )
{
bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED );
}

View File

@@ -581,19 +581,20 @@ bli_obj_width_stored( obj )
\
( bli_abs( bli_obj_col_stride( obj ) ) )
//
// NOTE: The following two macros differ from their non-obj counterparts
// in that they do not identify m x 1 and 1 x n objects as column-stored
// and row-stored, respectively, which is needed when considering packed
// objects. But this is okay, since none of the invocations of these
// "obj" macros are used on packed matrices.
//
#define bli_obj_is_row_stored( obj ) \
\
( bli_obj_col_stride_mag( obj ) == 1 && \
( bli_obj_row_stride_mag( obj ) > 1 || \
bli_obj_width( obj ) == 1 ) \
)
( bli_obj_col_stride_mag( obj ) == 1 )
#define bli_obj_is_col_stored( obj ) \
\
( bli_obj_row_stride_mag( obj ) == 1 && \
( bli_obj_col_stride_mag( obj ) > 1 || \
bli_obj_length( obj ) == 1 ) \
)
( bli_obj_row_stride_mag( obj ) == 1 )
#define bli_obj_is_gen_stored( obj ) \
\