From 99acde87ecf9e8edf6d2a2a074efa1b09414fb48 Mon Sep 17 00:00:00 2001 From: Ichitaro Yamazaki Date: Sat, 10 Jun 2017 23:11:11 -0400 Subject: [PATCH] skip "singularity" check in sytrf_aa tester --- TESTING/LIN/cchkhe_aa.f | 79 +++++++++++++++++++++-------------------- TESTING/LIN/cchksy_aa.f | 73 +++++++++++++++++++------------------ TESTING/LIN/dchksy_aa.f | 73 +++++++++++++++++++------------------ TESTING/LIN/schksy_aa.f | 69 ++++++++++++++++++----------------- TESTING/LIN/zchkhe_aa.f | 72 +++++++++++++++++++------------------ TESTING/LIN/zchksy_aa.f | 73 +++++++++++++++++++------------------ 6 files changed, 229 insertions(+), 210 deletions(-) diff --git a/TESTING/LIN/cchkhe_aa.f b/TESTING/LIN/cchkhe_aa.f index 8b6308c3da..78e7aa0f83 100644 --- a/TESTING/LIN/cchkhe_aa.f +++ b/TESTING/LIN/cchkhe_aa.f @@ -434,22 +434,22 @@ SUBROUTINE CCHKHE_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from CHETRF and handle error. * @@ -512,30 +512,33 @@ SUBROUTINE CCHKHE_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from CHETRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'CHETRS_AA', INFO, 0, - $ UPLO, N, N, -1, -1, NRHS, IMAT, - $ NFAIL, NERRS, NOUT ) - END IF -* - CALL CLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) -* -* Compute the residual for the solution -* - CALL CPOT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) -* -* Print information about the tests that did not pass -* the threshold. -* - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'CHETRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) END IF - 120 CONTINUE + ELSE + CALL CLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) +* +* Compute the residual for the solution +* + CALL CPOT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) +* +* Print information about the tests that did not pass +* the threshold. +* + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL. diff --git a/TESTING/LIN/cchksy_aa.f b/TESTING/LIN/cchksy_aa.f index 0b29117bdb..f451650078 100644 --- a/TESTING/LIN/cchksy_aa.f +++ b/TESTING/LIN/cchksy_aa.f @@ -435,22 +435,22 @@ SUBROUTINE CCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from CSYTRF and handle error. * @@ -514,31 +514,34 @@ SUBROUTINE CCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from CSYTRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'CSYTRS_AA', INFO, 0, - $ UPLO, N, N, -1, -1, NRHS, IMAT, - $ NFAIL, NERRS, NOUT ) - END IF -* - CALL CLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'CSYTRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) + END IF + ELSE + CALL CLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) * -* Compute the residual for the solution +* Compute the residual for the solution * - CALL CSYT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) + CALL CSYT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) * * -* Print information about the tests that did not pass -* the threshold. +* Print information about the tests that did not pass +* the threshold. * - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 - END IF - 120 CONTINUE + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL. diff --git a/TESTING/LIN/dchksy_aa.f b/TESTING/LIN/dchksy_aa.f index f30495aa9d..c9db46ad23 100644 --- a/TESTING/LIN/dchksy_aa.f +++ b/TESTING/LIN/dchksy_aa.f @@ -432,22 +432,22 @@ SUBROUTINE DCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from DSYTRF and handle error. * @@ -511,31 +511,34 @@ SUBROUTINE DCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from DSYTRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'DSYTRS_AA', INFO, 0, - $ UPLO, N, N, -1, -1, NRHS, IMAT, - $ NFAIL, NERRS, NOUT ) - END IF -* - CALL DLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'DSYTRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) + END IF + ELSE + CALL DLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) * -* Compute the residual for the solution +* Compute the residual for the solution * - CALL DPOT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) + CALL DPOT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) * * -* Print information about the tests that did not pass -* the threshold. +* Print information about the tests that did not pass +* the threshold. * - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 - END IF - 120 CONTINUE + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL. diff --git a/TESTING/LIN/schksy_aa.f b/TESTING/LIN/schksy_aa.f index 304cfc4aed..4c09ca8565 100644 --- a/TESTING/LIN/schksy_aa.f +++ b/TESTING/LIN/schksy_aa.f @@ -433,22 +433,22 @@ SUBROUTINE SCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from SSYTRF and handle error. * @@ -512,31 +512,34 @@ SUBROUTINE SCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from SSYTRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'SSYTRS_AA', INFO, 0, - $ UPLO, N, N, -1, -1, NRHS, IMAT, - $ NFAIL, NERRS, NOUT ) - END IF -* - CALL SLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'SSYTRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) + END IF + ELSE + CALL SLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) * -* Compute the residual for the solution +* Compute the residual for the solution * - CALL SPOT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) + CALL SPOT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) * * * Print information about the tests that did not pass * the threshold. * - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 - END IF - 120 CONTINUE + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL. diff --git a/TESTING/LIN/zchkhe_aa.f b/TESTING/LIN/zchkhe_aa.f index 85d194ab6f..6bb01442a1 100644 --- a/TESTING/LIN/zchkhe_aa.f +++ b/TESTING/LIN/zchkhe_aa.f @@ -433,22 +433,22 @@ SUBROUTINE ZCHKHE_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from ZHETRF and handle error. * @@ -511,30 +511,34 @@ SUBROUTINE ZCHKHE_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from ZHETRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'ZHETRS', INFO, 0, UPLO, N, - $ N, -1, -1, NRHS, IMAT, NFAIL, - $ NERRS, NOUT ) - END IF + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'ZHETRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) + END IF + ELSE * - CALL ZLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) + CALL ZLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) * -* Compute the residual for the solution +* Compute the residual for the solution * - CALL ZPOT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) + CALL ZPOT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) * -* Print information about the tests that did not pass -* the threshold. +* Print information about the tests that did not pass +* the threshold. * - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 - END IF - 120 CONTINUE + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL. diff --git a/TESTING/LIN/zchksy_aa.f b/TESTING/LIN/zchksy_aa.f index ff4f6bead8..52e7d1e5bb 100644 --- a/TESTING/LIN/zchksy_aa.f +++ b/TESTING/LIN/zchksy_aa.f @@ -435,22 +435,22 @@ SUBROUTINE ZCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Adjust the expected value of INFO to account for * pivoting. * - IF( IZERO.GT.0 ) THEN - J = 1 - K = IZERO - 100 CONTINUE - IF( J.EQ.K ) THEN - K = IWORK( J ) - ELSE IF( IWORK( J ).EQ.K ) THEN - K = J - END IF - IF( J.LT.K ) THEN - J = J + 1 - GO TO 100 - END IF - ELSE +c IF( IZERO.GT.0 ) THEN +c J = 1 +c K = IZERO +c 100 CONTINUE +c IF( J.EQ.K ) THEN +c K = IWORK( J ) +c ELSE IF( IWORK( J ).EQ.K ) THEN +c K = J +c END IF +c IF( J.LT.K ) THEN +c J = J + 1 +c GO TO 100 +c END IF +c ELSE K = 0 - END IF +c END IF * * Check error code from ZSYTRF and handle error. * @@ -514,31 +514,34 @@ SUBROUTINE ZCHKSY_AA( DOTYPE, NN, NVAL, NNB, NBVAL, NNS, NSVAL, * Check error code from ZSYTRS and handle error. * IF( INFO.NE.0 ) THEN - CALL ALAERH( PATH, 'ZSYTRS_AA', INFO, 0, - $ UPLO, N, N, -1, -1, NRHS, IMAT, - $ NFAIL, NERRS, NOUT ) - END IF -* - CALL ZLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA ) + IF( IZERO.EQ.0 ) THEN + CALL ALAERH( PATH, 'ZSYTRS_AA', INFO, 0, + $ UPLO, N, N, -1, -1, NRHS, IMAT, + $ NFAIL, NERRS, NOUT ) + END IF + ELSE + CALL ZLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA + $ ) * -* Compute the residual for the solution +* Compute the residual for the solution * - CALL ZSYT02( UPLO, N, NRHS, A, LDA, X, LDA, WORK, - $ LDA, RWORK, RESULT( 2 ) ) + CALL ZSYT02( UPLO, N, NRHS, A, LDA, X, LDA, + $ WORK, LDA, RWORK, RESULT( 2 ) ) * * -* Print information about the tests that did not pass -* the threshold. +* Print information about the tests that did not pass +* the threshold. * - DO 120 K = 2, 2 - IF( RESULT( K ).GE.THRESH ) THEN - IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) - $ CALL ALAHD( NOUT, PATH ) - WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, - $ IMAT, K, RESULT( K ) - NFAIL = NFAIL + 1 - END IF - 120 CONTINUE + DO 120 K = 2, 2 + IF( RESULT( K ).GE.THRESH ) THEN + IF( NFAIL.EQ.0 .AND. NERRS.EQ.0 ) + $ CALL ALAHD( NOUT, PATH ) + WRITE( NOUT, FMT = 9998 )UPLO, N, NRHS, + $ IMAT, K, RESULT( K ) + NFAIL = NFAIL + 1 + END IF + 120 CONTINUE + END IF NRUN = NRUN + 1 * * End do for each value of NRHS in NSVAL.