Browse Source

Add early returns

tags/v0.3.11^2
Martin Kroeker GitHub 5 years ago
parent
commit
d64cc2be81
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
  1. +11
    -4
      relapack/src/sgetrf.c
  2. +2
    -1
      relapack/src/ssytrf.c
  3. +3
    -2
      relapack/src/ssytrf_rook.c
  4. +5
    -0
      relapack/src/strsyl.c

+ 11
- 4
relapack/src/sgetrf.c View File

@@ -14,7 +14,6 @@ void RELAPACK_sgetrf(
float *A, const blasint *ldA, blasint *ipiv,
blasint *info
) {

// Check arguments
*info = 0;
if (*m < 0)
@@ -28,6 +27,9 @@ void RELAPACK_sgetrf(
LAPACK(xerbla)("SGETRF", &minfo, strlen("SGETRF"));
return;
}

if (*m == 0 || *n == 0) return;

const blasint sn = MIN(*m, *n);
RELAPACK_sgetrf_rec(m, &sn, A, ldA, ipiv, info);

@@ -35,7 +37,7 @@ void RELAPACK_sgetrf(
if (*m < *n) {
// Constants
const float ONE[] = { 1. };
const blasint iONE[] = { 1. };
const blasint iONE[] = { 1 };

// Splitting
const blasint rn = *n - *m;
@@ -58,9 +60,12 @@ static void RELAPACK_sgetrf_rec(
float *A, const blasint *ldA, blasint *ipiv,
blasint *info
) {
if (*n <= MAX(CROSSOVER_SGETRF, 1)) {

if (*m == 0 || *n == 0) return;

if ( *n <= MAX(CROSSOVER_SGETRF, 1)) {
// Unblocked
LAPACK(sgetf2)(m, n, A, ldA, ipiv, info);
LAPACK(sgetrf2)(m, n, A, ldA, ipiv, info);
return;
}

@@ -91,6 +96,8 @@ static void RELAPACK_sgetrf_rec(

// recursion(A_L, ipiv_T)
RELAPACK_sgetrf_rec(m, &n1, A_L, ldA, ipiv_T, info);
if (*info)
return;
// apply pivots to A_R
LAPACK(slaswp)(&n2, A_R, ldA, iONE, &n1, ipiv_T, iONE);



+ 2
- 1
relapack/src/ssytrf.c View File

@@ -35,7 +35,7 @@ void RELAPACK_ssytrf(
*info = -2;
else if (*ldA < MAX(1, *n))
*info = -4;
else if (*lWork < minlWork && *lWork != -1)
else if ((*lWork <1 || *lWork < minlWork) && *lWork != -1)
*info = -7;
else if (*lWork == -1) {
// Work size query
@@ -66,6 +66,7 @@ void RELAPACK_ssytrf(
blasint nout;

// Recursive kernel
if (*n != 0)
RELAPACK_ssytrf_rec(&cleanuplo, n, n, &nout, A, ldA, ipiv, cleanWork, n, info);

#if XSYTRF_ALLOW_MALLOC


+ 3
- 2
relapack/src/ssytrf_rook.c View File

@@ -36,7 +36,7 @@ void RELAPACK_ssytrf_rook(
*info = -2;
else if (*ldA < MAX(1, *n))
*info = -4;
else if (*lWork < minlWork && *lWork != -1)
else if ((*lWork < 1 ||*lWork < minlWork) && *lWork != -1)
*info = -7;
else if (*lWork == -1) {
// Work size query
@@ -56,7 +56,7 @@ void RELAPACK_ssytrf_rook(

if (*info) {
const blasint minfo = -*info;
LAPACK(xerbla)("SSYTRF", &minfo, strlen("SSYTRF"));
LAPACK(xerbla)("SSYTRF_ROOK", &minfo, strlen("SSYTRF_ROOK"));
return;
}

@@ -67,6 +67,7 @@ void RELAPACK_ssytrf_rook(
blasint nout;

// Recursive kernel
if (*n != 0)
RELAPACK_ssytrf_rook_rec(&cleanuplo, n, n, &nout, A, ldA, ipiv, cleanWork, n, info);

#if XSYTRF_ALLOW_MALLOC


+ 5
- 0
relapack/src/strsyl.c View File

@@ -49,6 +49,11 @@ void RELAPACK_strsyl(
return;
}

if (*m == 0 || *n == 0) {
*scale = 1.;
return;
}

// Clean char * arguments
const char cleantranA = notransA ? 'N' : (transA ? 'T' : 'C');
const char cleantranB = notransB ? 'N' : (transB ? 'T' : 'C');


Loading…
Cancel
Save