From 994f1701b1a8405d37f33a4b7c3a343987433e50 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Sat, 17 Sep 2016 14:03:27 +0000
Subject: [PATCH] chameleon: fix build for quark version (pb after zbuild
integration)
---
runtime/quark/codelets/codelet_zbuild.c | 15 +++++++--------
runtime/quark/include/core_blas_dag.h | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/runtime/quark/codelets/codelet_zbuild.c b/runtime/quark/codelets/codelet_zbuild.c
index 81e286e12..cea6459cc 100644
--- a/runtime/quark/codelets/codelet_zbuild.c
+++ b/runtime/quark/codelets/codelet_zbuild.c
@@ -45,12 +45,12 @@ void MORSE_TASK_zbuild( MORSE_option_t *options,
col_min = An*A->nb ;
col_max = An == A->nt-1 ? A->n-1 : col_min+A->nb-1 ;
- QUARK_Insert_Task(opt->quark, CORE_zbuild_quark, (Quark_Task_Flags*)opt,
+ QUARK_Insert_Task(opt->quark, CORE_zbuild_quark, (Quark_Task_Flags*)opt,
sizeof(int), &row_min, VALUE,
sizeof(int), &row_max, VALUE,
sizeof(int), &col_min, VALUE,
sizeof(int), &col_max, VALUE,
- sizeof(MORSE_Complex64_t)*lda*n, RTBLKADDR(A, MORSE_Complex64_t, Am, An), OUTPUT,
+ sizeof(MORSE_Complex64_t)*lda*A->nb, RTBLKADDR(A, MORSE_Complex64_t, Am, An), OUTPUT,
sizeof(int), &lda, VALUE,
sizeof(void*), &user_data, VALUE,
sizeof(void*), &user_build_callback, VALUE,
@@ -62,13 +62,12 @@ void CORE_zbuild_quark(Quark *quark)
{
MORSE_Complex64_t *A;
int lda;
- void *user_data;
- void (*user_build_callback)(int row_min, int row_max, int col_min, int col_max, void *buffer, int ld, void *user_data) ;
- int row_min, row_max, col_min, col_max;
-
- quark_unpack_args_8( quark, row_min, row_max, col_min, col_max, A, lda, user_data, user_build_callback);
+ void *user_data;
+ void (*user_build_callback)(int row_min, int row_max, int col_min, int col_max, void *buffer, int ld, void *user_data) ;
+ int row_min, row_max, col_min, col_max;
- user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data);
+ quark_unpack_args_8( quark, row_min, row_max, col_min, col_max, A, lda, user_data, user_build_callback);
+ user_build_callback(row_min, row_max, col_min, col_max, A, lda, user_data);
}
diff --git a/runtime/quark/include/core_blas_dag.h b/runtime/quark/include/core_blas_dag.h
index 78e0fb6c1..0ab24fcce 100644
--- a/runtime/quark/include/core_blas_dag.h
+++ b/runtime/quark/include/core_blas_dag.h
@@ -35,6 +35,7 @@
#define DAG_CORE_ASUM DAG_SET_PROPERTIES( "ASUM" , "white" )
#define DAG_CORE_AXPY DAG_SET_PROPERTIES( "AXPY" , "white" )
+#define DAG_CORE_BUILD DAG_SET_PROPERTIES( "BUILD" , "white" )
#define DAG_CORE_GEADD DAG_SET_PROPERTIES( "GEADD" , "white" )
#define DAG_CORE_GELQT DAG_SET_PROPERTIES( "GELQT" , "green" )
#define DAG_CORE_GEMM DAG_SET_PROPERTIES( "GEMM" , "yellow" )
--
GitLab