diff --git a/frame/3/gemm/bli_gemm_threading.c b/frame/3/gemm/bli_gemm_threading.c index b0d28c8c5..627df7f9a 100644 --- a/frame/3/gemm/bli_gemm_threading.c +++ b/frame/3/gemm/bli_gemm_threading.c @@ -172,8 +172,8 @@ gemm_thrinfo_t* bli_create_gemm_thrinfo_paths( ) gemm_thrinfo_t* jc_info = &paths[global_comm_id]; bli_setup_gemm_thrinfo_node( jc_info, global_comm, global_comm_id, - jr_comm, jr_comm_id, - jr_way, a, + jc_comm, jc_comm_id, + jc_way, a, NULL, NULL, kc_info); } } diff --git a/frame/3/herk/bli_herk_blk_var2f.c b/frame/3/herk/bli_herk_blk_var2f.c index a92888288..a1fba63f4 100644 --- a/frame/3/herk/bli_herk_blk_var2f.c +++ b/frame/3/herk/bli_herk_blk_var2f.c @@ -81,9 +81,9 @@ void bli_herk_blk_var2f( obj_t* a, c1S_pack = thread_ibroadcast( thread, &c1S_pack_s ); // Pack A (if instructed). - bli_packm_int( a, &a_pack, + bli_packm_int( a, a_pack, cntl_sub_packm_a( cntl ), - hemm_thread_sub_opackm( thread ) ); + herk_thread_sub_opackm( thread ) ); // Query dimension in partitioning direction. n_trans = bli_obj_width_after_trans( *c ); diff --git a/frame/3/herk/bli_herk_blk_var3f.c b/frame/3/herk/bli_herk_blk_var3f.c index 61ca8c7de..78e3cd30e 100644 --- a/frame/3/herk/bli_herk_blk_var3f.c +++ b/frame/3/herk/bli_herk_blk_var3f.c @@ -101,6 +101,7 @@ void bli_herk_blk_var3f( obj_t* a, bli_packm_init( &ah1, ah1_pack, cntl_sub_packm_b( cntl ) ); } + thread_ibarrier( thread ); // Pack A1 (if instructed). bli_packm_int( &a1, a1_pack, diff --git a/frame/3/herk/bli_herk_front.c b/frame/3/herk/bli_herk_front.c index ff6a18252..19a033a57 100644 --- a/frame/3/herk/bli_herk_front.c +++ b/frame/3/herk/bli_herk_front.c @@ -77,7 +77,7 @@ void bli_herk_front( obj_t* alpha, bli_obj_induce_trans( c_local ); } - herk_thrinfo_t* infos = bli_herk_cntl_get_thrinfos(); + herk_thrinfo_t* infos = bli_create_herk_thrinfo_paths(); dim_t n_threads = thread_num_threads( (&infos[0]) ); // Invoke the internal back-end. diff --git a/frame/3/herk/bli_herk_threading.c b/frame/3/herk/bli_herk_threading.c index ca652f196..ec6c9d31c 100644 --- a/frame/3/herk/bli_herk_threading.c +++ b/frame/3/herk/bli_herk_threading.c @@ -84,17 +84,6 @@ herk_thrinfo_t* bli_create_herk_thrinfo_node( thread_comm_t* ocomm, dim_t ocomm_ return thread; } -dim_t read_env( char* env ) -{ - dim_t number = 1; - char* str = getenv( env ); - if( str != NULL ) - { - number = strtol( str, NULL, 10 ); - } - return number; -} - void bli_herk_thrinfo_free_paths( herk_thrinfo_t* threads ) { } @@ -172,8 +161,8 @@ herk_thrinfo_t* bli_create_herk_thrinfo_paths( ) herk_thrinfo_t* jc_info = &paths[global_comm_id]; bli_setup_herk_thrinfo_node( jc_info, global_comm, global_comm_id, - jr_comm, jr_comm_id, - jr_way, a, + jc_comm, jc_comm_id, + jc_way, a, NULL, NULL, kc_info); } }