Merge branch 'master' of github.com:flame/blis

This commit is contained in:
Field G. Van Zee
2014-08-24 10:54:21 -05:00
24 changed files with 87 additions and 87 deletions

View File

@@ -59,9 +59,9 @@ void PASTEMAC0(opname)( \
\
/* Create an object to hold a copy-cast of alpha. */ \
bli_obj_scalar_init_detached_copy_of( dt_x, \
BLIS_NO_CONJUGATE, \
alpha, \
&alpha_local ); \
BLIS_NO_CONJUGATE, \
alpha, \
&alpha_local ); \
\
PASTEMAC0(varname)( &alpha_local, \
x, \

View File

@@ -59,9 +59,9 @@ void PASTEMAC0(opname)( \
\
/* Create an object to hold a copy-cast of beta. */ \
bli_obj_scalar_init_detached_copy_of( dt_x, \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
\
PASTEMAC0(varname)( &beta_local, \
x, \

View File

@@ -58,9 +58,9 @@ void PASTEMAC0(opname)( \
\
/* Create an object to hold a copy-cast of beta. */ \
bli_obj_scalar_init_detached_copy_of( dt_x, \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
\
PASTEMAC0(varname)( &beta_local, \
x ); \

View File

@@ -59,9 +59,9 @@ void PASTEMAC0(opname)( \
\
/* Create an object to hold a copy-cast of beta. */ \
bli_obj_scalar_init_detached_copy_of( dt_x, \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
BLIS_NO_CONJUGATE, \
beta, \
&beta_local ); \
\
PASTEMAC0(varname)( &beta_local, \
x ); \

View File

@@ -54,9 +54,9 @@ void bli_axpyd( obj_t* alpha,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
bli_axpyd_unb_var1( &alpha_local,
x,

View File

@@ -54,9 +54,9 @@ void bli_scal2d( obj_t* beta,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_scal2d_unb_var1( &beta_local,
x,

View File

@@ -53,9 +53,9 @@ void bli_scald( obj_t* beta,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_scald_unb_var1( &beta_local,
x );

View File

@@ -53,9 +53,9 @@ void bli_setd( obj_t* beta,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_setd_unb_var1( &beta_local,
x );

View File

@@ -54,9 +54,9 @@ void bli_setid( obj_t* beta,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_xr,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_setid_unb_var1( &beta_local,
x );

View File

@@ -54,9 +54,9 @@ void bli_axpym( obj_t* alpha,
// Create an object to hold a copy-cast of alpha.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
bli_axpym_unb_var1( &alpha_local,
x,

View File

@@ -54,9 +54,9 @@ void bli_scal2m( obj_t* beta,
// Create an object to hold a copy-cast of beta.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_scal2m_unb_var1( &beta_local,
x,

View File

@@ -53,9 +53,9 @@ void bli_setm( obj_t* beta,
// Create an object to hold a copy-cast of beta.
bli_obj_scalar_init_detached_copy_of( dt_x,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
bli_setm_unb_var1( &beta_local, x );
}

View File

@@ -79,9 +79,9 @@ void bli_gemv( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_a, dt_targ_x );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// Create an object to hold a copy-cast of beta. Notice that we use
// the datatype of y. Here's why: If y is real and beta is complex,
@@ -90,9 +90,9 @@ void bli_gemv( obj_t* alpha,
// beta is real then beta is harmlessly promoted to complex.
dt_beta = dt_targ_y;
bli_obj_scalar_init_detached_copy_of( dt_beta,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -76,9 +76,9 @@ void bli_ger( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_x, dt_targ_y );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -93,9 +93,9 @@ void bli_ger_int( conj_t conjx,
bli_obj_toggle_conj( y_local );
bli_obj_scalar_init_detached_copy_of( bli_obj_datatype( *alpha ),
BLIS_CONJUGATE,
alpha,
&alpha_local );
BLIS_CONJUGATE,
alpha,
&alpha_local );
}
else
{

View File

@@ -79,9 +79,9 @@ void bli_hemv( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_a, dt_targ_x );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// Create an object to hold a copy-cast of beta. Notice that we use
// the datatype of y. Here's why: If y is real and beta is complex,
@@ -90,9 +90,9 @@ void bli_hemv( obj_t* alpha,
// beta is real then beta is harmlessly promoted to complex.
dt_beta = dt_targ_y;
bli_obj_scalar_init_detached_copy_of( dt_beta,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -69,9 +69,9 @@ void bli_her( obj_t* alpha,
// Create object to hold a copy-cast of alpha.
dt_alpha = dt_targ_x;
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -76,15 +76,15 @@ void bli_her2( obj_t* alpha,
// the type union of the datatypes of x and y.
dt_alpha = bli_datatype_union( dt_targ_x, dt_targ_y );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// Also create a conjugated copy of alpha.
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_CONJUGATE,
alpha,
&alpha_conj_local );
BLIS_CONJUGATE,
alpha,
&alpha_conj_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -94,13 +94,13 @@ void bli_her2_int( conj_t conjh,
bli_obj_toggle_conj( y_local );
bli_obj_scalar_init_detached_copy_of( bli_obj_datatype( *alpha ),
BLIS_CONJUGATE,
alpha,
&alpha_local );
BLIS_CONJUGATE,
alpha,
&alpha_local );
bli_obj_scalar_init_detached_copy_of( bli_obj_datatype( *alpha_conj ),
BLIS_CONJUGATE,
alpha_conj,
&alpha_conj_local );
BLIS_CONJUGATE,
alpha_conj,
&alpha_conj_local );
}
else
{

View File

@@ -79,9 +79,9 @@ void bli_symv( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_a, dt_targ_x );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// Create an object to hold a copy-cast of beta. Notice that we use
// the datatype of y. Here's why: If y is real and beta is complex,
@@ -90,9 +90,9 @@ void bli_symv( obj_t* alpha,
// beta is real then beta is harmlessly promoted to complex.
dt_beta = dt_targ_y;
bli_obj_scalar_init_detached_copy_of( dt_beta,
BLIS_NO_CONJUGATE,
beta,
&beta_local );
BLIS_NO_CONJUGATE,
beta,
&beta_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -71,9 +71,9 @@ void bli_syr( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_x, dt_targ_c );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -75,9 +75,9 @@ void bli_syr2( obj_t* alpha,
// the type union of the datatypes of x and y.
dt_alpha = bli_datatype_union( dt_targ_x, dt_targ_y );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -71,9 +71,9 @@ void bli_trmv( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_a, dt_targ_x );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling

View File

@@ -71,9 +71,9 @@ void bli_trsv( obj_t* alpha,
// unnecessary loss of information during the computation.
dt_alpha = bli_datatype_union( dt_targ_a, dt_targ_x );
bli_obj_scalar_init_detached_copy_of( dt_alpha,
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
BLIS_NO_CONJUGATE,
alpha,
&alpha_local );
// If all operands have unit stride, we choose a control tree for calling