resolve conflicts after rebasing

Author: mkrainiuk

LAPACKE/include/lapacke_64.h

@@ -5694,64 +5694,68 @@ int64_t LAPACKE_zgesdd_work_64( int matrix_layout, char jobz, int64_t m,
  double* rwork, int64_t* iwork );
 
 int64_t LAPACKE_sgedmd_work_64( int matrix_layout, char jobs, char jobz,
- char jobf, int64_t whtsvd, int64_t m,
- int64_t n, float* x, int64_t ldx,
- float* y, int64_t ldy, int64_t k,
- float* reig, float* imeig, float* z,
- int64_t ldz, float* res, float* b,
- int64_t ldb, float* w, int64_t ldw,
- float* s, int64_t lds, float* work,
- int64_t lwork, int64_t* iwork,
- int64_t liwork );
+ char jobr, char jobf, int64_t whtsvd,
+ int64_t m, int64_t n, float* x,
+ int64_t ldx, float* y, int64_t ldy,
+ int64_t nrnk, float* tol, int64_t k,
+ float* reig, float* imeig,
+ float* z, int64_t ldz, float* res,
+ float* b, int64_t ldb, float* w,
+ int64_t ldw, float* s, int64_t lds,
+ float* work, int64_t lwork,
+ int64_t* iwork, int64_t liwork );
 
 int64_t LAPACKE_dgedmd_work_64( int matrix_layout, char jobs, char jobz,
- char jobf, int64_t whtsvd, int64_t m,
- int64_t n, double* x, int64_t ldx,
- double* y, int64_t ldy, int64_t k,
- double* reig, double* imeig, double* z,
- int64_t ldz, double* res, double* b,
- int64_t ldb, double* w, int64_t ldw,
- double* s, int64_t lds, double* work,
- int64_t lwork, int64_t* iwork,
- int64_t liwork );
+ char jobr, char jobf, int64_t whtsvd,
+ int64_t m, int64_t n, double* x,
+ int64_t ldx, double* y, int64_t ldy,
+ int64_t nrnk, double* tol, int64_t k,
+ double* reig, double *imeig,
+ double* z, int64_t ldz, double* res,
+ double* b, int64_t ldb, double* w,
+ int64_t ldw, double* s, int64_t lds,
+ double* work, int64_t lwork,
+ int64_t* iwork, int64_t liwork );
 
 int64_t LAPACKE_cgedmd_work_64( int matrix_layout, char jobs, char jobz,
- char jobf, int64_t whtsvd, int64_t m,
- int64_t n, lapack_complex_float* x,
- int64_t ldx, lapack_complex_float* y,
- int64_t ldy, int64_t k,
- lapack_complex_float* reig,
- lapack_complex_float* imeig,
+ char jobr, char jobf, int64_t whtsvd,
+ int64_t m, int64_t n,
+ lapack_complex_float* x, int64_t ldx,
+ lapack_complex_float* y, int64_t ldy,
+ int64_t nrnk, float* tol, int64_t k,
+ lapack_complex_float* eigs,
  lapack_complex_float* z, int64_t ldz,
- lapack_complex_float* res,
+ float* res,
  lapack_complex_float* b, int64_t ldb,
  lapack_complex_float* w, int64_t ldw,
  lapack_complex_float* s, int64_t lds,
- lapack_complex_float* work, int64_t lwork,
+ lapack_complex_float* zwork, int64_t lzwork,
+ float* work, int64_t lwork,
  int64_t* iwork, int64_t liwork );
 
 int64_t LAPACKE_zgedmd_work_64( int matrix_layout, char jobs, char jobz,
- char jobf, int64_t whtsvd, int64_t m,
- int64_t n, lapack_complex_double* x,
- int64_t ldx, lapack_complex_double* y,
- int64_t ldy, int64_t k,
- lapack_complex_double* reig,
- lapack_complex_double* imeig,
+ char jobr, char jobf, int64_t whtsvd,
+ int64_t m, int64_t n,
+ lapack_complex_double* x, int64_t ldx,
+ lapack_complex_double* y, int64_t ldy,
+ int64_t nrnk, double* tol, int64_t k, 
+ lapack_complex_double* eigs,
  lapack_complex_double* z, int64_t ldz,
- lapack_complex_double* res,
+ double* res,
  lapack_complex_double* b, int64_t ldb,
  lapack_complex_double* w, int64_t ldw,
  lapack_complex_double* s, int64_t lds,
- lapack_complex_double* work, int64_t lwork,
+ lapack_complex_double* zwork, int64_t lzwork,
+ double* work, int64_t lwork,
  int64_t* iwork, int64_t liwork );
 
 int64_t LAPACKE_sgedmdq_work_64( int matrix_layout, char jobs, char jobz,
  char jobr, char jobq, char jobt, char jobf,
  int64_t whtsvd, int64_t m, int64_t n,
  float* f, int64_t ldf, float* x,
  int64_t ldx, float* y, int64_t ldy,
- int64_t nrnk, float tol, int64_t k,
- float* reig, float* imeig, float* z,
+ int64_t nrnk, float* tol, int64_t k,
+ float* reig, float *imeig, float* z,
  int64_t ldz, float* res, float* b,
  int64_t ldb, float* v, int64_t ldv,
  float* s, int64_t lds, float* work,
@@ -5763,7 +5767,7 @@ int64_t LAPACKE_dgedmdq_work_64( int matrix_layout, char jobs, char jobz,
  int64_t whtsvd, int64_t m, int64_t n,
  double* f, int64_t ldf, double* x,
  int64_t ldx, double* y, int64_t ldy,
- int64_t nrnk, double tol, int64_t k,
+ int64_t nrnk, double* tol, int64_t k,
  double* reig, double* imeig, double* z,
  int64_t ldz, double* res, double* b,
  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,
  lapack_complex_float* f, int64_t ldf,
  lapack_complex_float* x, int64_t ldx,
  lapack_complex_float* y, int64_t ldy,
- int64_t nrnk, float tol, int64_t k,
- lapack_complex_float* reig,
- lapack_complex_float* imeig,
+ int64_t nrnk, float* tol, int64_t k,
+ lapack_complex_float* eigs,
  lapack_complex_float* z, int64_t ldz,
- lapack_complex_float* res,
+ float* res,
  lapack_complex_float* b, int64_t ldb,
  lapack_complex_float* v, int64_t ldv,
  lapack_complex_float* s, int64_t lds,
- lapack_complex_float* work, int64_t lwork,
- int64_t* iwork,
- int64_t liwork );
+ lapack_complex_float* zwork, int64_t lzwork,
+ float* work, int64_t lwork,
+ int64_t* iwork, int64_t liwork);
 
 int64_t LAPACKE_zgedmdq_work_64( int matrix_layout, char jobs, char jobz,
  char jobr, char jobq, char jobt, char jobf,
  int64_t whtsvd, int64_t m, int64_t n,
  lapack_complex_double* f, int64_t ldf,
  lapack_complex_double* x, int64_t ldx,
  lapack_complex_double* y, int64_t ldy,
- int64_t nrnk, double tol, int64_t k,
- lapack_complex_double* reig,
- lapack_complex_double* imeig,
+ int64_t nrnk, double* tol, int64_t k,
+ lapack_complex_double* eigs,
  lapack_complex_double* z, int64_t ldz,
- lapack_complex_double* res,
+ double* res,
  lapack_complex_double* b, int64_t ldb,
  lapack_complex_double* v, int64_t ldv,
  lapack_complex_double* s, int64_t lds,
- lapack_complex_double* work, int64_t lwork,
- int64_t* iwork,
- int64_t liwork );
+ lapack_complex_double* zwork, int64_t lzwork,
+ double* work, int64_t lwork,
+ int64_t* iwork, int64_t liwork);
+
 
 int64_t LAPACKE_sgesv_work_64( int matrix_layout, int64_t n, int64_t nrhs,
  float* a, int64_t lda, int64_t* ipiv,

SRC/cgees.f

@@ -238,7 +238,8 @@ SUBROUTINE CGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
  LOGICAL LSAME
  INTEGER ILAENV
  REAL CLANGE, SLAMCH, SROUNDUP_LWORK
- EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
+ EXTERNAL LSAME, ILAENV, CLANGE,
+ $ SLAMCH, SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..
  INTRINSIC MAX, SQRT

SRC/cgeesx.f

@@ -283,7 +283,8 @@ SUBROUTINE CGEESX( JOBVS, SORT, SELECT, SENSE, N, A, LDA, SDIM,
  LOGICAL LSAME
  INTEGER ILAENV
  REAL CLANGE, SLAMCH, SROUNDUP_LWORK
- EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
+ EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH,
+ $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..
  INTRINSIC MAX, SQRT

SRC/cgeev.f

@@ -214,15 +214,18 @@ SUBROUTINE CGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR,
  REAL DUM( 1 )
 * ..
 * .. External Subroutines ..
- EXTERNAL XERBLA, CSSCAL, CGEBAK, CGEBAL,
- $ CGEHRD,
- $ CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3, CUNGHR
+ EXTERNAL XERBLA, CSSCAL, CGEBAK,
+ $ CGEBAL, CGEHRD, CHSEQR,
+ $ CLACPY, CLASCL, CSCAL,
+ $ CTREVC3, CUNGHR
 * ..
 * .. External Functions ..
  LOGICAL LSAME
  INTEGER ISAMAX, ILAENV
- REAL SLAMCH, SCNRM2, CLANGE, SROUNDUP_LWORK
- EXTERNAL LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE,
+ REAL SLAMCH, SCNRM2, CLANGE,
+ $ SROUNDUP_LWORK
+ EXTERNAL LSAME, ISAMAX, ILAENV,
+ $ SLAMCH, SCNRM2, CLANGE,
  $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..

SRC/cgeevx.f

@@ -325,16 +325,19 @@ SUBROUTINE CGEEVX( BALANC, JOBVL, JOBVR, SENSE, N, A, LDA, W,
  REAL DUM( 1 )
 * ..
 * .. External Subroutines ..
- EXTERNAL SLASCL, XERBLA, CSSCAL, CGEBAK,
- $ CGEBAL,
- $ CGEHRD, CHSEQR, CLACPY, CLASCL, CSCAL, CTREVC3,
- $ CTRSNA, CUNGHR
+ EXTERNAL SLASCL, XERBLA, CSSCAL,
+ $ CGEBAK, CGEBAL, CGEHRD,
+ $ CHSEQR, CLACPY, CLASCL,
+ $ CSCAL, CTREVC3, CTRSNA,
+ $ CUNGHR
 * ..
 * .. External Functions ..
  LOGICAL LSAME
  INTEGER ISAMAX, ILAENV
- REAL SLAMCH, SCNRM2, CLANGE, SROUNDUP_LWORK
- EXTERNAL LSAME, ISAMAX, ILAENV, SLAMCH, SCNRM2, CLANGE,
+ REAL SLAMCH, SCNRM2, CLANGE,
+ $ SROUNDUP_LWORK
+ EXTERNAL LSAME, ISAMAX, ILAENV,
+ $ SLAMCH, SCNRM2, CLANGE,
  $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..

SRC/cgelsd.f

@@ -256,7 +256,8 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 * .. External Functions ..
  INTEGER ILAENV
  REAL CLANGE, SLAMCH, SROUNDUP_LWORK
- EXTERNAL CLANGE, SLAMCH, ILAENV, SROUNDUP_LWORK
+ EXTERNAL CLANGE, SLAMCH, ILAENV,
+ $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..
  INTRINSIC INT, LOG, MAX, MIN, REAL

SRC/cgelss.f

@@ -221,7 +221,8 @@ SUBROUTINE CGELSS( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
 * .. External Functions ..
  INTEGER ILAENV
  REAL CLANGE, SLAMCH, SROUNDUP_LWORK
- EXTERNAL ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
+ EXTERNAL ILAENV, CLANGE, SLAMCH,
+ $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..
  INTRINSIC MAX, MIN

SRC/cgelst.f

@@ -227,7 +227,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
  LOGICAL LSAME
  INTEGER ILAENV
  REAL SLAMCH, CLANGE, SROUNDUP_LWORK
- EXTERNAL LSAME, ILAENV, SLAMCH, CLANGE, SROUNDUP_LWORK
+ EXTERNAL LSAME, ILAENV, SLAMCH, CLANGE,
+ $ SROUNDUP_LWORK
 * ..
 * .. External Subroutines ..
  EXTERNAL CGELQT, CGEQRT, CGEMLQT, CGEMQRT,
@@ -287,7 +288,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
 * Quick return if possible
 *
  IF( MIN( M, N, NRHS ).EQ.0 ) THEN
- CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+ CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
+ $ B, LDB )
  WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
  RETURN
  END IF
@@ -335,7 +337,8 @@ SUBROUTINE CGELST( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK,
 *
 * Matrix all zero. Return zero solution.
 *
- CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+ CALL CLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO,
+ $ B, LDB )
  WORK( 1 ) = SROUNDUP_LWORK( LWOPT )
  RETURN
  END IF

SRC/cgeqp3rk.f

@@ -1,3 +1,4 @@
+#include "lapack_64.h"
 *> \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.
 *
 * =========== DOCUMENTATION ===========
@@ -893,7 +894,8 @@ SUBROUTINE CGEQP3RK( M, N, NRHS, KMAX, ABSTOL, RELTOL, A, LDA,
 * Determine when to cross over from blocked to unblocked code.
 * (for N less than NX, unblocked code should be used).
 *
- NX = MAX( 0, ILAENV( IXOVER, 'CGEQP3RK', ' ', M, N, -1, -1 ) )
+ NX = MAX( 0, ILAENV( IXOVER, 'CGEQP3RK', ' ', M, N, -1,
+ $ -1 ) )
 *
  IF( NX.LT.MINMN ) THEN
 *

SRC/cgesvd.f

@@ -263,7 +263,8 @@ SUBROUTINE CGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT,
  LOGICAL LSAME
  INTEGER ILAENV
  REAL CLANGE, SLAMCH, SROUNDUP_LWORK
- EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH, SROUNDUP_LWORK
+ EXTERNAL LSAME, ILAENV, CLANGE, SLAMCH,
+ $ SROUNDUP_LWORK
 * ..
 * .. Intrinsic Functions ..
  INTRINSIC MAX, MIN, SQRT