From 670b63926a7f4fc694abc5b1582ef8a4f367f5a8 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Sun, 24 Aug 2014 10:46:27 -0500 Subject: [PATCH] Added whitespace to bli_obj_scalar_ routine calls. Details: - Added extra spaces to align arguments of bli_obj_scalar_init_detached_copy_of(). This misalignment was due to the fact that the function was previously named bli_obj_init_scalar_copy_of() and the name change, performed in b444489f, was done via recursive sed commands which left subsequent lines untouched. --- frame/1/axpyv/bli_axpyv.c | 6 +++--- frame/1/scal2v/bli_scal2v.c | 6 +++--- frame/1/scalv/bli_scalv.c | 6 +++--- frame/1/setv/bli_setv.c | 6 +++--- frame/1d/axpyd/bli_axpyd.c | 6 +++--- frame/1d/scal2d/bli_scal2d.c | 6 +++--- frame/1d/scald/bli_scald.c | 6 +++--- frame/1d/setd/bli_setd.c | 6 +++--- frame/1d/setid/bli_setid.c | 6 +++--- frame/1m/axpym/bli_axpym.c | 6 +++--- frame/1m/scal2m/bli_scal2m.c | 6 +++--- frame/1m/setm/bli_setm.c | 6 +++--- frame/2/gemv/bli_gemv.c | 12 ++++++------ frame/2/ger/bli_ger.c | 6 +++--- frame/2/ger/bli_ger_int.c | 6 +++--- frame/2/hemv/bli_hemv.c | 12 ++++++------ frame/2/her/bli_her.c | 6 +++--- frame/2/her2/bli_her2.c | 12 ++++++------ frame/2/her2/bli_her2_int.c | 12 ++++++------ frame/2/symv/bli_symv.c | 12 ++++++------ frame/2/syr/bli_syr.c | 6 +++--- frame/2/syr2/bli_syr2.c | 6 +++--- frame/2/trmv/bli_trmv.c | 6 +++--- frame/2/trsv/bli_trsv.c | 6 +++--- 24 files changed, 87 insertions(+), 87 deletions(-) diff --git a/frame/1/axpyv/bli_axpyv.c b/frame/1/axpyv/bli_axpyv.c index e5e2272de..48b4db337 100644 --- a/frame/1/axpyv/bli_axpyv.c +++ b/frame/1/axpyv/bli_axpyv.c @@ -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, \ diff --git a/frame/1/scal2v/bli_scal2v.c b/frame/1/scal2v/bli_scal2v.c index 6d0188f69..3a1f0c11d 100644 --- a/frame/1/scal2v/bli_scal2v.c +++ b/frame/1/scal2v/bli_scal2v.c @@ -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, \ diff --git a/frame/1/scalv/bli_scalv.c b/frame/1/scalv/bli_scalv.c index 0c2403817..4c8623918 100644 --- a/frame/1/scalv/bli_scalv.c +++ b/frame/1/scalv/bli_scalv.c @@ -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 ); \ diff --git a/frame/1/setv/bli_setv.c b/frame/1/setv/bli_setv.c index 9e734f87c..9f37076d8 100644 --- a/frame/1/setv/bli_setv.c +++ b/frame/1/setv/bli_setv.c @@ -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 ); \ diff --git a/frame/1d/axpyd/bli_axpyd.c b/frame/1d/axpyd/bli_axpyd.c index dd689cbd2..05112f29b 100644 --- a/frame/1d/axpyd/bli_axpyd.c +++ b/frame/1d/axpyd/bli_axpyd.c @@ -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, diff --git a/frame/1d/scal2d/bli_scal2d.c b/frame/1d/scal2d/bli_scal2d.c index 677534f38..85afc85cd 100644 --- a/frame/1d/scal2d/bli_scal2d.c +++ b/frame/1d/scal2d/bli_scal2d.c @@ -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, diff --git a/frame/1d/scald/bli_scald.c b/frame/1d/scald/bli_scald.c index 508fce2d9..9ae417650 100644 --- a/frame/1d/scald/bli_scald.c +++ b/frame/1d/scald/bli_scald.c @@ -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 ); diff --git a/frame/1d/setd/bli_setd.c b/frame/1d/setd/bli_setd.c index 6414636c1..53c73528f 100644 --- a/frame/1d/setd/bli_setd.c +++ b/frame/1d/setd/bli_setd.c @@ -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 ); diff --git a/frame/1d/setid/bli_setid.c b/frame/1d/setid/bli_setid.c index c87a605e5..9bb06ad7d 100644 --- a/frame/1d/setid/bli_setid.c +++ b/frame/1d/setid/bli_setid.c @@ -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 ); diff --git a/frame/1m/axpym/bli_axpym.c b/frame/1m/axpym/bli_axpym.c index e5e1d268b..7beed0b68 100644 --- a/frame/1m/axpym/bli_axpym.c +++ b/frame/1m/axpym/bli_axpym.c @@ -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, diff --git a/frame/1m/scal2m/bli_scal2m.c b/frame/1m/scal2m/bli_scal2m.c index 866799a71..57510ff86 100644 --- a/frame/1m/scal2m/bli_scal2m.c +++ b/frame/1m/scal2m/bli_scal2m.c @@ -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, diff --git a/frame/1m/setm/bli_setm.c b/frame/1m/setm/bli_setm.c index dce8ef6ca..42f18cc12 100644 --- a/frame/1m/setm/bli_setm.c +++ b/frame/1m/setm/bli_setm.c @@ -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 ); } diff --git a/frame/2/gemv/bli_gemv.c b/frame/2/gemv/bli_gemv.c index 7f91b4a10..dec86fa40 100644 --- a/frame/2/gemv/bli_gemv.c +++ b/frame/2/gemv/bli_gemv.c @@ -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 diff --git a/frame/2/ger/bli_ger.c b/frame/2/ger/bli_ger.c index 7b2268563..c03b8358e 100644 --- a/frame/2/ger/bli_ger.c +++ b/frame/2/ger/bli_ger.c @@ -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 diff --git a/frame/2/ger/bli_ger_int.c b/frame/2/ger/bli_ger_int.c index 1a9d32374..4367e9ff8 100644 --- a/frame/2/ger/bli_ger_int.c +++ b/frame/2/ger/bli_ger_int.c @@ -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 { diff --git a/frame/2/hemv/bli_hemv.c b/frame/2/hemv/bli_hemv.c index 60dea313e..d75b14639 100644 --- a/frame/2/hemv/bli_hemv.c +++ b/frame/2/hemv/bli_hemv.c @@ -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 diff --git a/frame/2/her/bli_her.c b/frame/2/her/bli_her.c index c23b10896..3add15163 100644 --- a/frame/2/her/bli_her.c +++ b/frame/2/her/bli_her.c @@ -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 diff --git a/frame/2/her2/bli_her2.c b/frame/2/her2/bli_her2.c index 15703aaeb..d90ad6ced 100644 --- a/frame/2/her2/bli_her2.c +++ b/frame/2/her2/bli_her2.c @@ -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 diff --git a/frame/2/her2/bli_her2_int.c b/frame/2/her2/bli_her2_int.c index 16e4df8de..11078d44e 100644 --- a/frame/2/her2/bli_her2_int.c +++ b/frame/2/her2/bli_her2_int.c @@ -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 { diff --git a/frame/2/symv/bli_symv.c b/frame/2/symv/bli_symv.c index c78838215..9411996db 100644 --- a/frame/2/symv/bli_symv.c +++ b/frame/2/symv/bli_symv.c @@ -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 diff --git a/frame/2/syr/bli_syr.c b/frame/2/syr/bli_syr.c index 667715a59..0242dfaca 100644 --- a/frame/2/syr/bli_syr.c +++ b/frame/2/syr/bli_syr.c @@ -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 diff --git a/frame/2/syr2/bli_syr2.c b/frame/2/syr2/bli_syr2.c index a23162fb5..56e161f24 100644 --- a/frame/2/syr2/bli_syr2.c +++ b/frame/2/syr2/bli_syr2.c @@ -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 diff --git a/frame/2/trmv/bli_trmv.c b/frame/2/trmv/bli_trmv.c index e47f4c061..1009e4616 100644 --- a/frame/2/trmv/bli_trmv.c +++ b/frame/2/trmv/bli_trmv.c @@ -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 diff --git a/frame/2/trsv/bli_trsv.c b/frame/2/trsv/bli_trsv.c index f86f7a57b..ac393926e 100644 --- a/frame/2/trsv/bli_trsv.c +++ b/frame/2/trsv/bli_trsv.c @@ -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