From 4883ecba7b31f0a9d9561c6628ff3d1b4530e94d Mon Sep 17 00:00:00 2001 From: Aurelien Bouteiller Date: Thu, 2 Jan 2025 12:10:09 -0500 Subject: [PATCH] flow_info/flow_span: Update for icldisco/parsec#694 --- src/cuda/lapack_cuda_stage_in.c | 8 ++++---- src/utils/dplasma_lapack_adtt.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cuda/lapack_cuda_stage_in.c b/src/cuda/lapack_cuda_stage_in.c index f2f48ced..5cb0a210 100644 --- a/src/cuda/lapack_cuda_stage_in.c +++ b/src/cuda/lapack_cuda_stage_in.c @@ -33,14 +33,14 @@ dplasma_cuda_lapack_stage_in(parsec_gpu_task_t *gtask, if(flow_mask & (1U << i)){ copy_in = task->data[i].data_in; copy_out = task->data[i].data_out; - ddc = (dplasma_data_collection_t*)gtask->flow_dc[i]; + ddc = (dplasma_data_collection_t*)gtask->flow_info[i].flow_dc; assert(ddc != NULL); elem_sz = parsec_datadist_getsizeoftype(ddc->dc_original->mtype); in_elem_dev = (parsec_device_gpu_module_t*)parsec_mca_device_get( copy_in->device_index); if( (in_elem_dev->super.type == PARSEC_DEV_CUDA) || (ddc->dc_original->storage != PARSEC_MATRIX_LAPACK)){ ret = (cudaError_t)cudaMemcpyAsync( copy_out->device_private, copy_in->device_private, - gtask->flow_nb_elts[i], + gtask->flow_info[i].flow_span, (in_elem_dev->super.type != PARSEC_DEV_CUDA)? cudaMemcpyHostToDevice : cudaMemcpyDeviceToDevice, cuda_stream->cuda_stream); @@ -109,7 +109,7 @@ dplasma_cuda_lapack_stage_out(parsec_gpu_task_t *gtask, if(flow_mask & (1U << i)){ copy_in = task->data[i].data_out; copy_out = copy_in->original->device_copies[0]; - ddc = (dplasma_data_collection_t*)gtask->flow_dc[i]; + ddc = (dplasma_data_collection_t*)gtask->flow_info[i].flow_dc; assert(ddc != NULL); elem_sz = parsec_datadist_getsizeoftype(ddc->dc_original->mtype); out_elem_dev = (parsec_device_gpu_module_t*)parsec_mca_device_get( copy_out->device_index); @@ -117,7 +117,7 @@ dplasma_cuda_lapack_stage_out(parsec_gpu_task_t *gtask, if( (out_elem_dev->super.type == PARSEC_DEV_CUDA) || (ddc->dc_original->storage != PARSEC_MATRIX_LAPACK)){ ret = (cudaError_t)cudaMemcpyAsync( copy_out->device_private, copy_in->device_private, - gtask->flow_nb_elts[i], + gtask->flow_info[i].flow_span, out_elem_dev->super.type != PARSEC_DEV_CUDA ? cudaMemcpyDeviceToHost : cudaMemcpyDeviceToDevice, cuda_stream->cuda_stream); diff --git a/src/utils/dplasma_lapack_adtt.c b/src/utils/dplasma_lapack_adtt.c index 2d47988a..14d7d7eb 100644 --- a/src/utils/dplasma_lapack_adtt.c +++ b/src/utils/dplasma_lapack_adtt.c @@ -288,7 +288,7 @@ static parsec_data_t* data_of(parsec_data_collection_t *desc, ...) "data_of CP %p [old type %p] loc %d -> dtt %p target_shape %d layout %d", cp, cp->dtt, loc, adt->opaque_dtt, info.shape, info.layout); dt = parsec_data_create_with_type( dt->dc, - dt->key, cp->device_private, dt->nb_elts, + dt->key, cp->device_private, dt->span, adt->opaque_dtt); } }