Skip to content

Commit 275c28d

Browse files
julielangoujulielangou
authored
Merge branch 'master' into aasen-2stage
2 parents 1727eff + f1c9264 commit 275c28d

31 files changed

Lines changed: 2580 additions & 136 deletions

‎SRC/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ set(ZLASRC
378378
zhetf2_rk.f zhetrf_rk.f zhetri_3.f zhetri_3x.f
379379
zhetrs_3.f zhecon_3.f zhesv_rk.f
380380
zhesv_aa.f zhetrf_aa.f zhetrs_aa.f
381+
zhesv_aa_2stage.f zhetrf_aa_2stage.f zhetrs_aa_2stage.f
381382
zhgeqz.f zhpcon.f zhpev.f zhpevd.f
382383
zhpevx.f zhpgst.f zhpgv.f zhpgvd.f zhpgvx.f zhprfs.f zhpsv.f
383384
zhpsvx.f

‎SRC/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ ZLASRC = \
410410
zhetf2_rk.o zhetrf_rk.o zhetri_3.o zhetri_3x.o \
411411
zhetrs_3.o zhecon_3.o zhesv_rk.o \
412412
zhesv_aa.o zhetrf_aa.o zhetrs_aa.o zlahef_aa.o \
413+
zhesv_aa_2stage.o zhetrf_aa_2stage.o zhetrs_aa_2stage.o \
413414
zhgeqz.o zhpcon.o zhpev.o zhpevd.o \
414415
zhpevx.o zhpgst.o zhpgv.o zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o \
415416
zhpsvx.o \

‎SRC/chesv_aa_2stage.f‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ SUBROUTINE CHESV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
211211
EXTERNAL LSAME
212212
* ..
213213
* .. External Subroutines ..
214-
EXTERNAL XERBLA
214+
EXTERNAL CHETRF_AA_2STAGE, CHETRS_AA_2STAGE,
215+
$ XERBLA
215216
* ..
216217
* .. Intrinsic Functions ..
217218
INTRINSIC MAX

‎SRC/chetrf_aa_2stage.f‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
*> \brief \b CHETRF_AA_2STAGE
22
*
3-
* @generated from SRC/dsytrf_aa_2stage.f, fortran d -> c, Mon Oct 30 11:57:50 2017
4-
*
53
* =========== DOCUMENTATION ===========
64
*
75
* Online html documentation available at
@@ -152,7 +150,7 @@
152150
*> \author Univ. of Colorado Denver
153151
*> \author NAG Ltd.
154152
*
155-
*> \date December 2016
153+
*> \date November 2017
156154
*
157155
*> \ingroup complexSYcomputational
158156
*
@@ -192,9 +190,12 @@ SUBROUTINE CHETRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
192190
LOGICAL LSAME
193191
INTEGER ILAENV
194192
EXTERNAL LSAME, ILAENV
193+
195194
* ..
196195
* .. External Subroutines ..
197-
EXTERNAL XERBLA
196+
EXTERNAL XERBLA, CCOPY, CLACGV, CLACPY,
197+
$ CLASET, CGBTRF, CGEMM, CGETRF,
198+
$ CHEGST, CSWAP, CTRSM
198199
* ..
199200
* .. Intrinsic Functions ..
200201
INTRINSIC CONJG, MIN, MAX

‎SRC/dsysv_aa.f‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@
156156
*
157157
*> \date December 2016
158158
*
159-
* @precisions fortran d -> z c
160-
*
161159
*> \ingroup doubleSYsolve
162160
*
163161
* =====================================================================

‎SRC/dsysv_aa_2stage.f‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
*>
3939
*> \verbatim
4040
*>
41-
*> DSYSV_AA_2STAGE computes the solution to a complex system of
41+
*> DSYSV_AA_2STAGE computes the solution to a real system of
4242
*> linear equations
4343
*> A * X = B,
4444
*> where A is an N-by-N symmetric matrix and X and B are N-by-NRHS
4545
*> matrices.
4646
*>
4747
*> Aasen's 2-stage algorithm is used to factor A as
48-
*> A = U * T * U**H, if UPLO = 'U', or
49-
*> A = L * T * L**H, if UPLO = 'L',
48+
*> A = U * T * U**T, if UPLO = 'U', or
49+
*> A = L * T * L**T, if UPLO = 'L',
5050
*> where U (or L) is a product of permutation and unit upper (lower)
5151
*> triangular matrices, and T is symmetric and band. The matrix T is
5252
*> then LU-factored with partial pivoting. The factored form of A
@@ -177,9 +177,9 @@
177177
*> \author Univ. of Colorado Denver
178178
*> \author NAG Ltd.
179179
*
180-
*> \date December 2016
180+
*> \date November 2017
181181
*
182-
*> \ingroup doubleSYcomputational
182+
*> \ingroup doubleSYsolve
183183
*
184184
* =====================================================================
185185
SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
@@ -213,7 +213,8 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
213213
EXTERNAL LSAME
214214
* ..
215215
* .. External Subroutines ..
216-
EXTERNAL XERBLA
216+
EXTERNAL DSYTRF_AA_2STAGE, DSYTRS_AA_2STAGE,
217+
$ XERBLA
217218
* ..
218219
* .. Intrinsic Functions ..
219220
INTRINSIC MAX
@@ -257,7 +258,7 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
257258
END IF
258259
*
259260
*
260-
* Compute the factorization A = U*T*U**H or A = L*T*L**H.
261+
* Compute the factorization A = U*T*U**T or A = L*T*L**T.
261262
*
262263
CALL DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV, IPIV2,
263264
$ WORK, LWORK, INFO )
@@ -271,6 +272,8 @@ SUBROUTINE DSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
271272
END IF
272273
*
273274
WORK( 1 ) = LWKOPT
275+
*
276+
RETURN
274277
*
275278
* End of DSYSV_AA_2STAGE
276279
*

‎SRC/dsytrf_aa_2stage.f‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ SUBROUTINE DSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
191191
EXTERNAL LSAME, ILAENV
192192
* ..
193193
* .. External Subroutines ..
194-
EXTERNAL XERBLA
194+
EXTERNAL XERBLA, DCOPY, DLACGV, DLACPY,
195+
$ DLASET, DGBTRF, DGEMM, DGETRF,
196+
$ DSYGST, DSWAP, DTRSM
195197
* ..
196198
* .. Intrinsic Functions ..
197199
INTRINSIC MIN, MAX

‎SRC/ssysv_aa_2stage.f‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*
88
*> \htmlonly
99
*> Download SSYSV_AA_2STAGE + dependencies
10-
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_aasen_2stage.f">
10+
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ssysv_aa_2stage.f">
1111
*> [TGZ]</a>
12-
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ssysv_aasen_2stage.f">
12+
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ssysv_aa_2stage.f">
1313
*> [ZIP]</a>
14-
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_aasen_2stage.f">
14+
*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ssysv_aa_2stage.f">
1515
*> [TXT]</a>
1616
*> \endhtmlonly
1717
*
@@ -31,20 +31,21 @@
3131
* REAL A( LDA, * ), TB( * ), B( LDB, *), WORK( * )
3232
* ..
3333
*
34+
*
3435
*> \par Purpose:
3536
* =============
3637
*>
3738
*> \verbatim
3839
*>
39-
*> SSYSV_AA_2STAGE computes the solution to a complex system of
40+
*> SSYSV_AA_2STAGE computes the solution to a real system of
4041
*> linear equations
4142
*> A * X = B,
4243
*> where A is an N-by-N symmetric matrix and X and B are N-by-NRHS
4344
*> matrices.
4445
*>
4546
*> Aasen's 2-stage algorithm is used to factor A as
46-
*> A = U * T * U**H, if UPLO = 'U', or
47-
*> A = L * T * L**H, if UPLO = 'L',
47+
*> A = U * T * U**T, if UPLO = 'U', or
48+
*> A = L * T * L**T, if UPLO = 'L',
4849
*> where U (or L) is a product of permutation and unit upper (lower)
4950
*> triangular matrices, and T is symmetric and band. The matrix T is
5051
*> then LU-factored with partial pivoting. The factored form of A
@@ -175,16 +176,16 @@
175176
*> \author Univ. of Colorado Denver
176177
*> \author NAG Ltd.
177178
*
178-
*> \date December 2016
179+
*> \date November 2017
179180
*
180-
*> \ingroup realSYcomputational
181+
*> \ingroup realSYsolve
181182
*
182183
* =====================================================================
183184
SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
184185
$ IPIV, IPIV2, B, LDB, WORK, LWORK,
185186
$ INFO )
186187
*
187-
* -- LAPACK computational routine (version 3.7.0) --
188+
* -- LAPACK driver routine (version 3.7.0) --
188189
* -- LAPACK is a software package provided by Univ. of Tennessee, --
189190
* -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
190191
* December 2016
@@ -211,7 +212,8 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
211212
EXTERNAL LSAME
212213
* ..
213214
* .. External Subroutines ..
214-
EXTERNAL XERBLA
215+
EXTERNAL SSYTRF_AA_2STAGE, SSYTRS_AA_2STAGE,
216+
$ XERBLA
215217
* ..
216218
* .. Intrinsic Functions ..
217219
INTRINSIC MAX
@@ -255,7 +257,7 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
255257
END IF
256258
*
257259
*
258-
* Compute the factorization A = U*T*U**H or A = L*T*L**H.
260+
* Compute the factorization A = U*T*U**T or A = L*T*L**T.
259261
*
260262
CALL SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV, IPIV2,
261263
$ WORK, LWORK, INFO )
@@ -269,6 +271,8 @@ SUBROUTINE SSYSV_AA_2STAGE( UPLO, N, NRHS, A, LDA, TB, LTB,
269271
END IF
270272
*
271273
WORK( 1 ) = LWKOPT
274+
*
275+
RETURN
272276
*
273277
* End of SSYSV_AA_2STAGE
274278
*

‎SRC/ssytrf_aa_2stage.f‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ SUBROUTINE SSYTRF_AA_2STAGE( UPLO, N, A, LDA, TB, LTB, IPIV,
191191
EXTERNAL LSAME, ILAENV
192192
* ..
193193
* .. External Subroutines ..
194-
EXTERNAL XERBLA
194+
EXTERNAL XERBLA, SCOPY, SLACGV, SLACPY,
195+
$ SLASET, SGBTRF, SGEMM, SGETRF,
196+
$ SSYGST, SSWAP, STRSM
195197
* ..
196198
* .. Intrinsic Functions ..
197199
INTRINSIC MIN, MAX

0 commit comments

Comments
 (0)