Skip to content

Commit

Permalink
Merge pull request #1079 from hjjvandam/fix/line_lengths
Browse files Browse the repository at this point in the history
Fix line lengths for the extended API
  • Loading branch information
langou authored Dec 3, 2024
2 parents 1b0c6a7 + a6c1dd6 commit 7b4c3a3
Show file tree
Hide file tree
Showing 31 changed files with 302 additions and 214 deletions.
24 changes: 15 additions & 9 deletions SRC/DEPRECATED/cgegs.f
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@
*> \ingroup complexGEeigen
*
* =====================================================================
SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
$ VSL, LDVSL, VSR, LDVSR, WORK, LWORK, RWORK,
$ INFO )
SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA,
$ BETA, VSL, LDVSL, VSR, LDVSR, WORK, LWORK,
$ RWORK, INFO )
*
* -- LAPACK driver routine --
* -- LAPACK is a software package provided by Univ. of Tennessee, --
Expand Down Expand Up @@ -360,7 +360,8 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
END IF
*
IF( ILASCL ) THEN
CALL CLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
CALL CLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand All @@ -380,7 +381,8 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
END IF
*
IF( ILBSCL ) THEN
CALL CLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
CALL CLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand Down Expand Up @@ -493,25 +495,29 @@ SUBROUTINE CGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHA, BETA,
* Undo scaling
*
IF( ILASCL ) THEN
CALL CLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
CALL CLASCL( 'U', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
END IF
CALL CLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N, IINFO )
CALL CLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHA, N,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
END IF
END IF
*
IF( ILBSCL ) THEN
CALL CLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
CALL CLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
END IF
CALL CLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
CALL CLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand Down
22 changes: 14 additions & 8 deletions SRC/DEPRECATED/cgelsx.f
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
*> \ingroup complexGEsolve
*
* =====================================================================
SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
$ WORK, RWORK, INFO )
SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
$ RANK, WORK, RWORK, INFO )
*
* -- LAPACK driver routine --
* -- LAPACK is a software package provided by Univ. of Tennessee, --
Expand Down Expand Up @@ -294,13 +294,15 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
*
* Scale matrix norm up to SMLNUM
*
CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB,
$ INFO )
IBSCL = 1
ELSE IF( BNRM.GT.BIGNUM ) THEN
*
* Scale matrix norm down to BIGNUM
*
CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB,
$ INFO )
IBSCL = 2
END IF
*
Expand Down Expand Up @@ -420,18 +422,22 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
* Undo scaling
*
IF( IASCL.EQ.1 ) THEN
CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB,
$ INFO )
CALL CLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
$ INFO )
ELSE IF( IASCL.EQ.2 ) THEN
CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB,
$ INFO )
CALL CLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
$ INFO )
END IF
IF( IBSCL.EQ.1 ) THEN
CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB,
$ INFO )
ELSE IF( IBSCL.EQ.2 ) THEN
CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
CALL CLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB,
$ INFO )
END IF
*
100 CONTINUE
Expand Down
29 changes: 16 additions & 13 deletions SRC/DEPRECATED/cggsvp.f
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
30 CONTINUE
40 CONTINUE
IF( P.GT.L )
$ CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ), LDB )
$ CALL CLASET( 'Full', P-L, N, CZERO, CZERO, B( L+1, 1 ),
$ LDB )
*
IF( WANTQ ) THEN
*
Expand All @@ -400,8 +401,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
*
* Update A := A*Z**H
*
CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B, LDB,
$ TAU, A, LDA, WORK, INFO )
CALL CUNMR2( 'Right', 'Conjugate transpose', M, N, L, B,
$ LDB, TAU, A, LDA, WORK, INFO )
IF( WANTQ ) THEN
*
* Update Q := Q*Z**H
Expand Down Expand Up @@ -444,17 +445,18 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
*
* Update A12 := U**H*A12, where A12 = A( 1:M, N-L+1:N )
*
CALL CUNM2R( 'Left', 'Conjugate transpose', M, L, MIN( M, N-L ),
$ A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
CALL CUNM2R( 'Left', 'Conjugate transpose', M, L,
$ MIN( M, N-L ), A, LDA, TAU, A( 1, N-L+1 ), LDA, WORK,
$ INFO )
*
IF( WANTU ) THEN
*
* Copy the details of U, and form U
*
CALL CLASET( 'Full', M, M, CZERO, CZERO, U, LDU )
IF( M.GT.1 )
$ CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
$ LDU )
$ CALL CLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA,
$ U( 2, 1 ), LDU )
CALL CUNG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
END IF
*
Expand All @@ -474,7 +476,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
90 CONTINUE
100 CONTINUE
IF( M.GT.K )
$ CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ), LDA )
$ CALL CLASET( 'Full', M-K, N-L, CZERO, CZERO, A( K+1, 1 ),
$ LDA )
*
IF( N-L.GT.K ) THEN
*
Expand All @@ -486,8 +489,8 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
*
* Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**H
*
CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K, A,
$ LDA, TAU, Q, LDQ, WORK, INFO )
CALL CUNMR2( 'Right', 'Conjugate transpose', N, N-L, K,
$ A, LDA, TAU, Q, LDQ, WORK, INFO )
END IF
*
* Clean up A
Expand All @@ -511,9 +514,9 @@ SUBROUTINE CGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
*
* Update U(:,K+1:M) := U(:,K+1:M)*U1
*
CALL CUNM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
$ A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
$ WORK, INFO )
CALL CUNM2R( 'Right', 'No transpose', M, M-K,
$ MIN( M-K, L ), A( K+1, N-L+1 ), LDA, TAU,
$ U( 1, K+1 ), LDU, WORK, INFO )
END IF
*
* Clean up
Expand Down
21 changes: 11 additions & 10 deletions SRC/DEPRECATED/clahrd.f
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,14 @@ SUBROUTINE CLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
*
* w := T**H *w
*
CALL CTRMV( 'Upper', 'Conjugate transpose', 'Non-unit', I-1,
$ T, LDT, T( 1, NB ), 1 )
CALL CTRMV( 'Upper', 'Conjugate transpose', 'Non-unit',
$ I-1, T, LDT, T( 1, NB ), 1 )
*
* b2 := b2 - V2*w
*
CALL CGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
$ LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
CALL CGEMV( 'No transpose', N-K-I+1, I-1, -ONE,
$ A( K+I, 1 ), LDA, T( 1, NB ), 1, ONE,
$ A( K+I, I ), 1 )
*
* b1 := b1 - V1*w
*
Expand All @@ -263,20 +264,20 @@ SUBROUTINE CLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
*
* Compute Y(1:n,i)
*
CALL CGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
$ A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
CALL CGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ),
$ LDA, A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
CALL CGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
$ A( K+I, 1 ), LDA, A( K+I, I ), 1, ZERO, T( 1, I ),
$ 1 )
CALL CGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
$ ONE, Y( 1, I ), 1 )
CALL CGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
$ T( 1, I ), 1, ONE, Y( 1, I ), 1 )
CALL CSCAL( N, TAU( I ), Y( 1, I ), 1 )
*
* Compute T(1:i,i)
*
CALL CSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
$ T( 1, I ), 1 )
CALL CTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
$ LDT, T( 1, I ), 1 )
T( I, I ) = TAU( I )
*
10 CONTINUE
Expand Down
7 changes: 4 additions & 3 deletions SRC/DEPRECATED/clatzm.f
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@
*> \ingroup latzm
*
* =====================================================================
SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC,
$ WORK )
*
* -- LAPACK computational routine --
* -- LAPACK is a software package provided by Univ. of Tennessee, --
Expand Down Expand Up @@ -206,8 +207,8 @@ SUBROUTINE CLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
* w := C1 + C2 * v
*
CALL CCOPY( M, C1, 1, WORK, 1 )
CALL CGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
$ WORK, 1 )
CALL CGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV,
$ ONE, WORK, 1 )
*
* [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**H]
*
Expand Down
9 changes: 5 additions & 4 deletions SRC/DEPRECATED/ctzrqf.f
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,15 @@ SUBROUTINE CTZRQF( M, N, A, LDA, TAU, INFO )
*
* Form w = a( k ) + B*z( k ) in TAU.
*
CALL CGEMV( 'No transpose', K-1, N-M, CONE, A( 1, M1 ),
$ LDA, A( K, M1 ), LDA, CONE, TAU, 1 )
CALL CGEMV( 'No transpose', K-1, N-M, CONE,
$ A( 1, M1 ), LDA, A( K, M1 ), LDA, CONE,
$ TAU, 1 )
*
* Now form a( k ) := a( k ) - conjg(tau)*w
* and B := B - conjg(tau)*w*z( k )**H.
*
CALL CAXPY( K-1, -CONJG( TAU( K ) ), TAU, 1, A( 1, K ),
$ 1 )
CALL CAXPY( K-1, -CONJG( TAU( K ) ), TAU, 1,
$ A( 1, K ), 1 )
CALL CGERC( K-1, N-M, -CONJG( TAU( K ) ), TAU, 1,
$ A( K, M1 ), LDA, A( 1, M1 ), LDA )
END IF
Expand Down
15 changes: 10 additions & 5 deletions SRC/DEPRECATED/dgegs.f
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
END IF
*
IF( ILASCL ) THEN
CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand All @@ -378,7 +379,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
END IF
*
IF( ILBSCL ) THEN
CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand Down Expand Up @@ -496,7 +498,8 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
* Undo scaling
*
IF( ILASCL ) THEN
CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand All @@ -516,12 +519,14 @@ SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
END IF
*
IF( ILBSCL ) THEN
CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
END IF
CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N,
$ IINFO )
IF( IINFO.NE.0 ) THEN
INFO = N + 9
RETURN
Expand Down
5 changes: 3 additions & 2 deletions SRC/DEPRECATED/dgegv.f
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,9 @@
*> \endverbatim
*>
* =====================================================================
SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
$ BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR,
$ ALPHAI, BETA, VL, LDVL, VR, LDVR, WORK, LWORK,
$ INFO )
*
* -- LAPACK driver routine --
* -- LAPACK is a software package provided by Univ. of Tennessee, --
Expand Down
11 changes: 6 additions & 5 deletions SRC/DEPRECATED/dgelqs.f
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,19 @@ SUBROUTINE DGELQS( M, N, NRHS, A, LDA, TAU, B, LDB, WORK, LWORK,
*
* Solve L*X = B(1:m,:)
*
CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M, NRHS,
$ ONE, A, LDA, B, LDB )
CALL DTRSM( 'Left', 'Lower', 'No transpose', 'Non-unit', M,
$ NRHS, ONE, A, LDA, B, LDB )
*
* Set B(m+1:n,:) to zero
*
IF( M.LT.N )
$ CALL DLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ), LDB )
$ CALL DLASET( 'Full', N-M, NRHS, ZERO, ZERO, B( M+1, 1 ),
$ LDB )
*
* B := Q' * B
*
CALL DORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B, LDB,
$ WORK, LWORK, INFO )
CALL DORMLQ( 'Left', 'Transpose', N, NRHS, M, A, LDA, TAU, B,
$ LDB, WORK, LWORK, INFO )
*
RETURN
*
Expand Down
Loading

0 comments on commit 7b4c3a3

Please sign in to comment.