Skip to content

Fix function signatures and compiler warnings in f2c-converted LAPACK-DEPRECATED #6016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martin-frbg merged 1 commit into from
Sep 6, 2026
+186 −1,170
Merged

Fix function signatures and compiler warnings in f2c-converted LAPACK-DEPRECATED #6016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions lapack-netlib/SRC/DEPRECATED/cgegs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ rices</b> */
*, integer *, complex *, integer *), claset_(char *,
integer *, integer *, complex *, complex *, complex *, integer *);
real safmin;
extern /* Subroutine */ int xerbla_(char *, integer *, ftnlen);
extern /* Subroutine */ void xerbla_(char *, integer *, ftnlen);
extern integer ilaenv_(integer *, char *, char *, integer *, integer *,
integer *, integer *, ftnlen, ftnlen);
real bignum;
Expand Down Expand Up @@ -633,21 +633,18 @@ rices</b> */
*info = -5;
} else if (*ldb < f2cmax(1,*n)) {
*info = -7;
} else if (*ldvsl < 1 || ilvsl && *ldvsl < *n) {
} else if (*ldvsl < 1 || (ilvsl && *ldvsl < *n)) {
*info = -11;
} else if (*ldvsr < 1 || ilvsr && *ldvsr < *n) {
} else if (*ldvsr < 1 || (ilvsr && *ldvsr < *n)) {
*info = -13;
} else if (*lwork < lwkmin && ! lquery) {
*info = -15;
}

if (*info == 0) {
nb1 = ilaenv_(&c__1, "CGEQRF", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
ftnlen)1);
nb2 = ilaenv_(&c__1, "CUNMQR", " ", n, n, n, &c_n1, (ftnlen)6, (
ftnlen)1);
nb3 = ilaenv_(&c__1, "CUNGQR", " ", n, n, n, &c_n1, (ftnlen)6, (
ftnlen)1);
nb1 = ilaenv_(&c__1, "CGEQRF", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
nb2 = ilaenv_(&c__1, "CUNMQR", " ", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
nb3 = ilaenv_(&c__1, "CUNGQR", " ", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
/* Computing MAX */
i__1 = f2cmax(nb1,nb2);
nb = f2cmax(i__1,nb3);
Expand All @@ -657,7 +654,7 @@ rices</b> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEGS ", &i__1, 6);
xerbla_("CGEGS ", &i__1, (ftnlen)6);
return;
} else if (lquery) {
return;
Expand Down
17 changes: 7 additions & 10 deletions lapack-netlib/SRC/DEPRECATED/cgegv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ rices</b> */
integer *, integer *, complex *, integer *, complex *, integer *,
complex *, complex *, complex *, integer *, complex *, integer *,
complex *, integer *, real *, integer *);
extern int xerbla_(char *, integer *, ftnlen);
extern void xerbla_(char *, integer *, ftnlen);
extern integer ilaenv_(integer *, char *, char *, integer *, integer *,
integer *, integer *, ftnlen, ftnlen);
integer ijobvl, iright;
Expand Down Expand Up @@ -701,21 +701,18 @@ rices</b> */
*info = -5;
} else if (*ldb < f2cmax(1,*n)) {
*info = -7;
} else if (*ldvl < 1 || ilvl && *ldvl < *n) {
} else if (*ldvl < 1 || (ilvl && *ldvl < *n)) {
*info = -11;
} else if (*ldvr < 1 || ilvr && *ldvr < *n) {
} else if (*ldvr < 1 || (ilvr && *ldvr < *n)) {
*info = -13;
} else if (*lwork < lwkmin && ! lquery) {
*info = -15;
}

if (*info == 0) {
nb1 = ilaenv_(&c__1, "CGEQRF", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
ftnlen)1);
nb2 = ilaenv_(&c__1, "CUNMQR", " ", n, n, n, &c_n1, (ftnlen)6, (
ftnlen)1);
nb3 = ilaenv_(&c__1, "CUNGQR", " ", n, n, n, &c_n1, (ftnlen)6, (
ftnlen)1);
nb1 = ilaenv_(&c__1, "CGEQRF", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
nb2 = ilaenv_(&c__1, "CUNMQR", " ", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
nb3 = ilaenv_(&c__1, "CUNGQR", " ", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
/* Computing MAX */
i__1 = f2cmax(nb1,nb2);
nb = f2cmax(i__1,nb3);
Expand All @@ -727,7 +724,7 @@ rices</b> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEGV ", &i__1, 6);
xerbla_("CGEGV ", &i__1, (ftnlen)6);
return;
} else if (lquery) {
return;
Expand Down
17 changes: 9 additions & 8 deletions lapack-netlib/SRC/DEPRECATED/cgelqs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,18 +380,19 @@ static complex c_b2 = {1.f,0.f};
/* > \ingroup complex_lin */

/* ===================================================================== */
/* Subroutine */ int cgelqs_(integer *m, integer *n, integer *nrhs, complex *
/* Subroutine */ void cgelqs_(integer *m, integer *n, integer *nrhs, complex *
a, integer *lda, complex *tau, complex *b, integer *ldb, complex *
work, integer *lwork, integer *info)
{
/* System generated locals */
integer a_dim1, a_offset, b_dim1, b_offset, i__1;

/* Local variables */
extern /* Subroutine */ int ctrsm_(char *, char *, char *, char *,
extern /* Subroutine */ void ctrsm_(char *, char *, char *, char *,
integer *, integer *, complex *, complex *, integer *, complex *,
integer *), claset_(char *,
integer *, integer *, complex *, complex *, complex *, integer *), xerbla_(char *, integer *), cunmlq_(char *, char
integer *, integer *, complex *, complex *, complex *, integer *),
xerbla_(char *, integer *, ftnlen), cunmlq_(char *, char
*, integer *, integer *, integer *, complex *, integer *, complex
*, complex *, integer *, complex *, integer *, integer *);

Expand Down Expand Up @@ -428,19 +429,19 @@ static complex c_b2 = {1.f,0.f};
*info = -5;
} else if (*ldb < f2cmax(1,*n)) {
*info = -8;
} else if (*lwork < 1 || *lwork < *nrhs && *m > 0 && *n > 0) {
} else if (*lwork < 1 || (*lwork < *nrhs && *m > 0 && *n > 0)) {
*info = -10;
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGELQS", &i__1);
return 0;
xerbla_("CGELQS", &i__1, (ftnlen)6);
return;
}

/* Quick return if possible */

if (*n == 0 || *nrhs == 0 || *m == 0) {
return 0;
return;
}

/* Solve L*X = B(1:m,:) */
Expand All @@ -460,7 +461,7 @@ static complex c_b2 = {1.f,0.f};
cunmlq_("Left", "Conjugate transpose", n, nrhs, m, &a[a_offset], lda, &
tau[1], &b[b_offset], ldb, &work[1], lwork, info);

return 0;
return;

/* End of CGELQS */

Expand Down
4 changes: 2 additions & 2 deletions lapack-netlib/SRC/DEPRECATED/cgelsx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ f"> */
extern real slamch_(char *);
extern /* Subroutine */ void claset_(char *, integer *, integer *, complex
*, complex *, complex *, integer *);
extern int xerbla_(char *, integer *, ftnlen);
extern void xerbla_(char *, integer *, ftnlen);
real bignum;
extern /* Subroutine */ void clatzm_(char *, integer *, integer *, complex
*, integer *, complex *, complex *, complex *, integer *, complex
Expand Down Expand Up @@ -542,7 +542,7 @@ f"> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGELSX", &i__1, 6);
xerbla_("CGELSX", &i__1, (ftnlen)6);
return;
}

Expand Down
4 changes: 2 additions & 2 deletions lapack-netlib/SRC/DEPRECATED/cgeqpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ f"> */
extern /* Subroutine */ void clarfg_(integer *, complex *, complex *,
integer *, complex *);
extern real slamch_(char *);
extern /* Subroutine */ int xerbla_(char *, integer *, ftnlen);
extern /* Subroutine */ void xerbla_(char *, integer *, ftnlen);
extern integer isamax_(integer *, real *, integer *);
complex aii;
integer pvt;
Expand Down Expand Up @@ -481,7 +481,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEQPF", &i__1, 6);
xerbla_("CGEQPF", &i__1, (ftnlen)6);
return;
}

Expand Down
16 changes: 8 additions & 8 deletions lapack-netlib/SRC/DEPRECATED/cgeqrs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,18 +378,18 @@ static complex c_b1 = {1.f,0.f};
/* > \ingroup complex_lin */

/* ===================================================================== */
/* Subroutine */ int cgeqrs_(integer *m, integer *n, integer *nrhs, complex *
/* Subroutine */ void cgeqrs_(integer *m, integer *n, integer *nrhs, complex *
a, integer *lda, complex *tau, complex *b, integer *ldb, complex *
work, integer *lwork, integer *info)
{
/* System generated locals */
integer a_dim1, a_offset, b_dim1, b_offset, i__1;

/* Local variables */
extern /* Subroutine */ int ctrsm_(char *, char *, char *, char *,
extern /* Subroutine */ void ctrsm_(char *, char *, char *, char *,
integer *, integer *, complex *, complex *, integer *, complex *,
integer *), xerbla_(char *,
integer *), cunmqr_(char *, char *, integer *, integer *,
integer *, ftnlen), cunmqr_(char *, char *, integer *, integer *,
integer *, complex *, integer *, complex *, complex *, integer *,
complex *, integer *, integer *);

Expand Down Expand Up @@ -426,19 +426,19 @@ static complex c_b1 = {1.f,0.f};
*info = -5;
} else if (*ldb < f2cmax(1,*m)) {
*info = -8;
} else if (*lwork < 1 || *lwork < *nrhs && *m > 0 && *n > 0) {
} else if (*lwork < 1 || (*lwork < *nrhs && *m > 0 && *n > 0)) {
*info = -10;
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEQRS", &i__1);
return 0;
xerbla_("CGEQRS", &i__1, (ftnlen)6);
return;
}

/* Quick return if possible */

if (*n == 0 || *nrhs == 0 || *m == 0) {
return 0;
return;
}

/* B := Q' * B */
Expand All @@ -451,7 +451,7 @@ static complex c_b1 = {1.f,0.f};
ctrsm_("Left", "Upper", "No transpose", "Non-unit", n, nrhs, &c_b1, &a[
a_offset], lda, &b[b_offset], ldb);

return 0;
return;

/* End of CGEQRS */

Expand Down
10 changes: 5 additions & 5 deletions lapack-netlib/SRC/DEPRECATED/cggsvd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ f"> */
complex *, integer *, real *, real *, real *, real *, complex *,
integer *, complex *, integer *, complex *, integer *, complex *,
integer *, integer *);
extern int xerbla_(char *, integer *, ftnlen);
extern void xerbla_(char *, integer *, ftnlen);
extern void cggsvp_(char *, char *, char *, integer *,
integer *, integer *, complex *, integer *, complex *, integer *,
real *, real *, integer *, integer *, complex *, integer *,
Expand Down Expand Up @@ -701,16 +701,16 @@ f"> */
*info = -10;
} else if (*ldb < f2cmax(1,*p)) {
*info = -12;
} else if (*ldu < 1 || wantu && *ldu < *m) {
} else if (*ldu < 1 || (wantu && *ldu < *m)) {
*info = -16;
} else if (*ldv < 1 || wantv && *ldv < *p) {
} else if (*ldv < 1 || (wantv && *ldv < *p)) {
*info = -18;
} else if (*ldq < 1 || wantq && *ldq < *n) {
} else if (*ldq < 1 || (wantq && *ldq < *n)) {
*info = -20;
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGGSVD", &i__1, 6);
xerbla_("CGGSVD", &i__1, (ftnlen)6);
return;
}

Expand Down
10 changes: 5 additions & 5 deletions lapack-netlib/SRC/DEPRECATED/cggsvp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ f"> */
*, integer *, integer *, complex *, integer *, complex *, integer
*), claset_(char *, integer *, integer *, complex *,
complex *, complex *, integer *);
extern int xerbla_(char *, integer *, ftnlen);
extern void xerbla_(char *, integer *, ftnlen);
extern void clapmt_(logical *, integer *, integer *, complex *,
integer *, integer *);
logical forwrd;
Expand Down Expand Up @@ -622,16 +622,16 @@ f"> */
*info = -8;
} else if (*ldb < f2cmax(1,*p)) {
*info = -10;
} else if (*ldu < 1 || wantu && *ldu < *m) {
} else if (*ldu < 1 || (wantu && *ldu < *m)) {
*info = -16;
} else if (*ldv < 1 || wantv && *ldv < *p) {
} else if (*ldv < 1 || (wantv && *ldv < *p)) {
*info = -18;
} else if (*ldq < 1 || wantq && *ldq < *n) {
} else if (*ldq < 1 || (wantq && *ldq < *n)) {
*info = -20;
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGGSVP", &i__1, 6);
xerbla_("CGGSVP", &i__1, (ftnlen)6);
return;
}

Expand Down
37 changes: 0 additions & 37 deletions lapack-netlib/SRC/DEPRECATED/clatzm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,6 @@ typedef float real;
typedef double doublereal;
typedef struct { real r, i; } complex;
typedef struct { doublereal r, i; } doublecomplex;
#ifdef _MSC_VER
static inline _Fcomplex Cf(complex *z) {_Fcomplex zz={z->r , z->i}; return zz;}
static inline _Dcomplex Cd(doublecomplex *z) {_Dcomplex zz={z->r , z->i};return zz;}
static inline _Fcomplex * _pCf(complex *z) {return (_Fcomplex*)z;}
static inline _Dcomplex * _pCd(doublecomplex *z) {return (_Dcomplex*)z;}
#else
static inline _Complex float Cf(complex *z) {return z->r + z->i*_Complex_I;}
static inline _Complex double Cd(doublecomplex *z) {return z->r + z->i*_Complex_I;}
static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef blasint logical;

typedef char logical1;
Expand Down Expand Up @@ -187,33 +174,15 @@ typedef struct Namelist Namelist;
#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))

#define abort_() { sig_die("Fortran abort routine called", 1); }
#define c_abs(z) (cabsf(Cf(z)))
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
#ifdef _MSC_VER
#define c_div(c, a, b) {Cf(c)._Val[0] = (Cf(a)._Val[0]/Cf(b)._Val[0]); Cf(c)._Val[1]=(Cf(a)._Val[1]/Cf(b)._Val[1]);}
#define z_div(c, a, b) {Cd(c)._Val[0] = (Cd(a)._Val[0]/Cd(b)._Val[0]); Cd(c)._Val[1]=(Cd(a)._Val[1]/df(b)._Val[1]);}
#else
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}
#endif
#define c_exp(R, Z) {pCf(R) = cexpf(Cf(Z));}
#define c_log(R, Z) {pCf(R) = clogf(Cf(Z));}
#define c_sin(R, Z) {pCf(R) = csinf(Cf(Z));}
//#define c_sqrt(R, Z) {*(R) = csqrtf(Cf(Z));}
#define c_sqrt(R, Z) {pCf(R) = csqrtf(Cf(Z));}
#define d_abs(x) (fabs(*(x)))
#define d_acos(x) (acos(*(x)))
#define d_asin(x) (asin(*(x)))
#define d_atan(x) (atan(*(x)))
#define d_atn2(x, y) (atan2(*(x),*(y)))
#define d_cnjg(R, Z) { pCd(R) = conj(Cd(Z)); }
#define r_cnjg(R, Z) { pCf(R) = conjf(Cf(Z)); }
#define d_cos(x) (cos(*(x)))
#define d_cosh(x) (cosh(*(x)))
#define d_dim(__a, __b) ( *(__a) > *(__b) ? *(__a) - *(__b) : 0.0 )
#define d_exp(x) (exp(*(x)))
#define d_imag(z) (cimag(Cd(z)))
#define r_imag(z) (cimagf(Cf(z)))
#define d_int(__x) (*(__x)>0 ? floor(*(__x)) : -floor(- *(__x)))
#define r_int(__x) (*(__x)>0 ? floor(*(__x)) : -floor(- *(__x)))
#define d_lg10(x) ( 0.43429448190325182765 * log(*(x)) )
Expand All @@ -239,17 +208,11 @@ typedef struct Namelist Namelist;
#define pow_si(B,E) spow_ui(*(B),*(E))
#define pow_ri(B,E) spow_ui(*(B),*(E))
#define pow_di(B,E) dpow_ui(*(B),*(E))
#define pow_zi(p, a, b) {pCd(p) = zpow_ui(Cd(a), *(b));}
#define pow_ci(p, a, b) {pCf(p) = cpow_ui(Cf(a), *(b));}
#define pow_zz(R,A,B) {pCd(R) = cpow(Cd(A),*(B));}
#define s_cat(lpp, rpp, rnp, np, llp) { ftnlen i, nc, ll; char *f__rp, *lp; ll = (llp); lp = (lpp); for(i=0; i < (int)*(np); ++i) { nc = ll; if((rnp)[i] < nc) nc = (rnp)[i]; ll -= nc; f__rp = (rpp)[i]; while(--nc >= 0) *lp++ = *(f__rp)++; } while(--ll >= 0) *lp++ = ' '; }
#define s_cmp(a,b,c,d) ((integer)strncmp((a),(b),f2cmin((c),(d))))
#define s_copy(A,B,C,D) { int __i,__m; for (__i=0, __m=f2cmin((C),(D)); __i<__m && (B)[__i] != 0; ++__i) (A)[__i] = (B)[__i]; }
#define sig_die(s, kill) { exit(1); }
#define s_stop(s, n) {exit(0);}
#define z_abs(z) (cabs(Cd(z)))
#define z_exp(R, Z) {pCd(R) = cexp(Cd(Z));}
#define z_sqrt(R, Z) {pCd(R) = csqrt(Cd(Z));}
#define myexit_() break;
#define mycycle() continue;
#define myceiling(w) {ceil(w)}
Expand Down
4 changes: 2 additions & 2 deletions lapack-netlib/SRC/DEPRECATED/ctzrqf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ f"> */
integer m1;
extern /* Subroutine */ void clarfg_(integer *, complex *, complex *,
integer *, complex *), clacgv_(integer *, complex *, integer *);
extern int xerbla_(char *, integer *, ftnlen);
extern void xerbla_(char *, integer *, ftnlen);


/* -- LAPACK computational routine (version 3.7.0) -- */
Expand Down Expand Up @@ -453,7 +453,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CTZRQF", &i__1, 6);
xerbla_("CTZRQF", &i__1, (ftnlen)6);
return;
}

Expand Down
Loading
Loading