From 4baa28e99e38ed442f4afc51f82f7a90806fb2ac Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 15 Sep 2015 15:55:33 +0000
Subject: [PATCH] update the runtimes interface to call only CORE_ functions
from coreblas and not lapacke
---
runtime/quark/codelets/codelet_zgetrf.c | 2 +-
runtime/quark/codelets/codelet_zlacpy.c | 5 +----
runtime/quark/codelets/codelet_zlag2c.c | 4 ++--
runtime/quark/codelets/codelet_zlaset.c | 5 +----
runtime/quark/codelets/codelet_zlauum.c | 2 +-
runtime/quark/codelets/codelet_zpotrf.c | 5 +----
runtime/quark/codelets/codelet_ztrtri.c | 5 +----
runtime/starpu/codelets/codelet_zgetrf.c | 2 +-
runtime/starpu/codelets/codelet_zlacpy.c | 5 +----
runtime/starpu/codelets/codelet_zlag2c.c | 4 ++--
runtime/starpu/codelets/codelet_zlaset.c | 5 +----
runtime/starpu/codelets/codelet_zlauum.c | 2 +-
runtime/starpu/codelets/codelet_zpotrf.c | 5 +----
runtime/starpu/codelets/codelet_ztrtri.c | 5 +----
14 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/runtime/quark/codelets/codelet_zgetrf.c b/runtime/quark/codelets/codelet_zgetrf.c
index a73e7e7b5..47b5c96e5 100644
--- a/runtime/quark/codelets/codelet_zgetrf.c
+++ b/runtime/quark/codelets/codelet_zgetrf.c
@@ -65,7 +65,7 @@ void CORE_zgetrf_quark(Quark *quark)
int info;
quark_unpack_args_9(quark, m, n, A, lda, IPIV, sequence, request, check_info, iinfo);
- info = LAPACKE_zgetrf_work(LAPACK_COL_MAJOR, m, n, A, lda, IPIV );
+ CORE_zgetrf( m, n, A, lda, IPIV, &info );
if (info != MORSE_SUCCESS && check_info)
RUNTIME_sequence_flush(quark, sequence, request, iinfo+info);
}
diff --git a/runtime/quark/codelets/codelet_zlacpy.c b/runtime/quark/codelets/codelet_zlacpy.c
index a48db4e20..fedac25e1 100644
--- a/runtime/quark/codelets/codelet_zlacpy.c
+++ b/runtime/quark/codelets/codelet_zlacpy.c
@@ -67,9 +67,6 @@ void CORE_zlacpy_quark(Quark *quark)
int LDB;
quark_unpack_args_7(quark, uplo, M, N, A, LDA, B, LDB);
- LAPACKE_zlacpy_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- M, N, A, LDA, B, LDB);
+ CORE_zlacpy(uplo, M, N, A, LDA, B, LDB);
}
diff --git a/runtime/quark/codelets/codelet_zlag2c.c b/runtime/quark/codelets/codelet_zlag2c.c
index 43804a3e4..3a009d811 100644
--- a/runtime/quark/codelets/codelet_zlag2c.c
+++ b/runtime/quark/codelets/codelet_zlag2c.c
@@ -68,7 +68,7 @@ void CORE_zlag2c_quark(Quark *quark)
int info;
quark_unpack_args_8(quark, m, n, A, lda, B, ldb, sequence, request);
- info = LAPACKE_zlag2c_work(LAPACK_COL_MAJOR, m, n, A, lda, B, ldb);
+ CORE_zlag2c( m, n, A, lda, B, ldb);
if (sequence->status == MORSE_SUCCESS && info != 0)
RUNTIME_sequence_flush(quark, sequence, request, info);
}
@@ -105,6 +105,6 @@ void CORE_clag2z_quark(Quark *quark)
int ldb;
quark_unpack_args_6(quark, m, n, A, lda, B, ldb);
- LAPACKE_clag2z_work(LAPACK_COL_MAJOR, m, n, A, lda, B, ldb);
+ CORE_clag2z( m, n, A, lda, B, ldb);
}
diff --git a/runtime/quark/codelets/codelet_zlaset.c b/runtime/quark/codelets/codelet_zlaset.c
index 37ef01399..872cfa621 100644
--- a/runtime/quark/codelets/codelet_zlaset.c
+++ b/runtime/quark/codelets/codelet_zlaset.c
@@ -97,8 +97,5 @@ void CORE_zlaset_quark(Quark *quark)
int LDA;
quark_unpack_args_7(quark, uplo, M, N, alpha, beta, A, LDA);
- LAPACKE_zlaset_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- M, N, alpha, beta, A, LDA);
+ CORE_zlaset(uplo, M, N, alpha, beta, A, LDA);
}
diff --git a/runtime/quark/codelets/codelet_zlauum.c b/runtime/quark/codelets/codelet_zlauum.c
index bc36ab363..beea79f52 100644
--- a/runtime/quark/codelets/codelet_zlauum.c
+++ b/runtime/quark/codelets/codelet_zlauum.c
@@ -60,5 +60,5 @@ void CORE_zlauum_quark(Quark *quark)
int LDA;
quark_unpack_args_4(quark, uplo, N, A, LDA);
- LAPACKE_zlauum_work(LAPACK_COL_MAJOR, morse_lapack_const(uplo), N, A, LDA);
+ CORE_zlauum(uplo, N, A, LDA);
}
diff --git a/runtime/quark/codelets/codelet_zpotrf.c b/runtime/quark/codelets/codelet_zpotrf.c
index de22c1698..e9151f11e 100644
--- a/runtime/quark/codelets/codelet_zpotrf.c
+++ b/runtime/quark/codelets/codelet_zpotrf.c
@@ -69,10 +69,7 @@ void CORE_zpotrf_quark(Quark *quark)
int info;
quark_unpack_args_7(quark, uplo, n, A, lda, sequence, request, iinfo);
- info = LAPACKE_zpotrf_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- n, A, lda);
+ CORE_zpotrf(uplo, n, A, lda, &info);
if (sequence->status == MORSE_SUCCESS && info != 0)
RUNTIME_sequence_flush(quark, sequence, request, iinfo+info);
}
diff --git a/runtime/quark/codelets/codelet_ztrtri.c b/runtime/quark/codelets/codelet_ztrtri.c
index d502fc3eb..8a8000a65 100644
--- a/runtime/quark/codelets/codelet_ztrtri.c
+++ b/runtime/quark/codelets/codelet_ztrtri.c
@@ -72,10 +72,7 @@ void CORE_ztrtri_quark(Quark *quark)
int info;
quark_unpack_args_8(quark, uplo, diag, N, A, LDA, sequence, request, iinfo);
- info = LAPACKE_ztrtri_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo), morse_lapack_const(diag),
- N, A, LDA);
+ CORE_ztrtri(uplo, diag, N, A, LDA, &info);
if ((sequence->status == MORSE_SUCCESS) && (info > 0))
RUNTIME_sequence_flush(quark, sequence, request, iinfo + info);
}
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 1f6bcef9d..316fa65d0 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -71,7 +71,7 @@ static void cl_zgetrf_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &IPIV, &check_info, &iinfo);
- info = LAPACKE_zgetrf_work(LAPACK_COL_MAJOR, m, n, A, lda, IPIV );
+ CORE_zgetrf( m, n, A, lda, IPIV, &info );
}
/*
* Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 088601d9a..41b514f1e 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -79,10 +79,7 @@ static void cl_zlacpy_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
B = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[1]);
starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &LDA, &LDB);
- LAPACKE_zlacpy_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- M, N, A, LDA, B, LDB);
+ CORE_zlacpy(uplo, M, N, A, LDA, B, LDB);
}
/*
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index 3352b4ccc..bdc5ed6ea 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -73,7 +73,7 @@ static void cl_zlag2c_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
B = (MORSE_Complex32_t *)STARPU_MATRIX_GET_PTR(descr[1]);
starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &ldb);
- LAPACKE_zlag2c_work(LAPACK_COL_MAJOR, m, n, A, lda, B, ldb);
+ CORE_zlag2c( m, n, A, lda, B, ldb);
}
void MORSE_TASK_clag2z(MORSE_option_t *options,
@@ -115,7 +115,7 @@ static void cl_clag2z_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex32_t *)STARPU_MATRIX_GET_PTR(descr[0]);
B = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[1]);
starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &ldb);
- LAPACKE_clag2z_work(LAPACK_COL_MAJOR, m, n, A, lda, B, ldb);
+ CORE_clag2z( m, n, A, lda, B, ldb);
}
/*
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 18096ecf6..6cd692d22 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -107,10 +107,7 @@ static void cl_zlaset_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &alpha, &beta, &LDA);
- LAPACKE_zlaset_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- M, N, alpha, beta, A, LDA);
+ CORE_zlaset(uplo, M, N, alpha, beta, A, LDA);
}
/*
* Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 155e9fa74..0c3ba14bd 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -70,7 +70,7 @@ static void cl_zlauum_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
starpu_codelet_unpack_args(cl_arg, &uplo, &N, &LDA);
- LAPACKE_zlauum_work(LAPACK_COL_MAJOR, morse_lapack_const(uplo), N, A, LDA);
+ CORE_zlauum(uplo, N, A, LDA);
}
#if defined(CHAMELEON_USE_MAGMA)
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index c3cf8adc0..939a9e1da 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -76,10 +76,7 @@ static void cl_zpotrf_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
starpu_codelet_unpack_args(cl_arg, &uplo, &n, &lda, &iinfo);
- info = LAPACKE_zpotrf_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo),
- n, A, lda);
+ CORE_zpotrf(uplo, n, A, lda, &info);
}
#ifdef CHAMELEON_USE_MAGMA
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 0acfe5786..4f7145c59 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -78,10 +78,7 @@ static void cl_ztrtri_cpu_func(void *descr[], void *cl_arg)
A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]);
starpu_codelet_unpack_args(cl_arg, &uplo, &diag, &N, &LDA, &iinfo);
- info = LAPACKE_ztrtri_work(
- LAPACK_COL_MAJOR,
- morse_lapack_const(uplo), morse_lapack_const(diag),
- N, A, LDA);
+ CORE_ztrtri(uplo, diag, N, A, LDA, &info);
}
#if defined(CHAMELEON_USE_MAGMA)
--
GitLab