| 64299 |
ripley |
1 |
diff -u keep/dlapack.f ./dlapack.f
|
|
|
2 |
--- keep/dlapack.f 2013-11-25 09:13:35.000000000 +0000
|
|
|
3 |
+++ ./dlapack.f 2013-11-25 09:21:56.000000000 +0000
|
|
|
4 |
@@ -21126,7 +21126,8 @@
|
| 62769 |
ripley |
5 |
*
|
|
|
6 |
* Compute Householder transform when N=1
|
|
|
7 |
*
|
|
|
8 |
- CALL DLARFG( M, A, A( MIN( 2, M ), 1 ), 1, T )
|
|
|
9 |
+* R change to stop gfortran warning
|
|
|
10 |
+ CALL DLARFG( M, A(1,1), A( MIN( 2, M ), 1 ), 1, T(1,1) )
|
|
|
11 |
*
|
|
|
12 |
ELSE
|
|
|
13 |
*
|
| 64299 |
ripley |
14 |
diff -u keep/cmplx.f ./cmplx.f
|
|
|
15 |
--- keep/cmplx.f 2013-11-25 09:09:10.000000000 +0000
|
|
|
16 |
+++ ./cmplx.f 2013-11-25 09:11:47.000000000 +0000
|
|
|
17 |
@@ -6048,24 +6048,24 @@
|
| 59926 |
ripley |
18 |
*
|
|
|
19 |
MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
|
|
|
20 |
* Compute space needed for ZGEQRF
|
|
|
21 |
- CALL ZGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
22 |
- LWORK_ZGEQRF=DUM(1)
|
| 59926 |
ripley |
23 |
+ CALL ZGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
24 |
+ LWORK_ZGEQRF=CDUM(1)
|
| 59926 |
ripley |
25 |
* Compute space needed for ZUNGQR
|
|
|
26 |
- CALL ZUNGQR( M, N, N, A, LDA, DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
27 |
- LWORK_ZUNGQR_N=DUM(1)
|
|
|
28 |
- CALL ZUNGQR( M, M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
|
|
|
29 |
- LWORK_ZUNGQR_M=DUM(1)
|
| 59926 |
ripley |
30 |
+ CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
31 |
+ LWORK_ZUNGQR_N=CDUM(1)
|
| 59926 |
ripley |
32 |
+ CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
33 |
+ LWORK_ZUNGQR_M=CDUM(1)
|
| 59926 |
ripley |
34 |
* Compute space needed for ZGEBRD
|
|
|
35 |
- CALL ZGEBRD( N, N, A, LDA, S, DUM(1), DUM(1),
|
|
|
36 |
- $ DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
37 |
- LWORK_ZGEBRD=DUM(1)
|
| 59926 |
ripley |
38 |
+ CALL ZGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
|
|
|
39 |
+ $ CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
40 |
+ LWORK_ZGEBRD=CDUM(1)
|
| 59926 |
ripley |
41 |
* Compute space needed for ZUNGBR
|
|
|
42 |
- CALL ZUNGBR( 'P', N, N, N, A, LDA, DUM(1),
|
|
|
43 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
44 |
- LWORK_ZUNGBR_P=DUM(1)
|
|
|
45 |
- CALL ZUNGBR( 'Q', N, N, N, A, LDA, DUM(1),
|
|
|
46 |
- $ DUM(1), -1, IERR )
|
|
|
47 |
- LWORK_ZUNGBR_Q=DUM(1)
|
| 59926 |
ripley |
48 |
+ CALL ZUNGBR( 'P', N, N, N, A, LDA, CDUM(1),
|
|
|
49 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
50 |
+ LWORK_ZUNGBR_P=CDUM(1)
|
| 59926 |
ripley |
51 |
+ CALL ZUNGBR( 'Q', N, N, N, A, LDA, CDUM(1),
|
|
|
52 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
53 |
+ LWORK_ZUNGBR_Q=CDUM(1)
|
| 59926 |
ripley |
54 |
*
|
|
|
55 |
IF( M.GE.MNTHR ) THEN
|
| 59951 |
ripley |
56 |
IF( WNTUN ) THEN
|
| 64299 |
ripley |
57 |
@@ -6170,20 +6170,20 @@
|
| 59926 |
ripley |
58 |
*
|
|
|
59 |
* Path 10 (M at least N, but not much larger)
|
|
|
60 |
*
|
|
|
61 |
- CALL ZGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
|
|
|
62 |
- $ DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
63 |
- LWORK_ZGEBRD=DUM(1)
|
| 59926 |
ripley |
64 |
+ CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
|
|
|
65 |
+ $ CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
66 |
+ LWORK_ZGEBRD=CDUM(1)
|
| 59926 |
ripley |
67 |
MAXWRK = 2*N + LWORK_ZGEBRD
|
|
|
68 |
IF( WNTUS .OR. WNTUO ) THEN
|
|
|
69 |
- CALL ZUNGBR( 'Q', M, N, N, A, LDA, DUM(1),
|
|
|
70 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
71 |
- LWORK_ZUNGBR_Q=DUM(1)
|
| 59926 |
ripley |
72 |
+ CALL ZUNGBR( 'Q', M, N, N, A, LDA, CDUM(1),
|
|
|
73 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
74 |
+ LWORK_ZUNGBR_Q=CDUM(1)
|
| 59926 |
ripley |
75 |
MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
|
|
|
76 |
END IF
|
|
|
77 |
IF( WNTUA ) THEN
|
|
|
78 |
- CALL ZUNGBR( 'Q', M, M, N, A, LDA, DUM(1),
|
|
|
79 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
80 |
- LWORK_ZUNGBR_Q=DUM(1)
|
| 59926 |
ripley |
81 |
+ CALL ZUNGBR( 'Q', M, M, N, A, LDA, CDUM(1),
|
|
|
82 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
83 |
+ LWORK_ZUNGBR_Q=CDUM(1)
|
| 59926 |
ripley |
84 |
MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
|
|
|
85 |
END IF
|
| 59951 |
ripley |
86 |
IF( .NOT.WNTVN ) THEN
|
| 64299 |
ripley |
87 |
@@ -6197,25 +6197,26 @@
|
| 59926 |
ripley |
88 |
*
|
|
|
89 |
MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
|
|
|
90 |
* Compute space needed for ZGELQF
|
|
|
91 |
- CALL ZGELQF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
92 |
- LWORK_ZGELQF=DUM(1)
|
| 59926 |
ripley |
93 |
+ CALL ZGELQF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
94 |
+ LWORK_ZGELQF=CDUM(1)
|
| 59926 |
ripley |
95 |
* Compute space needed for ZUNGLQ
|
|
|
96 |
- CALL ZUNGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
97 |
- LWORK_ZUNGLQ_N=DUM(1)
|
|
|
98 |
- CALL ZUNGLQ( M, N, M, A, LDA, DUM(1), DUM(1), -1, IERR )
|
|
|
99 |
- LWORK_ZUNGLQ_M=DUM(1)
|
| 59926 |
ripley |
100 |
+ CALL ZUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
|
|
|
101 |
+ $ IERR )
|
| 59951 |
ripley |
102 |
+ LWORK_ZUNGLQ_N=CDUM(1)
|
| 59926 |
ripley |
103 |
+ CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
104 |
+ LWORK_ZUNGLQ_M=CDUM(1)
|
| 59926 |
ripley |
105 |
* Compute space needed for ZGEBRD
|
|
|
106 |
- CALL ZGEBRD( M, M, A, LDA, S, DUM(1), DUM(1),
|
|
|
107 |
- $ DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
108 |
- LWORK_ZGEBRD=DUM(1)
|
| 59926 |
ripley |
109 |
+ CALL ZGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
|
|
|
110 |
+ $ CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
111 |
+ LWORK_ZGEBRD=CDUM(1)
|
| 59926 |
ripley |
112 |
* Compute space needed for ZUNGBR P
|
|
|
113 |
- CALL ZUNGBR( 'P', M, M, M, A, N, DUM(1),
|
|
|
114 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
115 |
- LWORK_ZUNGBR_P=DUM(1)
|
| 59926 |
ripley |
116 |
+ CALL ZUNGBR( 'P', M, M, M, A, N, CDUM(1),
|
|
|
117 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
118 |
+ LWORK_ZUNGBR_P=CDUM(1)
|
| 59926 |
ripley |
119 |
* Compute space needed for ZUNGBR Q
|
|
|
120 |
- CALL ZUNGBR( 'Q', M, M, M, A, N, DUM(1),
|
|
|
121 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
122 |
- LWORK_ZUNGBR_Q=DUM(1)
|
| 59926 |
ripley |
123 |
+ CALL ZUNGBR( 'Q', M, M, M, A, N, CDUM(1),
|
|
|
124 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
125 |
+ LWORK_ZUNGBR_Q=CDUM(1)
|
| 59926 |
ripley |
126 |
IF( N.GE.MNTHR ) THEN
|
|
|
127 |
IF( WNTVN ) THEN
|
|
|
128 |
*
|
| 64299 |
ripley |
129 |
@@ -6319,21 +6320,21 @@
|
| 59951 |
ripley |
130 |
*
|
| 59926 |
ripley |
131 |
* Path 10t(N greater than M, but not much larger)
|
|
|
132 |
*
|
|
|
133 |
- CALL ZGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
|
|
|
134 |
- $ DUM(1), DUM(1), -1, IERR )
|
| 59951 |
ripley |
135 |
- LWORK_ZGEBRD=DUM(1)
|
| 59926 |
ripley |
136 |
+ CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
|
|
|
137 |
+ $ CDUM(1), CDUM(1), -1, IERR )
|
| 59951 |
ripley |
138 |
+ LWORK_ZGEBRD=CDUM(1)
|
| 59926 |
ripley |
139 |
MAXWRK = 2*M + LWORK_ZGEBRD
|
|
|
140 |
IF( WNTVS .OR. WNTVO ) THEN
|
|
|
141 |
* Compute space needed for ZUNGBR P
|
|
|
142 |
- CALL ZUNGBR( 'P', M, N, M, A, N, DUM(1),
|
|
|
143 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
144 |
- LWORK_ZUNGBR_P=DUM(1)
|
| 59926 |
ripley |
145 |
+ CALL ZUNGBR( 'P', M, N, M, A, N, CDUM(1),
|
|
|
146 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
147 |
+ LWORK_ZUNGBR_P=CDUM(1)
|
| 59926 |
ripley |
148 |
MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
|
|
|
149 |
END IF
|
|
|
150 |
IF( WNTVA ) THEN
|
|
|
151 |
- CALL ZUNGBR( 'P', N, N, M, A, N, DUM(1),
|
|
|
152 |
- $ DUM(1), -1, IERR )
|
| 59951 |
ripley |
153 |
- LWORK_ZUNGBR_P=DUM(1)
|
| 59926 |
ripley |
154 |
+ CALL ZUNGBR( 'P', N, N, M, A, N, CDUM(1),
|
|
|
155 |
+ $ CDUM(1), -1, IERR )
|
| 59951 |
ripley |
156 |
+ LWORK_ZUNGBR_P=CDUM(1)
|
| 59926 |
ripley |
157 |
MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
|
|
|
158 |
END IF
|
| 59951 |
ripley |
159 |
IF( .NOT.WNTUN ) THEN
|