From cdb0f0afd883f83919e0fa4b93a720c7610c19d3 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Sat, 10 Oct 2020 16:29:21 +0200
Subject: [PATCH] Silent warnings
---
compute/pzplrnk.c | 2 +-
runtime/quark/codelets/codelet_zplssq.c | 8 ++++----
runtime/quark/include/chameleon_quark.h | 2 +-
runtime/starpu/codelets/codelet_zplssq.c | 1 +
testing/testing_zplrnk.c | 20 +++++++++-----------
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/compute/pzplrnk.c b/compute/pzplrnk.c
index a8919e225..17681aa90 100644
--- a/compute/pzplrnk.c
+++ b/compute/pzplrnk.c
@@ -34,7 +34,7 @@ void chameleon_pzplrnk( int K, CHAM_desc_t *C,
RUNTIME_option_t options;
int m, n, k, KT;
int tempmm, tempnn, tempkk;
- int lookahead, myp, myq;
+ int myp, myq;
CHAMELEON_Complex64_t zbeta;
CHAM_desc_t WA, WB;
diff --git a/runtime/quark/codelets/codelet_zplssq.c b/runtime/quark/codelets/codelet_zplssq.c
index 24cf84789..0a80a4580 100644
--- a/runtime/quark/codelets/codelet_zplssq.c
+++ b/runtime/quark/codelets/codelet_zplssq.c
@@ -30,10 +30,10 @@ void CORE_zplssq_quark(Quark *quark)
CHAM_tile_t *tileIN;
CHAM_tile_t *tileOUT;
+ quark_unpack_args_5( quark, storev, M, N, tileIN, tileOUT );
+
assert( tileIN->format & CHAMELEON_TILE_FULLRANK );
assert( tileOUT->format & CHAMELEON_TILE_FULLRANK );
-
- quark_unpack_args_5( quark, storev, M, N, tileIN, tileOUT );
CORE_zplssq( storev, M, N, tileIN->mat, tileOUT->mat );
}
@@ -59,9 +59,9 @@ void CORE_zplssq2_quark(Quark *quark)
int N;
CHAM_tile_t *tileRESULT;
- assert( tileRESULT->format & CHAMELEON_TILE_FULLRANK );
-
quark_unpack_args_2( quark, N, tileRESULT );
+
+ assert( tileRESULT->format & CHAMELEON_TILE_FULLRANK );
CORE_zplssq2(N, tileRESULT->mat);
}
diff --git a/runtime/quark/include/chameleon_quark.h b/runtime/quark/include/chameleon_quark.h
index 11c394258..76477c3b7 100644
--- a/runtime/quark/include/chameleon_quark.h
+++ b/runtime/quark/include/chameleon_quark.h
@@ -24,7 +24,7 @@
#include <quark.h>
#if defined(CHAMELEON_RUNTIME_SYNC)
-#define QUARk_Insert_Task QUARK_Execute_Task
+#define QUARK_Insert_Task QUARK_Execute_Task
#endif
#include "coreblas.h"
#include "core_blas_dag.h"
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 6201abff7..c017aba69 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -121,6 +121,7 @@ void INSERT_TASK_zplssq2( const RUNTIME_option_t *options, int N,
STARPU_RW, RTBLKADDR(RESULT, double, RESULTm, RESULTn),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
+ STARPU_EXECUTE_ON_WORKER, workerid,
#if defined(CHAMELEON_CODELETS_HAVE_NAME)
STARPU_NAME, "zplssq2",
#endif
diff --git a/testing/testing_zplrnk.c b/testing/testing_zplrnk.c
index 355df294e..c98c11883 100644
--- a/testing/testing_zplrnk.c
+++ b/testing/testing_zplrnk.c
@@ -26,20 +26,18 @@ testing_zplrnk( run_arg_list_t *args, int check )
{
static int run_id = 0;
int hres = 0;
- double norm;
CHAM_desc_t *descC;
/* Reads arguments */
- int nb = run_arg_get_int( args, "nb", 320 );
- int P = parameters_getvalue_int( "P" );
- cham_normtype_t norm_type = run_arg_get_ntype( args, "norm", ChamMaxNorm );
- int N = run_arg_get_int( args, "N", 1000 );
- int M = run_arg_get_int( args, "M", N );
- int K = run_arg_get_int( args, "K", N );
- int LDC = run_arg_get_int( args, "LDC", M );
- int seedA = run_arg_get_int( args, "seedA", random() );
- int seedB = run_arg_get_int( args, "seedB", random() );
- int Q = parameters_compute_q( P );
+ int nb = run_arg_get_int( args, "nb", 320 );
+ int P = parameters_getvalue_int( "P" );
+ int N = run_arg_get_int( args, "N", 1000 );
+ int M = run_arg_get_int( args, "M", N );
+ int K = run_arg_get_int( args, "K", N );
+ int LDC = run_arg_get_int( args, "LDC", M );
+ int seedA = run_arg_get_int( args, "seedA", random() );
+ int seedB = run_arg_get_int( args, "seedB", random() );
+ int Q = parameters_compute_q( P );
cham_fixdbl_t t, gflops;
/* We consider the gemm cost used in this operation as the cost */
cham_fixdbl_t flops = flops_zgemm( M, N, K );
--
GitLab