From 4b52f1ebbe398669e63b4fc0ef4af11cb9839524 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 22 Dec 2016 22:35:55 +0100
Subject: [PATCH] Apply the max/min change to other runtimes and timings
---
control/workspace.c | 2 +-
runtime/parsec/codelets/codelet_zlange.c | 2 +-
runtime/parsec/codelets/codelet_zlanhe.c | 2 +-
runtime/parsec/codelets/codelet_zlansy.c | 2 +-
runtime/parsec/codelets/codelet_zlantr.c | 2 +-
runtime/quark/codelets/codelet_zlange.c | 34 +++++++++++++-----------
runtime/quark/codelets/codelet_zlanhe.c | 21 ++++++++-------
runtime/quark/codelets/codelet_zlansy.c | 5 ++--
runtime/quark/codelets/codelet_zlantr.c | 5 ++--
timing/time_zgemm.c | 6 ++---
timing/time_zgemm_tile.c | 6 ++---
timing/time_zgetrf_incpiv.c | 8 +++---
timing/time_zgetrf_incpiv_tile.c | 4 +--
timing/time_zgetrs_incpiv_tile.c | 4 +--
timing/time_zheevd_tile.c | 2 +-
timing/time_zlange.c | 2 +-
timing/time_zlange_tile.c | 2 +-
timing/time_zposv.c | 16 +++++------
timing/time_zposv_tile.c | 2 +-
timing/time_zpotrf.c | 2 +-
timing/time_zpotrf_tile.c | 2 +-
timing/time_zpotri_tile.c | 10 +++----
timing/time_zpotrs_tile.c | 2 +-
timing/time_zsytrf_tile.c | 2 +-
timing/time_ztrsm.c | 8 +++---
timing/timing.c | 4 +--
timing/timing.h | 6 ++---
timing/timing_zauxiliary.c | 12 ++++-----
28 files changed, 90 insertions(+), 85 deletions(-)
diff --git a/control/workspace.c b/control/workspace.c
index d66577de4..097a26711 100644
--- a/control/workspace.c
+++ b/control/workspace.c
@@ -143,7 +143,7 @@ int morse_alloc_ipiv(int M, int N, MORSE_enum func, int type, MORSE_desc_t **des
lm = IB * MT;
ln = NB * NT;
- size = (size_t)(min(MT, NT) * NB * NT * sizeof(int));
+ size = (size_t)(chameleon_min(MT, NT) * NB * NT * sizeof(int));
if (size <= 0) {
*IPIV = NULL;
return MORSE_SUCCESS;
diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c
index 77f1f039c..5d1bd5dd0 100644
--- a/runtime/parsec/codelets/codelet_zlange.c
+++ b/runtime/parsec/codelets/codelet_zlange.c
@@ -55,7 +55,7 @@ void MORSE_TASK_zlange(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
- int szeW = max( M, N );
+ int szeW = chameleon_max( M, N );
dague_insert_task(
DAGUE_dtd_handle, CORE_zlange_parsec, "lange",
diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c
index fffdb4bec..fc50a9938 100644
--- a/runtime/parsec/codelets/codelet_zlanhe.c
+++ b/runtime/parsec/codelets/codelet_zlanhe.c
@@ -55,7 +55,7 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
- int szeW = max( 1, N );
+ int szeW = chameleon_max( 1, N );
dague_insert_task(
DAGUE_dtd_handle, CORE_zlanhe_parsec, "LANHE",
diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c
index 113d06c44..62cf55851 100644
--- a/runtime/parsec/codelets/codelet_zlansy.c
+++ b/runtime/parsec/codelets/codelet_zlansy.c
@@ -55,7 +55,7 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
- int szeW = max( 1, N );
+ int szeW = chameleon_max( 1, N );
dague_insert_task(
DAGUE_dtd_handle, CORE_zlansy_parsec, "lansy",
diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c
index ef290a2a6..ed0cb3216 100644
--- a/runtime/parsec/codelets/codelet_zlantr.c
+++ b/runtime/parsec/codelets/codelet_zlantr.c
@@ -58,7 +58,7 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
- int szeW = max( 1, N );
+ int szeW = chameleon_max( 1, N );
dague_insert_task(
DAGUE_dtd_handle, CORE_zlantr_parsec, "lantr",
diff --git a/runtime/quark/codelets/codelet_zlange.c b/runtime/quark/codelets/codelet_zlange.c
index c8a9f6c5f..e3a6b92ec 100644
--- a/runtime/quark/codelets/codelet_zlange.c
+++ b/runtime/quark/codelets/codelet_zlange.c
@@ -36,16 +36,17 @@ void MORSE_TASK_zlange(const MORSE_option_t *options,
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_LANGE;
- int szeW = max( M, N );
- QUARK_Insert_Task(opt->quark, CORE_zlange_quark, (Quark_Task_Flags*)opt,
- sizeof(MORSE_enum), &norm, VALUE,
- sizeof(int), &M, VALUE,
- sizeof(int), &N, VALUE,
- sizeof(MORSE_Complex64_t)*NB*NB, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT,
- sizeof(int), &LDA, VALUE,
- sizeof(double)*szeW, NULL, SCRATCH,
- sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
- 0);
+ int szeW = chameleon_max( M, N );
+ QUARK_Insert_Task(
+ opt->quark, CORE_zlange_quark, (Quark_Task_Flags*)opt,
+ sizeof(MORSE_enum), &norm, VALUE,
+ sizeof(int), &M, VALUE,
+ sizeof(int), &N, VALUE,
+ sizeof(MORSE_Complex64_t)*NB*NB, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT,
+ sizeof(int), &LDA, VALUE,
+ sizeof(double)*szeW, NULL, SCRATCH,
+ sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
+ 0);
}
void CORE_zlange_quark(Quark *quark)
@@ -69,10 +70,11 @@ void MORSE_TASK_zlange_max(const MORSE_option_t *options,
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_LANGE_MAX;
- QUARK_Insert_Task(opt->quark, CORE_zlange_max_quark, (Quark_Task_Flags*)opt,
- sizeof(double), RTBLKADDR(A, double, Am, An), INPUT,
- sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
- 0);
+ QUARK_Insert_Task(
+ opt->quark, CORE_zlange_max_quark, (Quark_Task_Flags*)opt,
+ sizeof(double), RTBLKADDR(A, double, Am, An), INPUT,
+ sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
+ 0);
}
@@ -82,7 +84,7 @@ void CORE_zlange_max_quark(Quark *quark)
double *normA;
quark_unpack_args_2(quark, A, normA);
- if ( A[0] > *normA )
- *normA = A[0];
+ if ( A[0] > *normA )
+ *normA = A[0];
}
diff --git a/runtime/quark/codelets/codelet_zlanhe.c b/runtime/quark/codelets/codelet_zlanhe.c
index f3bd6fa8c..70ab4cf8f 100644
--- a/runtime/quark/codelets/codelet_zlanhe.c
+++ b/runtime/quark/codelets/codelet_zlanhe.c
@@ -36,16 +36,17 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options,
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_LANHE;
- int szeW = max( 1, N );
- QUARK_Insert_Task(opt->quark, CORE_zlanhe_quark, (Quark_Task_Flags*)opt,
- sizeof(MORSE_enum), &norm, VALUE,
- sizeof(MORSE_enum), &uplo, VALUE,
- sizeof(int), &N, VALUE,
- sizeof(MORSE_Complex64_t)*NB*NB, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT,
- sizeof(int), &LDA, VALUE,
- sizeof(double)*szeW, NULL, SCRATCH,
- sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
- 0);
+ int szeW = chameleon_max( 1, N );
+ QUARK_Insert_Task(
+ opt->quark, CORE_zlanhe_quark, (Quark_Task_Flags*)opt,
+ sizeof(MORSE_enum), &norm, VALUE,
+ sizeof(MORSE_enum), &uplo, VALUE,
+ sizeof(int), &N, VALUE,
+ sizeof(MORSE_Complex64_t)*NB*NB, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT,
+ sizeof(int), &LDA, VALUE,
+ sizeof(double)*szeW, NULL, SCRATCH,
+ sizeof(double), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
+ 0);
}
void CORE_zlanhe_quark(Quark *quark)
diff --git a/runtime/quark/codelets/codelet_zlansy.c b/runtime/quark/codelets/codelet_zlansy.c
index 3aaf510c4..43e2132e1 100644
--- a/runtime/quark/codelets/codelet_zlansy.c
+++ b/runtime/quark/codelets/codelet_zlansy.c
@@ -36,8 +36,9 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options,
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_LANSY;
- int szeW = max( 1, N );
- QUARK_Insert_Task(opt->quark, CORE_zlansy_quark, (Quark_Task_Flags*)opt,
+ int szeW = chameleon_max( 1, N );
+ QUARK_Insert_Task(
+ opt->quark, CORE_zlansy_quark, (Quark_Task_Flags*)opt,
sizeof(MORSE_enum), &norm, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &N, VALUE,
diff --git a/runtime/quark/codelets/codelet_zlantr.c b/runtime/quark/codelets/codelet_zlantr.c
index b964eb3aa..a6d0009b5 100644
--- a/runtime/quark/codelets/codelet_zlantr.c
+++ b/runtime/quark/codelets/codelet_zlantr.c
@@ -34,8 +34,9 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options,
{
quark_option_t *opt = (quark_option_t*)(options->schedopt);
DAG_CORE_LANTR;
- int szeW = max( 1, N );
- QUARK_Insert_Task(opt->quark, CORE_zlantr_quark, (Quark_Task_Flags*)opt,
+ int szeW = chameleon_max( 1, N );
+ QUARK_Insert_Task(
+ opt->quark, CORE_zlantr_quark, (Quark_Task_Flags*)opt,
sizeof(MORSE_enum), &norm, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &diag, VALUE,
diff --git a/timing/time_zgemm.c b/timing/time_zgemm.c
index c00f590c7..57e50ba0f 100644
--- a/timing/time_zgemm.c
+++ b/timing/time_zgemm.c
@@ -26,13 +26,13 @@
#include "timing_zauxiliary.h"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_Complex64_t alpha, beta;
PASTE_CODE_IPARAM_LOCALS( iparam );
- LDB = max(K, iparam[IPARAM_LDB]);
- LDC = max(M, iparam[IPARAM_LDC]);
+ LDB = chameleon_max(K, iparam[IPARAM_LDB]);
+ LDC = chameleon_max(M, iparam[IPARAM_LDC]);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX( A, 1, MORSE_Complex64_t, LDA, K );
diff --git a/timing/time_zgemm_tile.c b/timing/time_zgemm_tile.c
index 95d0d0c3d..7bd1ba761 100644
--- a/timing/time_zgemm_tile.c
+++ b/timing/time_zgemm_tile.c
@@ -26,14 +26,14 @@
#include "timing_zauxiliary.h"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_Complex64_t alpha, beta;
PASTE_CODE_IPARAM_LOCALS( iparam );
- LDB = max(K, iparam[IPARAM_LDB]);
- LDC = max(M, iparam[IPARAM_LDC]);
+ LDB = chameleon_max(K, iparam[IPARAM_LDB]);
+ LDC = chameleon_max(M, iparam[IPARAM_LDC]);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, M, K );
diff --git a/timing/time_zgetrf_incpiv.c b/timing/time_zgetrf_incpiv.c
index de0568592..28a5814dd 100644
--- a/timing/time_zgetrf_incpiv.c
+++ b/timing/time_zgetrf_incpiv.c
@@ -26,7 +26,7 @@
#include "timing_zauxiliary.h"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_desc_t *L;
int *piv;
@@ -44,7 +44,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
MORSE_zplrnt(M, N, A, LDA, 3456);
/* Allocate Workspace */
- MORSE_Alloc_Workspace_zgesv_incpiv( min(M,N), &L, &piv, P, Q);
+ MORSE_Alloc_Workspace_zgesv_incpiv( chameleon_min(M,N), &L, &piv, P, Q);
/* Save AT in lapack layout for check */
PASTE_CODE_ALLOCATE_COPY( Acpy, check, MORSE_Complex64_t, A, LDA, N );
@@ -63,8 +63,8 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
MORSE_zgetrs_incpiv( MorseNoTrans, N, NRHS, A, LDA, L, piv, X, LDB );
dparam[IPARAM_RES] = z_check_solution(M, N, NRHS, Acpy, LDA, B, X, LDB,
- &(dparam[IPARAM_ANORM]),
- &(dparam[IPARAM_BNORM]),
+ &(dparam[IPARAM_ANORM]),
+ &(dparam[IPARAM_BNORM]),
&(dparam[IPARAM_XNORM]));
free( Acpy ); free( B ); free( X );
diff --git a/timing/time_zgetrf_incpiv_tile.c b/timing/time_zgetrf_incpiv_tile.c
index 0aea8a953..907f53ac3 100644
--- a/timing/time_zgetrf_incpiv_tile.c
+++ b/timing/time_zgetrf_incpiv_tile.c
@@ -25,7 +25,7 @@
#include "./timing.c"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_desc_t *descL;
int *piv;
@@ -52,7 +52,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
MORSE_zplrnt_Tile(descA, 3456);
/* Allocate Workspace */
- MORSE_Alloc_Workspace_zgesv_incpiv_Tile(min(M,N), &descL, &piv, P, Q);
+ MORSE_Alloc_Workspace_zgesv_incpiv_Tile(chameleon_min(M,N), &descL, &piv, P, Q);
/* Save A for check */
if (check == 1){
diff --git a/timing/time_zgetrs_incpiv_tile.c b/timing/time_zgetrs_incpiv_tile.c
index 491da4f43..3ba081e9c 100644
--- a/timing/time_zgetrs_incpiv_tile.c
+++ b/timing/time_zgetrs_incpiv_tile.c
@@ -25,7 +25,7 @@
#include "./timing.c"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_desc_t *descL;
int *piv;
@@ -53,7 +53,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
MORSE_zplrnt_Tile(descA, 3456);
/* Allocate Workspace */
- MORSE_Alloc_Workspace_zgesv_incpiv_Tile(min(M,N), &descL, &piv, P, Q);
+ MORSE_Alloc_Workspace_zgesv_incpiv_Tile(chameleon_min(M,N), &descL, &piv, P, Q);
/* Save A for check */
if (check == 1){
diff --git a/timing/time_zheevd_tile.c b/timing/time_zheevd_tile.c
index d659b8213..56b08fa76 100644
--- a/timing/time_zheevd_tile.c
+++ b/timing/time_zheevd_tile.c
@@ -34,7 +34,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
int vec = MorseVec;
int INFO;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX( A, 1, MORSE_Complex64_t, LDA, N);
diff --git a/timing/time_zlange.c b/timing/time_zlange.c
index 502ceee3c..25ffb9569 100644
--- a/timing/time_zlange.c
+++ b/timing/time_zlange.c
@@ -45,7 +45,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
/* Check the solution */
if ( check )
{
- double *work = (double*) malloc(max(M,N)*sizeof(double));
+ double *work = (double*) malloc(chameleon_max(M,N)*sizeof(double));
normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(norm), M, N, A, LDA, work);
result = fabs(normmorse - normlapack);
switch(norm) {
diff --git a/timing/time_zlange_tile.c b/timing/time_zlange_tile.c
index 36af154fe..a12174a94 100644
--- a/timing/time_zlange_tile.c
+++ b/timing/time_zlange_tile.c
@@ -47,7 +47,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
/* Allocate Data */
PASTE_TILE_TO_LAPACK( descA, A, check, MORSE_Complex64_t, M, N );
- double *work = (double*) malloc(max(M,N)*sizeof(double));
+ double *work = (double*) malloc(chameleon_max(M,N)*sizeof(double));
normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(norm), M, N, A, LDA, work);
result = fabs(normmorse - normlapack);
switch(norm) {
diff --git a/timing/time_zposv.c b/timing/time_zposv.c
index 979a2f530..67af772cf 100644
--- a/timing/time_zposv.c
+++ b/timing/time_zposv.c
@@ -26,17 +26,17 @@
#include "timing_zauxiliary.h"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
PASTE_CODE_IPARAM_LOCALS( iparam );
MORSE_enum uplo = MorseUpper;
-
- LDA = max(LDA, N);
-
+
+ LDA = chameleon_max(LDA, N);
+
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX( A, 1, MORSE_Complex64_t, LDA, N );
PASTE_CODE_ALLOCATE_MATRIX( X, 1, MORSE_Complex64_t, LDB, NRHS );
-
+
/* Initialiaze Data */
MORSE_zplghe((double)N, MorseUpperLower, N, A, LDA, 51 );
MORSE_zplrnt( N, NRHS, X, LDB, 5673 );
@@ -54,13 +54,13 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
if (check)
{
dparam[IPARAM_RES] = z_check_solution(N, N, NRHS, Acpy, LDA, B, X, LDB,
- &(dparam[IPARAM_ANORM]),
- &(dparam[IPARAM_BNORM]),
+ &(dparam[IPARAM_ANORM]),
+ &(dparam[IPARAM_BNORM]),
&(dparam[IPARAM_XNORM]));
free(Acpy); free(B);
}
- free(A); free(X);
+ free(A); free(X);
return 0;
}
diff --git a/timing/time_zposv_tile.c b/timing/time_zposv_tile.c
index 205e06ae8..319f70e64 100644
--- a/timing/time_zposv_tile.c
+++ b/timing/time_zposv_tile.c
@@ -30,7 +30,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
PASTE_CODE_IPARAM_LOCALS( iparam );
MORSE_enum uplo = MorseUpper;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, N, N );
diff --git a/timing/time_zpotrf.c b/timing/time_zpotrf.c
index 0f4d46619..6a242c229 100644
--- a/timing/time_zpotrf.c
+++ b/timing/time_zpotrf.c
@@ -31,7 +31,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
PASTE_CODE_IPARAM_LOCALS( iparam );
int uplo = MorseLower;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX( A, 1, MORSE_Complex64_t, LDA, N );
diff --git a/timing/time_zpotrf_tile.c b/timing/time_zpotrf_tile.c
index 14fdc32fc..475aea694 100644
--- a/timing/time_zpotrf_tile.c
+++ b/timing/time_zpotrf_tile.c
@@ -30,7 +30,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
PASTE_CODE_IPARAM_LOCALS( iparam );
int uplo = MorseUpper;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, N, N );
diff --git a/timing/time_zpotri_tile.c b/timing/time_zpotri_tile.c
index a8e8bcab4..07ef6007f 100644
--- a/timing/time_zpotri_tile.c
+++ b/timing/time_zpotri_tile.c
@@ -27,19 +27,19 @@
#include "./timing.c"
static int
-RunTest(int *iparam, double *dparam, morse_time_t *t_)
+RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
PASTE_CODE_IPARAM_LOCALS( iparam );
MORSE_enum uplo = MorseLower;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, N, N );
- /*
- * Initialize Data
- * It's done in static to avoid having the same sequence than one
+ /*
+ * Initialize Data
+ * It's done in static to avoid having the same sequence than one
* the function we want to trace
*/
MORSE_zplghe_Tile( (double)N, MorseUpperLower, descA, 51 );
diff --git a/timing/time_zpotrs_tile.c b/timing/time_zpotrs_tile.c
index c50e86b05..131393d41 100644
--- a/timing/time_zpotrs_tile.c
+++ b/timing/time_zpotrs_tile.c
@@ -30,7 +30,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
PASTE_CODE_IPARAM_LOCALS( iparam );
int uplo = MorseUpper;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
check = 1;
/* Allocate Data */
diff --git a/timing/time_zsytrf_tile.c b/timing/time_zsytrf_tile.c
index 6c1d880ed..b3ea2ab4b 100644
--- a/timing/time_zsytrf_tile.c
+++ b/timing/time_zsytrf_tile.c
@@ -30,7 +30,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
PASTE_CODE_IPARAM_LOCALS( iparam );
int uplo = MorseUpper;
- LDA = max(LDA, N);
+ LDA = chameleon_max(LDA, N);
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, N, N );
diff --git a/timing/time_ztrsm.c b/timing/time_ztrsm.c
index 1216bb197..96413f96f 100644
--- a/timing/time_ztrsm.c
+++ b/timing/time_ztrsm.c
@@ -30,8 +30,8 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
{
MORSE_Complex64_t alpha;
PASTE_CODE_IPARAM_LOCALS( iparam );
-
- LDA = max( LDA, N );
+
+ LDA = chameleon_max( LDA, N );
/* Allocate Data */
PASTE_CODE_ALLOCATE_MATRIX( A, 1, MORSE_Complex64_t, LDA, N );
@@ -57,10 +57,10 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
/* Check the solution */
if (check)
{
- dparam[IPARAM_RES] = z_check_trsm( MorseLeft, MorseUpper, MorseNoTrans, MorseUnit,
+ dparam[IPARAM_RES] = z_check_trsm( MorseLeft, MorseUpper, MorseNoTrans, MorseUnit,
N, NRHS,
alpha, A, LDA, B, B2, LDB,
- &(dparam[IPARAM_ANORM]),
+ &(dparam[IPARAM_ANORM]),
&(dparam[IPARAM_BNORM]),
&(dparam[IPARAM_XNORM]));
free(B2);
diff --git a/timing/timing.c b/timing/timing.c
index 28bb1c23a..533fc41c1 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -700,9 +700,9 @@ main(int argc, char *argv[]) {
{
if ( nx > 0 ) {
iparam[IPARAM_M] = i;
- iparam[IPARAM_N] = max(1, i/nx);
+ iparam[IPARAM_N] = chameleon_max(1, i/nx);
} else if ( mx > 0 ) {
- iparam[IPARAM_M] = max(1, i/mx);
+ iparam[IPARAM_M] = chameleon_max(1, i/mx);
iparam[IPARAM_N] = i;
} else {
if ( m == -1 )
diff --git a/timing/timing.h b/timing/timing.h
index 948866a77..fd2ac6ac3 100644
--- a/timing/timing.h
+++ b/timing/timing.h
@@ -86,9 +86,9 @@ enum dparam_timing {
int64_t N = iparam[IPARAM_N]; \
int64_t K = iparam[IPARAM_K]; \
int64_t NRHS = K; \
- int64_t LDA = max(M, iparam[IPARAM_LDA]); \
- int64_t LDB = max(N, iparam[IPARAM_LDB]); \
- int64_t LDC = max(K, iparam[IPARAM_LDC]); \
+ int64_t LDA = chameleon_max(M, iparam[IPARAM_LDA]); \
+ int64_t LDB = chameleon_max(N, iparam[IPARAM_LDB]); \
+ int64_t LDC = chameleon_max(K, iparam[IPARAM_LDC]); \
int64_t IB = iparam[IPARAM_IB]; \
int64_t MB = iparam[IPARAM_MB]; \
int64_t NB = iparam[IPARAM_NB]; \
diff --git a/timing/timing_zauxiliary.c b/timing/timing_zauxiliary.c
index 45c844251..2d9dba18d 100644
--- a/timing/timing_zauxiliary.c
+++ b/timing/timing_zauxiliary.c
@@ -33,7 +33,7 @@ int z_check_orthogonality(int M, int N, int LDQ, MORSE_Complex64_t *Q)
double normQ;
int info_ortho;
int i;
- int minMN = min(M, N);
+ int minMN = chameleon_min(M, N);
double eps;
double *work = (double *)malloc(minMN*sizeof(double));
@@ -89,7 +89,7 @@ int z_check_QRfactorization(int M, int N, MORSE_Complex64_t *A1, MORSE_Complex64
MORSE_Complex64_t *Ql = (MORSE_Complex64_t *)malloc(M*N*sizeof(MORSE_Complex64_t));
MORSE_Complex64_t *Residual = (MORSE_Complex64_t *)malloc(M*N*sizeof(MORSE_Complex64_t));
- double *work = (double *)malloc(max(M,N)*sizeof(double));
+ double *work = (double *)malloc(chameleon_max(M,N)*sizeof(double));
alpha=1.0;
beta=0.0;
@@ -226,7 +226,7 @@ double z_check_gemm(MORSE_enum transA, MORSE_enum transB, int M, int N, int K,
{
MORSE_Complex64_t beta_const = -1.0;
double Rnorm;
- double *work = (double *)malloc(max(K,max(M, N))* sizeof(double));
+ double *work = (double *)malloc(chameleon_max(K,chameleon_max(M, N))* sizeof(double));
*Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'I', M, N, Cref, LDC, work);
*Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'I', M, N, Cmorse, LDC, work);
@@ -256,7 +256,7 @@ double z_check_trsm(MORSE_enum side, MORSE_enum uplo, MORSE_enum trans, MORSE_en
{
MORSE_Complex64_t beta_const = -1.0;
double Rnorm;
- double *work = (double *)malloc(max(M, NRHS)* sizeof(double));
+ double *work = (double *)malloc(chameleon_max(M, NRHS)* sizeof(double));
/*double eps = LAPACKE_dlamch_work('e');*/
*Binitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'i', M, NRHS, Bref, LDB, work);
@@ -272,7 +272,7 @@ double z_check_trsm(MORSE_enum side, MORSE_enum uplo, MORSE_enum trans, MORSE_en
Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'i', M, NRHS, Bref, LDB, work);
Rnorm = Rnorm / *Blapacknorm;
- /* max(M,NRHS) * eps);*/
+ /* chameleon_max(M,NRHS) * eps);*/
free(work);
@@ -291,7 +291,7 @@ double z_check_solution(int M, int N, int NRHS, MORSE_Complex64_t *A, int LDA,
double Rnorm = -1.00;
MORSE_Complex64_t zone = 1.0;
MORSE_Complex64_t mzone = -1.0;
- double *work = (double *)malloc(max(M, N)* sizeof(double));
+ double *work = (double *)malloc(chameleon_max(M, N)* sizeof(double));
*anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'I', M, N, A, LDA, work);
*xnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, 'I', M, NRHS, X, LDB, work);
--
GitLab