Fixing function pointer issues with thread decorator

This commit is contained in:
Tyler Smith
2014-03-18 15:23:09 -05:00
parent ec8b88f935
commit aa2405f8b2
3 changed files with 10 additions and 8 deletions

View File

@@ -79,7 +79,7 @@ void bli_gemm_front( obj_t* alpha,
// Invoke the internal back-end.
bli_level3_thread_decorator( n_threads,
(level3_int_t*) bli_gemm_int,
(level3_int_t) bli_gemm_int,
alpha,
&a_local,
&b_local,

View File

@@ -233,7 +233,7 @@ void bli_get_range_tri_weighted( void* thr, dim_t size, dim_t block_factor, bool
}
void bli_level3_thread_decorator( dim_t n_threads,
level3_int_t* func,
level3_int_t func,
obj_t* alpha,
obj_t* a,
obj_t* b,
@@ -242,16 +242,18 @@ void bli_level3_thread_decorator( dim_t n_threads,
void* cntl,
void** thread )
{
_Pragma( "omp parallel num_threads(n_threads)" )
//_Pragma( "omp parallel num_threads(n_threads)" )
{
dim_t omp_id = omp_get_thread_num();
// dim_t omp_id = omp_get_thread_num();
(*func) ( alpha,
func( alpha,
// bli_gemm_int ( alpha,
a,
b,
beta,
c,
cntl,
thread[omp_id] );
(gemm_t*)cntl,
// thread[omp_id] );
(gemm_thrinfo_t*)thread[0] );
}
}

View File

@@ -101,7 +101,7 @@ void bli_setup_thread_info( thrinfo_t* thread, thread_comm_t* ocomm, dim_t ocomm
typedef void (*level3_int_t) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, void* cntl, void* thread );
void bli_level3_thread_decorator( dim_t num_threads,
level3_int_t* func,
level3_int_t func,
obj_t* alpha,
obj_t* a,
obj_t* b,