From 165fe0378ff58f621613a507efcae3653f8b04a5 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 12 Jul 2018 10:08:30 +0200
Subject: [PATCH] Fix compilation with quark and parsec
---
runtime/parsec/codelets/codelet_zgetrf.c | 6 +++---
runtime/parsec/codelets/codelet_zgetrf_incpiv.c | 4 ++--
runtime/parsec/codelets/codelet_ztstrf.c | 4 ++--
runtime/parsec/control/runtime_options.c | 1 -
runtime/quark/codelets/codelet_zgetrf.c | 6 +++---
runtime/quark/codelets/codelet_zgetrf_incpiv.c | 6 +++---
runtime/quark/codelets/codelet_ztrasm.c | 2 +-
runtime/quark/codelets/codelet_ztstrf.c | 6 +++---
runtime/quark/control/runtime_options.c | 2 --
9 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c
index b86c128ad..93502b3c3 100644
--- a/runtime/parsec/codelets/codelet_zgetrf.c
+++ b/runtime/parsec/codelets/codelet_zgetrf.c
@@ -29,7 +29,7 @@ CORE_zgetrf_parsec( parsec_execution_stream_t *context,
CHAMELEON_Complex64_t *A;
int lda;
int *IPIV;
- CHAMELEON_bool *check_info;
+ cham_bool_t *check_info;
int iinfo;
int info;
@@ -46,7 +46,7 @@ void INSERT_TASK_zgetrf(const RUNTIME_option_t *options,
int m, int n, int nb,
const CHAM_desc_t *A, int Am, int An, int lda,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo)
+ cham_bool_t check_info, int iinfo)
{
parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt);
@@ -57,7 +57,7 @@ void INSERT_TASK_zgetrf(const RUNTIME_option_t *options,
PASSED_BY_REF, RTBLKADDR( A, CHAMELEON_Complex64_t, Am, An ), morse_parsec_get_arena_index( A ) | INOUT | AFFINITY,
sizeof(int), &lda, VALUE,
sizeof(int)*nb, IPIV, SCRATCH,
- sizeof(CHAMELEON_bool), &check_info, VALUE,
+ sizeof(cham_bool_t), &check_info, VALUE,
sizeof(int), &iinfo, VALUE,
PARSEC_DTD_ARG_END );
}
diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
index 11a2386fe..1076b1e74 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
@@ -84,7 +84,7 @@ CORE_zgetrf_incpiv_parsec( parsec_execution_stream_t *context,
CHAMELEON_Complex64_t *A;
int lda;
int *IPIV;
- CHAMELEON_bool *check_info;
+ cham_bool_t *check_info;
int iinfo;
int info;
@@ -103,7 +103,7 @@ void INSERT_TASK_zgetrf_incpiv( const RUNTIME_option_t *options,
const CHAM_desc_t *A, int Am, int An, int lda,
const CHAM_desc_t *L, int Lm, int Ln, int ldl,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo )
+ cham_bool_t check_info, int iinfo )
{
parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt);
diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c
index 8714b6e0d..913a88304 100644
--- a/runtime/parsec/codelets/codelet_ztstrf.c
+++ b/runtime/parsec/codelets/codelet_ztstrf.c
@@ -37,7 +37,7 @@ CORE_ztstrf_parsec( parsec_execution_stream_t *context,
int *IPIV;
CHAMELEON_Complex64_t *WORK;
int ldwork;
- CHAMELEON_bool *check_info;
+ cham_bool_t *check_info;
int iinfo;
int info;
@@ -57,7 +57,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options,
const CHAM_desc_t *A, int Am, int An, int lda,
const CHAM_desc_t *L, int Lm, int Ln, int ldl,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo)
+ cham_bool_t check_info, int iinfo)
{
parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt);
diff --git a/runtime/parsec/control/runtime_options.c b/runtime/parsec/control/runtime_options.c
index 751453493..4b9d0e649 100644
--- a/runtime/parsec/control/runtime_options.c
+++ b/runtime/parsec/control/runtime_options.c
@@ -29,7 +29,6 @@ void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *morse,
options->profiling = CHAMELEON_PROFILING == CHAMELEON_TRUE;
options->parallel = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
options->priority = RUNTIME_PRIORITY_MIN;
- options->nb = CHAMELEON_NB;
options->ws_wsize = 0;
options->ws_hsize = 0;
options->ws_worker = NULL;
diff --git a/runtime/quark/codelets/codelet_zgetrf.c b/runtime/quark/codelets/codelet_zgetrf.c
index 1cfb95f4e..021a2a8fc 100644
--- a/runtime/quark/codelets/codelet_zgetrf.c
+++ b/runtime/quark/codelets/codelet_zgetrf.c
@@ -34,7 +34,7 @@ void CORE_zgetrf_quark(Quark *quark)
int *IPIV;
RUNTIME_sequence_t *sequence;
RUNTIME_request_t *request;
- CHAMELEON_bool check_info;
+ cham_bool_t check_info;
int iinfo;
int info;
@@ -49,7 +49,7 @@ void INSERT_TASK_zgetrf(const RUNTIME_option_t *options,
int m, int n, int nb,
const CHAM_desc_t *A, int Am, int An, int lda,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo)
+ cham_bool_t check_info, int iinfo)
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_GETRF;
@@ -61,7 +61,7 @@ void INSERT_TASK_zgetrf(const RUNTIME_option_t *options,
sizeof(int)*nb, IPIV, OUTPUT,
sizeof(RUNTIME_sequence_t*), &(options->sequence), VALUE,
sizeof(RUNTIME_request_t*), &(options->request), VALUE,
- sizeof(CHAMELEON_bool), &check_info, VALUE,
+ sizeof(cham_bool_t), &check_info, VALUE,
sizeof(int), &iinfo, VALUE,
0);
}
diff --git a/runtime/quark/codelets/codelet_zgetrf_incpiv.c b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
index bcc4281e6..e12c22263 100644
--- a/runtime/quark/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
@@ -37,7 +37,7 @@ void CORE_zgetrf_incpiv_quark(Quark *quark)
int *IPIV;
RUNTIME_sequence_t *sequence;
RUNTIME_request_t *request;
- CHAMELEON_bool check_info;
+ cham_bool_t check_info;
int iinfo;
int info;
@@ -108,7 +108,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
const CHAM_desc_t *A, int Am, int An, int lda,
const CHAM_desc_t *L, int Lm, int Ln, int ldl,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo)
+ cham_bool_t check_info, int iinfo)
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_GETRF;
@@ -121,7 +121,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
sizeof(int)*nb, IPIV, OUTPUT,
sizeof(RUNTIME_sequence_t*), &(options->sequence), VALUE,
sizeof(RUNTIME_request_t*), &(options->request), VALUE,
- sizeof(CHAMELEON_bool), &check_info, VALUE,
+ sizeof(cham_bool_t), &check_info, VALUE,
sizeof(int), &iinfo, VALUE,
0);
diff --git a/runtime/quark/codelets/codelet_ztrasm.c b/runtime/quark/codelets/codelet_ztrasm.c
index ea9abf4b0..ae01e0c2d 100644
--- a/runtime/quark/codelets/codelet_ztrasm.c
+++ b/runtime/quark/codelets/codelet_ztrasm.c
@@ -44,7 +44,7 @@ void INSERT_TASK_ztrasm(const RUNTIME_option_t *options,
const CHAM_desc_t *B, int Bm, int Bn)
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
- int szeW = uplo == ChamRowwise ? M : N ;
+ int szeW = storev == ChamRowwise ? M : N ;
QUARK_Insert_Task(opt->quark, CORE_ztrasm_quark, (Quark_Task_Flags*)opt,
sizeof(int), &storev, VALUE,
sizeof(int), &uplo, VALUE,
diff --git a/runtime/quark/codelets/codelet_ztstrf.c b/runtime/quark/codelets/codelet_ztstrf.c
index f5a3f4da8..ce327fab1 100644
--- a/runtime/quark/codelets/codelet_ztstrf.c
+++ b/runtime/quark/codelets/codelet_ztstrf.c
@@ -46,7 +46,7 @@ void CORE_ztstrf_quark(Quark *quark)
int ldwork;
RUNTIME_sequence_t *sequence;
RUNTIME_request_t *request;
- CHAMELEON_bool check_info;
+ cham_bool_t check_info;
int iinfo;
int info;
@@ -130,7 +130,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options,
const CHAM_desc_t *A, int Am, int An, int lda,
const CHAM_desc_t *L, int Lm, int Ln, int ldl,
int *IPIV,
- CHAMELEON_bool check_info, int iinfo)
+ cham_bool_t check_info, int iinfo)
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_TSTRF;
@@ -150,7 +150,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options,
sizeof(int), &nb, VALUE,
sizeof(RUNTIME_sequence_t*), &(options->sequence), VALUE,
sizeof(RUNTIME_request_t*), &(options->request), VALUE,
- sizeof(CHAMELEON_bool), &check_info, VALUE,
+ sizeof(cham_bool_t), &check_info, VALUE,
sizeof(int), &iinfo, VALUE,
0);
}
diff --git a/runtime/quark/control/runtime_options.c b/runtime/quark/control/runtime_options.c
index d40698f4d..1f830d5c4 100644
--- a/runtime/quark/control/runtime_options.c
+++ b/runtime/quark/control/runtime_options.c
@@ -40,8 +40,6 @@ void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *morse,
options->parallel = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
options->priority = RUNTIME_PRIORITY_MIN;
- options->nb = CHAMELEON_NB;
-
options->ws_wsize = 0;
options->ws_hsize = 0;
options->ws_worker = NULL;
--
GitLab