Browse Source

Merge pull request #3193 from martin-frbg/lapack538

Apply lapack-testing fixes from Reference-LAPACK PR538
tags/v0.3.15
Martin Kroeker GitHub 5 years ago
parent
commit
a6c2cb8417
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 32 deletions
  1. +4
    -3
      lapack-netlib/TESTING/LIN/cdrvgex.f
  2. +5
    -5
      lapack-netlib/TESTING/LIN/cdrvhe_aa_2stage.f
  3. +4
    -4
      lapack-netlib/TESTING/LIN/cdrvrfp.f
  4. +1
    -2
      lapack-netlib/TESTING/LIN/ddrvrfp.f
  5. +1
    -1
      lapack-netlib/TESTING/LIN/sdrvrfp.f
  6. +4
    -3
      lapack-netlib/TESTING/LIN/zdrvgex.f
  7. +4
    -4
      lapack-netlib/TESTING/LIN/zdrvhex.f
  8. +4
    -4
      lapack-netlib/TESTING/LIN/zdrvpox.f
  9. +1
    -1
      lapack-netlib/TESTING/LIN/zdrvrfp.f
  10. +4
    -4
      lapack-netlib/TESTING/LIN/zdrvsyx.f
  11. +1
    -1
      lapack-netlib/TESTING/LIN/zerrvxx.f

+ 4
- 3
lapack-netlib/TESTING/LIN/cdrvgex.f View File

@@ -707,9 +707,10 @@
CALL CLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA ) CALL CLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA )


IF( .NOT.PREFAC ) IF( .NOT.PREFAC )
$ CALL CLASET( 'Full', N, N, ZERO, ZERO, AFAC,
$ LDA )
CALL CLASET( 'Full', N, NRHS, ZERO, ZERO, X, LDA )
$ CALL CLASET( 'Full', N, N, CMPLX( ZERO ),
$ CMPLX( ZERO ), AFAC, LDA )
CALL CLASET( 'Full', N, NRHS, CMPLX( ZERO ),
$ CMPLX( ZERO ), X, LDA )
IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN
* *
* Equilibrate the matrix if FACT = 'F' and * Equilibrate the matrix if FACT = 'F' and


+ 5
- 5
lapack-netlib/TESTING/LIN/cdrvhe_aa_2stage.f View File

@@ -449,11 +449,11 @@
* Reconstruct matrix from factors and compute * Reconstruct matrix from factors and compute
* residual. * residual.
* *
c CALL CHET01_AA( UPLO, N, A, LDA, AFAC, LDA,
c $ IWORK, AINV, LDA, RWORK,
c $ RESULT( 2 ) )
c NT = 2
NT = 1
c CALL CHET01_AA( UPLO, N, A, LDA, AFAC, LDA,
c $ IWORK, AINV, LDA, RWORK,
c $ RESULT( 2 ) )
c NT = 2
NT = 1
* *
* Print information about the tests that did not pass * Print information about the tests that did not pass
* the threshold. * the threshold.


+ 4
- 4
lapack-netlib/TESTING/LIN/cdrvrfp.f View File

@@ -449,19 +449,19 @@
* Form the inverse of A. * Form the inverse of A.
* *
CALL CPOTRI( UPLO, N, A, LDA, INFO ) CALL CPOTRI( UPLO, N, A, LDA, INFO )

IF ( N .NE. 0 ) THEN
* *
* Compute the 1-norm condition number of A.
* Compute the 1-norm condition number of A.
* *
IF ( N .NE. 0 ) THEN
AINVNM = CLANHE( '1', UPLO, N, A, LDA, AINVNM = CLANHE( '1', UPLO, N, A, LDA,
+ S_WORK_CLANHE ) + S_WORK_CLANHE )
RCONDC = ( ONE / ANORM ) / AINVNM RCONDC = ( ONE / ANORM ) / AINVNM
* *
* Restore the matrix A. * Restore the matrix A.
* *
CALL CLACPY( UPLO, N, N, ASAV, LDA, A, LDA )
CALL CLACPY( UPLO, N, N, ASAV, LDA, A, LDA )
END IF END IF

* *
END IF END IF
* *


+ 1
- 2
lapack-netlib/TESTING/LIN/ddrvrfp.f View File

@@ -443,8 +443,7 @@
* *
CALL DPOTRI( UPLO, N, A, LDA, INFO ) CALL DPOTRI( UPLO, N, A, LDA, INFO )


IF ( N .NE. 0 ) THEN

IF ( N .NE. 0 ) THEN
* *
* Compute the 1-norm condition number of A. * Compute the 1-norm condition number of A.
* *


+ 1
- 1
lapack-netlib/TESTING/LIN/sdrvrfp.f View File

@@ -443,7 +443,7 @@
* *
CALL SPOTRI( UPLO, N, A, LDA, INFO ) CALL SPOTRI( UPLO, N, A, LDA, INFO )


IF ( N .NE. 0 ) THEN
IF ( N .NE. 0 ) THEN
* *
* Compute the 1-norm condition number of A. * Compute the 1-norm condition number of A.
* *


+ 4
- 3
lapack-netlib/TESTING/LIN/zdrvgex.f View File

@@ -707,9 +707,10 @@
CALL ZLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA ) CALL ZLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA )


IF( .NOT.PREFAC ) IF( .NOT.PREFAC )
$ CALL ZLASET( 'Full', N, N, ZERO, ZERO, AFAC,
$ LDA )
CALL ZLASET( 'Full', N, NRHS, ZERO, ZERO, X, LDA )
$ CALL ZLASET( 'Full', N, N, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), X, LDA )
IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN
* *
* Equilibrate the matrix if FACT = 'F' and * Equilibrate the matrix if FACT = 'F' and


+ 4
- 4
lapack-netlib/TESTING/LIN/zdrvhex.f View File

@@ -599,10 +599,10 @@
* Restore the matrices A and B. * Restore the matrices A and B.
* *
IF( IFACT.EQ.2 ) IF( IFACT.EQ.2 )
$ CALL ZLASET( UPLO, N, N, CMPLX( ZERO ),
$ CMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, CMPLX( ZERO ),
$ CMPLX( ZERO ), X, LDA )
$ CALL ZLASET( UPLO, N, N, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), X, LDA )
* *
* Solve the system and compute the condition number * Solve the system and compute the condition number
* and error bounds using ZHESVXX. * and error bounds using ZHESVXX.


+ 4
- 4
lapack-netlib/TESTING/LIN/zdrvpox.f View File

@@ -611,10 +611,10 @@
CALL ZLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA ) CALL ZLACPY( 'Full', N, NRHS, BSAV, LDA, B, LDA )


IF( .NOT.PREFAC ) IF( .NOT.PREFAC )
$ CALL ZLASET( UPLO, N, N, CMPLX( ZERO ),
$ CMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, CMPLX( ZERO ),
$ CMPLX( ZERO ), X, LDA )
$ CALL ZLASET( UPLO, N, N, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), X, LDA )
IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN IF( IEQUED.GT.1 .AND. N.GT.0 ) THEN
* *
* Equilibrate the matrix if FACT='F' and * Equilibrate the matrix if FACT='F' and


+ 1
- 1
lapack-netlib/TESTING/LIN/zdrvrfp.f View File

@@ -450,7 +450,7 @@
* *
CALL ZPOTRI( UPLO, N, A, LDA, INFO ) CALL ZPOTRI( UPLO, N, A, LDA, INFO )


IF ( N .NE. 0 ) THEN
IF ( N .NE. 0 ) THEN
* *
* Compute the 1-norm condition number of A. * Compute the 1-norm condition number of A.
* *


+ 4
- 4
lapack-netlib/TESTING/LIN/zdrvsyx.f View File

@@ -605,10 +605,10 @@
* Restore the matrices A and B. * Restore the matrices A and B.
* *
IF( IFACT.EQ.2 ) IF( IFACT.EQ.2 )
$ CALL ZLASET( UPLO, N, N, CMPLX( ZERO ),
$ CMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, CMPLX( ZERO ),
$ CMPLX( ZERO ), X, LDA )
$ CALL ZLASET( UPLO, N, N, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), AFAC, LDA )
CALL ZLASET( 'Full', N, NRHS, DCMPLX( ZERO ),
$ DCMPLX( ZERO ), X, LDA )
* *
* Solve the system and compute the condition number * Solve the system and compute the condition number
* and error bounds using ZSYSVXX. * and error bounds using ZSYSVXX.


+ 1
- 1
lapack-netlib/TESTING/LIN/zerrvxx.f View File

@@ -1166,7 +1166,7 @@
$ 2, RCOND, RPVGRW, BERR, N_ERR_BNDS, ERR_BNDS_N, $ 2, RCOND, RPVGRW, BERR, N_ERR_BNDS, ERR_BNDS_N,
$ ERR_BNDS_C, NPARAMS, PARAMS, W, RW, INFO ) $ ERR_BNDS_C, NPARAMS, PARAMS, W, RW, INFO )
CALL CHKXER( 'ZSYSVXX', INFOT, NOUT, LERR, OK ) CALL CHKXER( 'ZSYSVXX', INFOT, NOUT, LERR, OK )
INFOT = 13
INFOT = 13
EQ = 'N' EQ = 'N'
CALL ZSYSVXX( 'N', 'U', 2, 0, A, 2, AF, 2, IP, EQ, R, B, 1, X, CALL ZSYSVXX( 'N', 'U', 2, 0, A, 2, AF, 2, IP, EQ, R, B, 1, X,
$ 2, RCOND, RPVGRW, BERR, N_ERR_BNDS, ERR_BNDS_N, $ 2, RCOND, RPVGRW, BERR, N_ERR_BNDS, ERR_BNDS_N,


Loading…
Cancel
Save