Skip to content

Commit ee213a3

Browse files
mkrainiukmkrainiuk
committed
resolve conflicts after rebasing
1 parent fe3e793 commit ee213a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+375
-228
lines changed

‎LAPACKE/include/lapacke_64.h

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5694,64 +5694,68 @@ int64_t LAPACKE_zgesdd_work_64( int matrix_layout, char jobz, int64_t m,
56945694
double* rwork, int64_t* iwork );
56955695

56965696
int64_t LAPACKE_sgedmd_work_64( int matrix_layout, char jobs, char jobz,
5697-
char jobf, int64_t whtsvd, int64_t m,
5698-
int64_t n, float* x, int64_t ldx,
5699-
float* y, int64_t ldy, int64_t k,
5700-
float* reig, float* imeig, float* z,
5701-
int64_t ldz, float* res, float* b,
5702-
int64_t ldb, float* w, int64_t ldw,
5703-
float* s, int64_t lds, float* work,
5704-
int64_t lwork, int64_t* iwork,
5705-
int64_t liwork );
5697+
char jobr, char jobf, int64_t whtsvd,
5698+
int64_t m, int64_t n, float* x,
5699+
int64_t ldx, float* y, int64_t ldy,
5700+
int64_t nrnk, float* tol, int64_t k,
5701+
float* reig, float* imeig,
5702+
float* z, int64_t ldz, float* res,
5703+
float* b, int64_t ldb, float* w,
5704+
int64_t ldw, float* s, int64_t lds,
5705+
float* work, int64_t lwork,
5706+
int64_t* iwork, int64_t liwork );
57065707

57075708
int64_t LAPACKE_dgedmd_work_64( int matrix_layout, char jobs, char jobz,
5708-
char jobf, int64_t whtsvd, int64_t m,
5709-
int64_t n, double* x, int64_t ldx,
5710-
double* y, int64_t ldy, int64_t k,
5711-
double* reig, double* imeig, double* z,
5712-
int64_t ldz, double* res, double* b,
5713-
int64_t ldb, double* w, int64_t ldw,
5714-
double* s, int64_t lds, double* work,
5715-
int64_t lwork, int64_t* iwork,
5716-
int64_t liwork );
5709+
char jobr, char jobf, int64_t whtsvd,
5710+
int64_t m, int64_t n, double* x,
5711+
int64_t ldx, double* y, int64_t ldy,
5712+
int64_t nrnk, double* tol, int64_t k,
5713+
double* reig, double *imeig,
5714+
double* z, int64_t ldz, double* res,
5715+
double* b, int64_t ldb, double* w,
5716+
int64_t ldw, double* s, int64_t lds,
5717+
double* work, int64_t lwork,
5718+
int64_t* iwork, int64_t liwork );
57175719

57185720
int64_t LAPACKE_cgedmd_work_64( int matrix_layout, char jobs, char jobz,
5719-
char jobf, int64_t whtsvd, int64_t m,
5720-
int64_t n, lapack_complex_float* x,
5721-
int64_t ldx, lapack_complex_float* y,
5722-
int64_t ldy, int64_t k,
5723-
lapack_complex_float* reig,
5724-
lapack_complex_float* imeig,
5721+
char jobr, char jobf, int64_t whtsvd,
5722+
int64_t m, int64_t n,
5723+
lapack_complex_float* x, int64_t ldx,
5724+
lapack_complex_float* y, int64_t ldy,
5725+
int64_t nrnk, float* tol, int64_t k,
5726+
lapack_complex_float* eigs,
57255727
lapack_complex_float* z, int64_t ldz,
5726-
lapack_complex_float* res,
5728+
float* res,
57275729
lapack_complex_float* b, int64_t ldb,
57285730
lapack_complex_float* w, int64_t ldw,
57295731
lapack_complex_float* s, int64_t lds,
5730-
lapack_complex_float* work, int64_t lwork,
5732+
lapack_complex_float* zwork, int64_t lzwork,
5733+
float* work, int64_t lwork,
57315734
int64_t* iwork, int64_t liwork );
57325735

57335736
int64_t LAPACKE_zgedmd_work_64( int matrix_layout, char jobs, char jobz,
5734-
char jobf, int64_t whtsvd, int64_t m,
5735-
int64_t n, lapack_complex_double* x,
5736-
int64_t ldx, lapack_complex_double* y,
5737-
int64_t ldy, int64_t k,
5738-
lapack_complex_double* reig,
5739-
lapack_complex_double* imeig,
5737+
char jobr, char jobf, int64_t whtsvd,
5738+
int64_t m, int64_t n,
5739+
lapack_complex_double* x, int64_t ldx,
5740+
lapack_complex_double* y, int64_t ldy,
5741+
int64_t nrnk, double* tol, int64_t k,
5742+
lapack_complex_double* eigs,
57405743
lapack_complex_double* z, int64_t ldz,
5741-
lapack_complex_double* res,
5744+
double* res,
57425745
lapack_complex_double* b, int64_t ldb,
57435746
lapack_complex_double* w, int64_t ldw,
57445747
lapack_complex_double* s, int64_t lds,
5745-
lapack_complex_double* work, int64_t lwork,
5748+
lapack_complex_double* zwork, int64_t lzwork,
5749+
double* work, int64_t lwork,
57465750
int64_t* iwork, int64_t liwork );
57475751

57485752
int64_t LAPACKE_sgedmdq_work_64( int matrix_layout, char jobs, char jobz,
57495753
char jobr, char jobq, char jobt, char jobf,
57505754
int64_t whtsvd, int64_t m, int64_t n,
57515755
float* f, int64_t ldf, float* x,
57525756
int64_t ldx, float* y, int64_t ldy,
5753-
int64_t nrnk, float tol, int64_t k,
5754-
float* reig, float* imeig, float* z,
5757+
int64_t nrnk, float* tol, int64_t k,
5758+
float* reig, float *imeig, float* z,
57555759
int64_t ldz, float* res, float* b,
57565760
int64_t ldb, float* v, int64_t ldv,
57575761
float* s, int64_t lds, float* work,
@@ -5763,7 +5767,7 @@ int64_t LAPACKE_dgedmdq_work_64( int matrix_layout, char jobs, char jobz,
57635767
int64_t whtsvd, int64_t m, int64_t n,
57645768
double* f, int64_t ldf, double* x,
57655769
int64_t ldx, double* y, int64_t ldy,
5766-
int64_t nrnk, double tol, int64_t k,
5770+
int64_t nrnk, double* tol, int64_t k,
57675771
double* reig, double* imeig, double* z,
57685772
int64_t ldz, double* res, double* b,
57695773
int64_t ldb, double* v, int64_t ldv,
@@ -5777,35 +5781,34 @@ int64_t LAPACKE_cgedmdq_work_64( int matrix_layout, char jobs, char jobz,
57775781
lapack_complex_float* f, int64_t ldf,
57785782
lapack_complex_float* x, int64_t ldx,
57795783
lapack_complex_float* y, int64_t ldy,
5780-
int64_t nrnk, float tol, int64_t k,
5781-
lapack_complex_float* reig,
5782-
lapack_complex_float* imeig,
5784+
int64_t nrnk, float* tol, int64_t k,
5785+
lapack_complex_float* eigs,
57835786
lapack_complex_float* z, int64_t ldz,
5784-
lapack_complex_float* res,
5787+
float* res,
57855788
lapack_complex_float* b, int64_t ldb,
57865789
lapack_complex_float* v, int64_t ldv,
57875790
lapack_complex_float* s, int64_t lds,
5788-
lapack_complex_float* work, int64_t lwork,
5789-
int64_t* iwork,
5790-
int64_t liwork );
5791+
lapack_complex_float* zwork, int64_t lzwork,
5792+
float* work, int64_t lwork,
5793+
int64_t* iwork, int64_t liwork);
57915794

57925795
int64_t LAPACKE_zgedmdq_work_64( int matrix_layout, char jobs, char jobz,
57935796
char jobr, char jobq, char jobt, char jobf,
57945797
int64_t whtsvd, int64_t m, int64_t n,
57955798
lapack_complex_double* f, int64_t ldf,
57965799
lapack_complex_double* x, int64_t ldx,
57975800
lapack_complex_double* y, int64_t ldy,
5798-
int64_t nrnk, double tol, int64_t k,
5799-
lapack_complex_double* reig,
5800-
lapack_complex_double* imeig,
5801+
int64_t nrnk, double* tol, int64_t k,
5802+
lapack_complex_double* eigs,
58015803
lapack_complex_double* z, int64_t ldz,
5802-
lapack_complex_double* res,
5804+
double* res,
58035805
lapack_complex_double* b, int64_t ldb,
58045806
lapack_complex_double* v, int64_t ldv,
58055807
lapack_complex_double* s, int64_t lds,
5806-
lapack_complex_double* work, int64_t lwork,
5807-
int64_t* iwork,
5808-
int64_t liwork );
5808+
lapack_complex_double* zwork, int64_t lzwork,
5809+
double* work, int64_t lwork,
5810+
int64_t* iwork, int64_t liwork);
5811+
58095812

58105813
int64_t LAPACKE_sgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
58115814
float* a, int64_t lda, int64_t* ipiv,

‎SRC/cgees.f

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
238238
LOGICAL LSAME
239239
INTEGER ILAENV
240240
REAL CLANGE, SLAMCH, SROUNDUP_LWORK
241-
EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
241+
EXTERNAL LSAME, ILAENV, CLANGE,
242+
$ SLAMCH, SROUNDUP_LWORK
242243
* ..
243244
* .. Intrinsic Functions ..
244245
INTRINSIC MAX, SQRT

‎SRC/cgeesx.f

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
283283
LOGICAL LSAME
284284
INTEGER ILAENV
285285
REAL CLANGE, SLAMCH, SROUNDUP_LWORK
286-
EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
286+
EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH,
287+
$ SROUNDUP_LWORK
287288
* ..
288289
* .. Intrinsic Functions ..
289290
INTRINSIC MAX, SQRT

‎SRC/cgeev.f

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,18 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR,
214214
REAL DUM( 1 )
215215
* ..
216216
* .. External Subroutines ..
217-
EXTERNAL XERBLA, CSSCAL, CGEBAK, CGEBAL,
218-
$ CGEHRD,
219-
$ CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3, CUNGHR
217+
EXTERNAL XERBLA, CSSCAL, CGEBAK,
218+
$ CGEBAL, CGEHRD, CHSEQR,
219+
$ CLACPY, CLASCL, CSCAL,
220+
$ CTREVC3, CUNGHR
220221
* ..
221222
* .. External Functions ..
222223
LOGICAL LSAME
223224
INTEGER ISAMAX, ILAENV
224-
REAL SLAMCH, SCNRM2, CLANGE, SROUNDUP_LWORK
225-
EXTERNAL LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE,
225+
REAL SLAMCH, SCNRM2, CLANGE,
226+
$ SROUNDUP_LWORK
227+
EXTERNAL LSAME, ISAMAX, ILAENV,
228+
$ SLAMCH, SCNRM2, CLANGE,
226229
$ SROUNDUP_LWORK
227230
* ..
228231
* .. Intrinsic Functions ..

‎SRC/cgeevx.f

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,16 +325,19 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W,
325325
REAL DUM( 1 )
326326
* ..
327327
* .. External Subroutines ..
328-
EXTERNAL SLASCL, XERBLA, CSSCAL, CGEBAK,
329-
$ CGEBAL,
330-
$ CGEHRD, CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3,
331-
$ CTRSNA, CUNGHR
328+
EXTERNAL SLASCL, XERBLA, CSSCAL,
329+
$ CGEBAK, CGEBAL, CGEHRD,
330+
$ CHSEQR, CLACPY, CLASCL,
331+
$ CSCAL, CTREVC3, CTRSNA,
332+
$ CUNGHR
332333
* ..
333334
* .. External Functions ..
334335
LOGICAL LSAME
335336
INTEGER ISAMAX, ILAENV
336-
REAL SLAMCH, SCNRM2, CLANGE, SROUNDUP_LWORK
337-
EXTERNAL LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE,
337+
REAL SLAMCH, SCNRM2, CLANGE,
338+
$ SROUNDUP_LWORK
339+
EXTERNAL LSAME, ISAMAX, ILAENV,
340+
$ SLAMCH, SCNRM2, CLANGE,
338341
$ SROUNDUP_LWORK
339342
* ..
340343
* .. Intrinsic Functions ..

‎SRC/cgelsd.f

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
256256
* .. External Functions ..
257257
INTEGER ILAENV
258258
REAL CLANGE, SLAMCH, SROUNDUP_LWORK
259-
EXTERNAL CLANGE, SLAMCH, ILAENV, SROUNDUP_LWORK
259+
EXTERNAL CLANGE, SLAMCH, ILAENV,
260+
$ SROUNDUP_LWORK
260261
* ..
261262
* .. Intrinsic Functions ..
262263
INTRINSIC INT, LOG, MAX, MIN, REAL

‎SRC/cgelss.f

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
221221
* .. External Functions ..
222222
INTEGER ILAENV
223223
REAL CLANGE, SLAMCH, SROUNDUP_LWORK
224-
EXTERNAL ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
224+
EXTERNAL ILAENV, CLANGE, SLAMCH,
225+
$ SROUNDUP_LWORK
225226
* ..
226227
* .. Intrinsic Functions ..
227228
INTRINSIC MAX, MIN

‎SRC/cgelst.f

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
227227
LOGICAL LSAME
228228
INTEGER ILAENV
229229
REAL SLAMCH, CLANGE, SROUNDUP_LWORK
230-
EXTERNAL LSAME, ILAENV, SLAMCH, CLANGE, SROUNDUP_LWORK
230+
EXTERNAL LSAME, ILAENV, SLAMCH, CLANGE,
231+
$ SROUNDUP_LWORK
231232
* ..
232233
* .. External Subroutines ..
233234
EXTERNAL CGELQT, CGEQRT, CGEMLQT, CGEMQRT,
@@ -287,7 +288,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
287288
* Quick return if possible
288289
*
289290
IF( MIN( M, N, NRHS ).EQ.0 ) THEN
290-
CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
291+
CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
292+
$ B, LDB )
291293
WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
292294
RETURN
293295
END IF
@@ -335,7 +337,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
335337
*
336338
* Matrix all zero. Return zero solution.
337339
*
338-
CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
340+
CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
341+
$ B, LDB )
339342
WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
340343
RETURN
341344
END IF

‎SRC/cgeqp3rk.f

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "lapack_64.h"
12
*> \brief \b CGEQP3RK computes a truncated Householder QR factorization with column pivoting of a complex m-by-n matrix A by using Level 3 BLAS and overwrites m-by-nrhs matrix B with Q**H * B.
23
*
34
* =========== DOCUMENTATION ===========
@@ -893,7 +894,8 @@ SUBROUTINE CGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
893894
* Determine when to cross over from blocked to unblocked code.
894895
* (for N less than NX, unblocked code should be used).
895896
*
896-
NX = MAX( 0, ILAENV( IXOVER, 'CGEQP3RK', ' ', M, N, -1, -1 ) )
897+
NX = MAX( 0, ILAENV( IXOVER, 'CGEQP3RK', ' ', M, N, -1,
898+
$ -1 ) )
897899
*
898900
IF( NX.LT.MINMN ) THEN
899901
*

‎SRC/cgesvd.f

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT,
263263
LOGICAL LSAME
264264
INTEGER ILAENV
265265
REAL CLANGE, SLAMCH, SROUNDUP_LWORK
266-
EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
266+
EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH,
267+
$ SROUNDUP_LWORK
267268
* ..
268269
* .. Intrinsic Functions ..
269270
INTRINSIC MAX, MIN, SQRT

0 commit comments

Comments
 (0)