From fd22c60c6c73fa314ec00f6456e7c17bacab5a3b Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 30 Jan 2018 11:42:21 +0100
Subject: [PATCH] Fix previous commit
---
compute/zgeadd.c | 4 ++--
compute/zgemm.c | 8 ++++----
compute/ztradd.c | 4 ++--
compute/ztrmm.c | 2 +-
compute/ztrsm.c | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/compute/zgeadd.c b/compute/zgeadd.c
index 98ddf3b1c..8a93c40fe 100644
--- a/compute/zgeadd.c
+++ b/compute/zgeadd.c
@@ -111,7 +111,7 @@ int MORSE_zgeadd( MORSE_enum trans, int M, int N,
}
/* Check input arguments */
- if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+ if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
morse_error("MORSE_zgeadd", "illegal value of trans");
return -1;
}
@@ -324,7 +324,7 @@ int MORSE_zgeadd_Tile_Async( MORSE_enum trans,
return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
}
/* Check input arguments */
- if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+ if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
morse_error("MORSE_zgeadd_Tile_Async", "illegal value of trans");
return morse_request_fail(sequence, request, -1);
}
diff --git a/compute/zgemm.c b/compute/zgemm.c
index 8a5028c0e..bf527b5ed 100644
--- a/compute/zgemm.c
+++ b/compute/zgemm.c
@@ -152,11 +152,11 @@ int MORSE_zgemm( MORSE_enum transA, MORSE_enum transB, int M, int N, int K,
}
/* Check input arguments */
- if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+ if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
morse_error("MORSE_zgemm", "illegal value of transA");
return -1;
}
- if ((transB >= MorseNoTrans) && (transB <= MorseConjTrans)) {
+ if (((transB < MorseNoTrans) || (transB > MorseConjTrans))) {
morse_error("MORSE_zgemm", "illegal value of transB");
return -2;
}
@@ -401,11 +401,11 @@ int MORSE_zgemm_Tile_Async( MORSE_enum transA, MORSE_enum transB,
return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
}
/* Check input arguments */
- if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+ if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
morse_error("MORSE_zgemm_Tile_Async", "illegal value of transA");
return morse_request_fail(sequence, request, -1);
}
- if ((transB >= MorseNoTrans) && (transB <= MorseConjTrans)) {
+ if (((transB < MorseNoTrans) || (transB > MorseConjTrans))) {
morse_error("MORSE_zgemm_Tile_Async", "illegal value of transB");
return morse_request_fail(sequence, request, -2);
}
diff --git a/compute/ztradd.c b/compute/ztradd.c
index 7727842ca..02f1a7d6e 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -121,7 +121,7 @@ int MORSE_ztradd( MORSE_enum uplo, MORSE_enum trans, int M, int N,
morse_error("MORSE_ztradd", "illegal value of uplo");
return -1;
}
- if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+ if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
morse_error("MORSE_ztradd", "illegal value of trans");
return -2;
}
@@ -340,7 +340,7 @@ int MORSE_ztradd_Tile_Async( MORSE_enum uplo, MORSE_enum trans,
return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
}
/* Check input arguments */
- if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+ if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
morse_error("MORSE_ztradd_Tile_Async", "illegal value of trans");
return morse_request_fail(sequence, request, -1);
}
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index 1cb08351d..2c7e51ddf 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -371,7 +371,7 @@ int MORSE_ztrmm_Tile_Async( MORSE_enum side, MORSE_enum uplo,
morse_error("MORSE_ztrmm_Tile", "illegal value of uplo");
return morse_request_fail(sequence, request, -2);
}
- if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+ if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
morse_error("MORSE_ztrmm_Tile", "illegal value of transA");
return morse_request_fail(sequence, request, -3);
}
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 35c41dcac..dfa1fb565 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -136,7 +136,7 @@ int MORSE_ztrsm( MORSE_enum side, MORSE_enum uplo,
morse_error("MORSE_ztrsm", "illegal value of uplo");
return -2;
}
- if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans) ) {
+ if (((transA < MorseNoTrans) || (transA > MorseConjTrans)) ) {
morse_error("MORSE_ztrsm", "illegal value of transA");
return -3;
}
@@ -369,7 +369,7 @@ int MORSE_ztrsm_Tile_Async( MORSE_enum side, MORSE_enum uplo,
morse_error("MORSE_ztrsm_Tile", "illegal value of uplo");
return morse_request_fail(sequence, request, -2);
}
- if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+ if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
morse_error("MORSE_ztrsm_Tile", "illegal value of transA");
return morse_request_fail(sequence, request, -3);
}
--
GitLab