Fixed syntax artifacts from 4b36e85 in examples.

Details:
- Fixed artifacts of malformed recursive sed expressions used when
  preparing 4b36e85, in which most function-like macros were converted
  to static functions. The syntactically defective code was contained
  entirely in examples/oapi. Thanks to Tony Skjellum for reporting this
  issue.
- Update to CREDITS file.
This commit is contained in:
Field G. Van Zee
2018-06-03 13:20:37 -05:00
parent 469727d4f8
commit d7fb326820
7 changed files with 30 additions and 29 deletions

View File

@@ -122,7 +122,7 @@ int main( int argc, char** argv )
// Let's inspect the amount of padding inserted for alignment. Note
// the difference between the m dimension and the column stride.
printf( "datatype %s\n", bli_dt_string( bli_obj_dt( &a8 ) ) );
printf( "datatype size %d bytes\n", bli_dt_size( bli_obj_dt( &a8 ) ) );
printf( "datatype size %d bytes\n", ( int )bli_dt_size( bli_obj_dt( &a8 ) ) );
printf( "m dim (# of rows): %d\n", ( int )bli_obj_length( &a8 ) );
printf( "n dim (# of cols): %d\n", ( int )bli_obj_width( &a8 ) );
printf( "row stride: %d\n", ( int )bli_obj_row_stride( &a8 ) );
@@ -140,7 +140,7 @@ int main( int argc, char** argv )
bli_obj_create( BLIS_DCOMPLEX, 3, 5, 0, 0, &a11 );
printf( "datatype %s\n", bli_dt_string( bli_obj_dt( &a9 ) ) );
printf( "datatype size %d bytes\n", bli_dt_size( bli_obj_dt( &a9 ) ) );
printf( "datatype size %d bytes\n", ( int )bli_dt_size( bli_obj_dt( &a9 ) ) );
printf( "m dim (# of rows): %d\n", ( int )bli_obj_length( &a9 ) );
printf( "n dim (# of cols): %d\n", ( int )bli_obj_width( &a9 ) );
printf( "row stride: %d\n", ( int )bli_obj_row_stride( &a9 ) );
@@ -148,7 +148,7 @@ int main( int argc, char** argv )
printf( "\n" );
printf( "datatype %s\n", bli_dt_string( bli_obj_dt( &a10 ) ) );
printf( "datatype size %d bytes\n", bli_dt_size( bli_obj_dt( &a10 ) ) );
printf( "datatype size %d bytes\n", ( int )bli_dt_size( bli_obj_dt( &a10 ) ) );
printf( "m dim (# of rows): %d\n", ( int )bli_obj_length( &a10 ) );
printf( "n dim (# of cols): %d\n", ( int )bli_obj_width( &a10 ) );
printf( "row stride: %d\n", ( int )bli_obj_row_stride( &a10 ) );
@@ -156,7 +156,7 @@ int main( int argc, char** argv )
printf( "\n" );
printf( "datatype %s\n", bli_dt_string( bli_obj_dt( &a11 ) ) );
printf( "datatype size %d bytes\n", bli_dt_size( bli_obj_dt( &a11 ) ) );
printf( "datatype size %d bytes\n", ( int )bli_dt_size( bli_obj_dt( &a11 ) ) );
printf( "m dim (# of rows): %d\n", ( int )bli_obj_length( &a11 ) );
printf( "n dim (# of cols): %d\n", ( int )bli_obj_width( &a11 ) );
printf( "row stride: %d\n", ( int )bli_obj_row_stride( &a11 ) );

View File

@@ -83,18 +83,18 @@ int main( int argc, char** argv )
bli_getijm( i, j, &a1, &alpha_r, &alpha_i );
// Here, we print out the element "returned" by bli_getijm().
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", i, j, alpha_r, alpha_i );
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", ( int )i, ( int )j, alpha_r, alpha_i );
// Let's query a few more elements.
i = 0; j = 2;
bli_getijm( i, j, &a1, &alpha_r, &alpha_i );
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", i, j, alpha_r, alpha_i );
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", ( int )i, ( int )j, alpha_r, alpha_i );
i = 3; j = 4;
bli_getijm( i, j, &a1, &alpha_r, &alpha_i );
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", i, j, alpha_r, alpha_i );
printf( "element (%2d,%2d) of matrix 'a1' (real + imag): %5.1f + %5.1f\n", ( int )i, ( int )j, alpha_r, alpha_i );
printf( "\n" );
@@ -224,8 +224,8 @@ void init_dmatrix_by_cols( dim_t m, dim_t n, double* a, inc_t rs, inc_t cs )
void init_dobj_by_cols( obj_t* a )
{
dim_t m = bli_obj_length( *a );
dim_t n = bli_obj_width( *a );
dim_t m = bli_obj_length( a );
dim_t n = bli_obj_width( a );
dim_t i, j;
double alpha = 0.0;
@@ -245,8 +245,8 @@ void init_dobj_by_cols( obj_t* a )
void init_zobj_by_cols( obj_t* a )
{
dim_t m = bli_obj_length( *a );
dim_t n = bli_obj_width( *a );
dim_t m = bli_obj_length( a );
dim_t n = bli_obj_width( a );
dim_t i, j;
double alpha = 0.0;

View File

@@ -59,7 +59,7 @@ int main( int argc, char** argv )
bli_obj_create( dt, m, n, rs, cs, &a );
// First, we mark the matrix structure as triangular.
bli_obj_set_struc( BLIS_TRIANGULAR, &a )
bli_obj_set_struc( BLIS_TRIANGULAR, &a );
// Next, we specify whether the lower part or the upper part is to be
// recognized as the "stored" region (which we call the uplo field). The
@@ -89,7 +89,7 @@ int main( int argc, char** argv )
bli_obj_create( dt, m, n, rs, cs, &b );
// Set structure and uplo.
bli_obj_set_struc( BLIS_TRIANGULAR, &b )
bli_obj_set_struc( BLIS_TRIANGULAR, &b );
bli_obj_set_uplo( BLIS_UPPER, &b );
// Create an alias, 'bl', of the original object 'b'. Both objects will
@@ -245,7 +245,7 @@ int main( int argc, char** argv )
bli_obj_alias_to( &e, &el );
// Set structure and uplo of 'el'.
bli_obj_set_struc( BLIS_TRIANGULAR, &el )
bli_obj_set_struc( BLIS_TRIANGULAR, &el );
bli_obj_set_uplo( BLIS_LOWER, &el );
// Digression: Notice that "triangular" structure does not require that
@@ -290,7 +290,7 @@ int main( int argc, char** argv )
bli_obj_set_diag_offset( -1, &h );
// Set the structure and uplo of 'h'.
bli_obj_set_struc( BLIS_TRIANGULAR, &h )
bli_obj_set_struc( BLIS_TRIANGULAR, &h );
bli_obj_set_uplo( BLIS_UPPER, &h );
// Randomize the elements on and above the first subdiagonal.

View File

@@ -157,7 +157,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as symmetric and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_SYMMETRIC, &a )
bli_obj_set_struc( BLIS_SYMMETRIC, &a );
bli_obj_set_uplo( BLIS_LOWER, &a );
bli_randm( &a );
@@ -200,7 +200,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as symmetric and stored in the upper triangle, and
// then randomize that upper triangle.
bli_obj_set_struc( BLIS_SYMMETRIC, &a )
bli_obj_set_struc( BLIS_SYMMETRIC, &a );
bli_obj_set_uplo( BLIS_UPPER, &a );
bli_randm( &a );
@@ -242,7 +242,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as triangular and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_TRIANGULAR, &a )
bli_obj_set_struc( BLIS_TRIANGULAR, &a );
bli_obj_set_uplo( BLIS_LOWER, &a );
bli_randm( &a );
@@ -283,7 +283,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as triangular and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_TRIANGULAR, &a )
bli_obj_set_struc( BLIS_TRIANGULAR, &a );
bli_obj_set_uplo( BLIS_LOWER, &a );
bli_randm( &a );

View File

@@ -148,7 +148,7 @@ int main( int argc, char** argv )
// Mark matrix 'c' as symmetric and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_SYMMETRIC, &c )
bli_obj_set_struc( BLIS_SYMMETRIC, &c );
bli_obj_set_uplo( BLIS_LOWER, &c );
bli_randm( &c );
@@ -194,7 +194,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as symmetric and stored in the upper triangle, and
// then randomize that upper triangle.
bli_obj_set_struc( BLIS_SYMMETRIC, &a )
bli_obj_set_struc( BLIS_SYMMETRIC, &a );
bli_obj_set_uplo( BLIS_UPPER, &a );
bli_randm( &a );
@@ -241,7 +241,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as triangular and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_TRIANGULAR, &a )
bli_obj_set_struc( BLIS_TRIANGULAR, &a );
bli_obj_set_uplo( BLIS_LOWER, &a );
bli_randm( &a );
@@ -286,7 +286,7 @@ int main( int argc, char** argv )
// Mark matrix 'a' as triangular and stored in the lower triangle, and
// then randomize that lower triangle.
bli_obj_set_struc( BLIS_TRIANGULAR, &a )
bli_obj_set_struc( BLIS_TRIANGULAR, &a );
bli_obj_set_uplo( BLIS_LOWER, &a );
bli_randm( &a );

View File

@@ -147,7 +147,7 @@ int main( int argc, char** argv )
bli_setm( &BLIS_MINUS_ONE, &c );
// Set the structure and uplo of 'c'.
bli_obj_set_struc( BLIS_SYMMETRIC, &c )
bli_obj_set_struc( BLIS_SYMMETRIC, &c );
bli_obj_set_uplo( BLIS_LOWER, &c );
// Randomize the lower triangle of 'c'.
@@ -170,7 +170,7 @@ int main( int argc, char** argv )
// Initialize all of 'd' to -1.0 to simulate junk values.
bli_setm( &BLIS_MINUS_ONE, &d );
bli_obj_set_struc( BLIS_HERMITIAN, &d )
bli_obj_set_struc( BLIS_HERMITIAN, &d );
bli_obj_set_uplo( BLIS_LOWER, &d );
// Randomize the lower triangle of 'd'.
@@ -185,7 +185,7 @@ int main( int argc, char** argv )
bli_printm( "d (after mkherm):", &d, "%4.1f", "" );
// Set the structure and uplo of 'd'.
bli_obj_set_struc( BLIS_HERMITIAN, &d )
bli_obj_set_struc( BLIS_HERMITIAN, &d );
bli_obj_set_uplo( BLIS_LOWER, &d );
//
@@ -203,7 +203,7 @@ int main( int argc, char** argv )
bli_setm( &BLIS_MINUS_ONE, &e );
// Set the structure and uplo of 'e'.
bli_obj_set_struc( BLIS_SYMMETRIC, &e )
bli_obj_set_struc( BLIS_SYMMETRIC, &e );
bli_obj_set_uplo( BLIS_UPPER, &e );
// Randomize the upper triangle of 'e'.
@@ -221,7 +221,7 @@ int main( int argc, char** argv )
bli_setm( &BLIS_MINUS_ONE, &f );
// Set the structure and uplo of 'f'.
bli_obj_set_struc( BLIS_HERMITIAN, &f )
bli_obj_set_struc( BLIS_HERMITIAN, &f );
bli_obj_set_uplo( BLIS_UPPER, &f );
// Randomize the upper triangle of 'f'.
@@ -249,7 +249,7 @@ int main( int argc, char** argv )
bli_setm( &BLIS_MINUS_ONE, &g );
// Set the structure and uplo of 'g'.
bli_obj_set_struc( BLIS_TRIANGULAR, &g )
bli_obj_set_struc( BLIS_TRIANGULAR, &g );
bli_obj_set_uplo( BLIS_LOWER, &g );
// Randomize the lower triangle of 'g'.