Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 55051a20 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Fix type size issue with starpu

parent 09098983
No related branches found
No related tags found
1 merge request!90Renaming
...@@ -45,7 +45,7 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options, ...@@ -45,7 +45,7 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options,
STARPU_RW, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), STARPU_RW, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
STARPU_VALUE, &lda, sizeof(int), STARPU_VALUE, &lda, sizeof(int),
STARPU_VALUE, &IPIV, sizeof(int*), STARPU_VALUE, &IPIV, sizeof(int*),
STARPU_VALUE, &check_info, sizeof(int), STARPU_VALUE, &check_info, sizeof(cham_bool_t),
STARPU_VALUE, &iinfo, sizeof(int), STARPU_VALUE, &iinfo, sizeof(int),
STARPU_PRIORITY, options->priority, STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback, STARPU_CALLBACK, callback,
......
...@@ -109,7 +109,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options, ...@@ -109,7 +109,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
STARPU_W, RTBLKADDR(L, CHAMELEON_Complex64_t, Lm, Ln), STARPU_W, RTBLKADDR(L, CHAMELEON_Complex64_t, Lm, Ln),
STARPU_VALUE, &ldl, sizeof(int), STARPU_VALUE, &ldl, sizeof(int),
STARPU_VALUE, &IPIV, sizeof(int*), STARPU_VALUE, &IPIV, sizeof(int*),
STARPU_VALUE, &check_info, sizeof(int), STARPU_VALUE, &check_info, sizeof(cham_bool_t),
STARPU_VALUE, &iinfo, sizeof(int), STARPU_VALUE, &iinfo, sizeof(int),
STARPU_SCRATCH, options->ws_worker, STARPU_SCRATCH, options->ws_worker,
STARPU_VALUE, &h_work, sizeof(CHAMELEON_starpu_ws_t *), STARPU_VALUE, &h_work, sizeof(CHAMELEON_starpu_ws_t *),
......
...@@ -128,7 +128,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options, ...@@ -128,7 +128,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options,
STARPU_SCRATCH, options->ws_worker, STARPU_SCRATCH, options->ws_worker,
STARPU_VALUE, &d_work, sizeof(CHAMELEON_starpu_ws_t *), STARPU_VALUE, &d_work, sizeof(CHAMELEON_starpu_ws_t *),
STARPU_VALUE, &nb, sizeof(int), STARPU_VALUE, &nb, sizeof(int),
STARPU_VALUE, &check_info, sizeof(int), STARPU_VALUE, &check_info, sizeof(cham_bool_t),
STARPU_VALUE, &iinfo, sizeof(int), STARPU_VALUE, &iinfo, sizeof(int),
STARPU_PRIORITY, options->priority, STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback, STARPU_CALLBACK, callback,
......
...@@ -45,15 +45,13 @@ chameleon_starpu_tag_init( int user_tag_width, ...@@ -45,15 +45,13 @@ chameleon_starpu_tag_init( int user_tag_width,
tag_width = user_tag_width; tag_width = user_tag_width;
tag_sep = user_tag_sep; tag_sep = user_tag_sep;
void *tag_ub_p = NULL;
#if defined(HAVE_STARPU_MPI_COMM_GET_ATTR) #if defined(HAVE_STARPU_MPI_COMM_GET_ATTR)
int64_t *tag_ub_p = NULL;
starpu_mpi_comm_get_attr(MPI_COMM_WORLD, STARPU_MPI_TAG_UB, &tag_ub_p, &ok); starpu_mpi_comm_get_attr(MPI_COMM_WORLD, STARPU_MPI_TAG_UB, &tag_ub_p, &ok);
tag_ub = *tag_ub_p;
#else #else
int *tag_ub_p = NULL;
MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, &tag_ub_p, &ok); MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, &tag_ub_p, &ok);
tag_ub = *tag_ub_p;
#endif #endif
tag_ub = (uintptr_t)tag_ub_p;
if ( !ok ) { if ( !ok ) {
chameleon_error("RUNTIME_desc_create", "MPI_TAG_UB not known by StarPU"); chameleon_error("RUNTIME_desc_create", "MPI_TAG_UB not known by StarPU");
...@@ -235,12 +233,9 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc ) ...@@ -235,12 +233,9 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc )
for (n = 0; n < lnt; n++) { for (n = 0; n < lnt; n++) {
for (m = 0; m < lmt; m++) for (m = 0; m < lmt; m++)
{ {
if (*handle == NULL) if (*handle != NULL) {
{ starpu_data_unregister(*handle);
handle++;
continue;
} }
starpu_data_unregister(*handle);
handle++; handle++;
} }
} }
...@@ -252,8 +247,8 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc ) ...@@ -252,8 +247,8 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc )
if (cudaHostUnregister(desc->mat) != cudaSuccess) if (cudaHostUnregister(desc->mat) != cudaSuccess)
{ {
chameleon_warning("RUNTIME_desc_destroy(StarPU)", chameleon_warning("RUNTIME_desc_destroy(StarPU)",
"cudaHostUnregister failed to unregister the " "cudaHostUnregister failed to unregister the "
"pinned memory associated to the matrix"); "pinned memory associated to the matrix");
} }
} }
#endif /* defined(CHAMELEON_USE_CUDA) */ #endif /* defined(CHAMELEON_USE_CUDA) */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment