Added missing conjbeta argument to scald.

This commit is contained in:
Field G. Van Zee
2013-03-19 18:07:40 -05:00
parent 1f82b51d06
commit bba38cf4e9
5 changed files with 17 additions and 4 deletions

View File

@@ -62,6 +62,7 @@ void bl2_scalv_unb_var1( obj_t* beta,
num_t dt_x = bl2_obj_datatype( *x );
conj_t conjbeta = bl2_obj_conj_status( *beta );
dim_t n = bl2_obj_vector_dim( *x );
inc_t inc_x = bl2_obj_vector_inc( *x );

View File

@@ -52,6 +52,7 @@ void bl2_scald( obj_t* beta,
#define GENTFUNC( ctype, ch, opname, varname ) \
\
void PASTEMAC(ch,opname)( \
conj_t conjbeta, \
doff_t diagoffx, \
dim_t m, \
dim_t n, \
@@ -59,7 +60,8 @@ void PASTEMAC(ch,opname)( \
ctype* x, inc_t rs_x, inc_t cs_x \
) \
{ \
PASTEMAC2(ch,ch,varname)( diagoffx, \
PASTEMAC2(ch,ch,varname)( conjbeta, \
diagoffx, \
m, \
n, \
beta, \
@@ -76,6 +78,7 @@ INSERT_GENTFUNC_BASIC( scald, scald_unb_var1 )
#define GENTFUNC2( ctype_b, ctype_x, chb, chx, opname, varname ) \
\
void PASTEMAC2(chb,chx,opname)( \
conj_t conjbeta, \
doff_t diagoffx, \
dim_t m, \
dim_t n, \
@@ -83,7 +86,8 @@ void PASTEMAC2(chb,chx,opname)( \
ctype_x* x, inc_t rs_x, inc_t cs_x \
) \
{ \
PASTEMAC2(chb,chx,varname)( diagoffx, \
PASTEMAC2(chb,chx,varname)( conjbeta, \
diagoffx, \
m, \
n, \
beta, \

View File

@@ -49,6 +49,7 @@ void bl2_scald( obj_t* beta,
#define GENTPROT( ctype, ch, opname ) \
\
void PASTEMAC(ch,opname)( \
conj_t conjbeta, \
doff_t diagoffx, \
dim_t m, \
dim_t n, \
@@ -66,6 +67,7 @@ INSERT_GENTPROT_BASIC( scald )
#define GENTPROT2( ctype_b, ctype_x, chb, chx, opname ) \
\
void PASTEMAC2(chb,chx,opname)( \
conj_t conjbeta, \
doff_t diagoff, \
dim_t m, \
dim_t n, \

View File

@@ -37,6 +37,7 @@
#define FUNCPTR_T scald_fp
typedef void (*FUNCPTR_T)(
conj_t conjbeta,
doff_t diagoffx,
dim_t m,
dim_t n,
@@ -62,6 +63,8 @@ void bl2_scald_unb_var1( obj_t* beta,
{
num_t dt_x = bl2_obj_datatype( *x );
conj_t conjbeta = bl2_obj_conj_status( *beta );
doff_t diagoffx = bl2_obj_diag_offset( *x );
dim_t m = bl2_obj_length( *x );
@@ -86,7 +89,8 @@ void bl2_scald_unb_var1( obj_t* beta,
f = ftypes[dt_beta][dt_x];
// Invoke the function.
f( diagoffx,
f( conjbeta,
diagoffx,
m,
n,
buf_beta,
@@ -98,6 +102,7 @@ void bl2_scald_unb_var1( obj_t* beta,
#define GENTFUNC2( ctype_b, ctype_x, chb, chx, varname, kername ) \
\
void PASTEMAC2(chb,chx,varname)( \
conj_t conjbeta, \
doff_t diagoffx, \
dim_t m, \
dim_t n, \
@@ -127,7 +132,7 @@ void PASTEMAC2(chb,chx,varname)( \
\
x1 = x_cast + offx; \
\
PASTEMAC2(chb,chx,kername)( BLIS_NO_CONJUGATE, \
PASTEMAC2(chb,chx,kername)( conjbeta, \
n_elem, \
beta_cast, \
x1, incx ); \

View File

@@ -40,6 +40,7 @@ void bl2_scald_unb_var1( obj_t* beta,
#define GENTPROT2( ctype_b, ctype_x, chb, chx, varname ) \
\
void PASTEMAC2(chb,chx,varname)( \
conj_t conjbeta, \
doff_t diagoffx, \
dim_t m, \
dim_t n, \