Mentions légales du service

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

Merge branch 'hotfix/minor' into 'master'

Fix small issues

See merge request !407
parents bb5dfbdd 3e260a0c
No related branches found
No related tags found
1 merge request!407Fix small issues
...@@ -119,9 +119,9 @@ void chameleon_pclag2z(CHAM_context_t *chamctxt); ...@@ -119,9 +119,9 @@ void chameleon_pclag2z(CHAM_context_t *chamctxt);
*/ */
#if defined(__GNUC__) #if defined(__GNUC__)
static inline int chameleon_asprintf( char **strp, const char *fmt, ... ) __attribute__((format(printf,2,3))); static inline int chameleon_asprintf( char **restrict strp, const char *fmt, ... ) __attribute__((format(printf,2,3)));
#endif #endif
static inline int chameleon_asprintf( char **strp, const char *fmt, ... ) static inline int chameleon_asprintf( char **restrict strp, const char *fmt, ... )
{ {
va_list ap; va_list ap;
int rc; int rc;
......
...@@ -164,6 +164,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options, ...@@ -164,6 +164,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
STARPU_PRIORITY, options->priority, STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback, STARPU_CALLBACK, callback,
STARPU_EXECUTE_ON_WORKER, options->workerid, STARPU_EXECUTE_ON_WORKER, options->workerid,
STARPU_POSSIBLY_PARALLEL, options->parallel,
#if defined(CHAMELEON_CODELETS_HAVE_NAME) #if defined(CHAMELEON_CODELETS_HAVE_NAME)
STARPU_NAME, cl_name, STARPU_NAME, cl_name,
#endif #endif
......
...@@ -148,6 +148,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options, ...@@ -148,6 +148,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
/* Reduce the C access if needed */ /* Reduce the C access if needed */
accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW; accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
/* Refine name */
cl_name = chameleon_codelet_name( cl_name, 2, cl_name = chameleon_codelet_name( cl_name, 2,
A->get_blktile( A, Am, An ), A->get_blktile( A, Am, An ),
C->get_blktile( C, Cm, Cn ) ); C->get_blktile( C, Cm, Cn ) );
......
...@@ -129,8 +129,8 @@ chameleon_starpu_tag_book( int64_t nbtags ) ...@@ -129,8 +129,8 @@ chameleon_starpu_tag_book( int64_t nbtags )
} }
#if defined(CHAMELEON_DEBUG_STARPU) #if defined(CHAMELEON_DEBUG_STARPU)
fprintf( stderr, "chameleon_starpu_tag: Book %ld - %ld\n", fprintf( stderr, "[%02d] chameleon_starpu_tag: Book %ld - %ld\n",
min, min + nbtags ); CHAMELEON_Comm_rank(), min, min + nbtags );
#endif #endif
assert( cst_first != NULL ); assert( cst_first != NULL );
......
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