diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2018-02-16 13:09:35 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-02-16 12:09:35 -0700 |
| commit | f589305da2758f28eacc33fe0e50f1c1460a4c5e (patch) | |
| tree | d8c2ba212b795492674aaf72662887f8eb0c5bda /numpy/linalg | |
| parent | 2f9d3c0796951af6d962795671135da93bbfe1c1 (diff) | |
| download | numpy-f589305da2758f28eacc33fe0e50f1c1460a4c5e.tar.gz | |
BUG: Align type definition with generated lapack (#10477)
* Align type definitions
* Regenerate sources
* Replace BytesIO
* Consolidate executables
* Create directories on PY2
* Revise step name
* Consolidate directory creation
* Don't catch makedirs errors
* Revise step name
* Add header source
Diffstat (limited to 'numpy/linalg')
| -rw-r--r-- | numpy/linalg/lapack_lite/clapack_scrub.py | 49 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c.h | 169 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_blas.c | 98 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_c_lapack.c | 162 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_config.c | 18 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_d_lapack.c | 179 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_lapack.c | 8 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_s_lapack.c | 170 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/f2c_z_lapack.c | 176 | ||||
| -rwxr-xr-x | numpy/linalg/lapack_lite/make_lite.py | 44 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/python_xerbla.c | 2 |
11 files changed, 256 insertions, 819 deletions
diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py index 6ce107cb6..ee4d9c265 100644 --- a/numpy/linalg/lapack_lite/clapack_scrub.py +++ b/numpy/linalg/lapack_lite/clapack_scrub.py @@ -2,11 +2,17 @@ from __future__ import division, absolute_import, print_function import sys, os -from io import BytesIO import re from plex import Scanner, Str, Lexicon, Opt, Bol, State, AnyChar, TEXT, IGNORE from plex.traditional import re as Re +PY2 = sys.version_info < (3, 0) + +if PY2: + from io import BytesIO as UStringIO +else: + from io import StringIO as UStringIO + class MyScanner(Scanner): def __init__(self, info, name='<default>'): Scanner.__init__(self, self.lexicon, info, name) @@ -21,8 +27,8 @@ def sep_seq(sequence, sep): return pat def runScanner(data, scanner_class, lexicon=None): - info = BytesIO(data) - outfo = BytesIO() + info = UStringIO(data) + outfo = UStringIO() if lexicon is not None: scanner = scanner_class(lexicon, info) else: @@ -189,7 +195,7 @@ def cleanComments(source): return SourceLines state = SourceLines - for line in BytesIO(source): + for line in UStringIO(source): state = state(line) comments.flushTo(lines) return lines.getValue() @@ -217,7 +223,38 @@ def removeHeader(source): return OutOfHeader state = LookingForHeader - for line in BytesIO(source): + for line in UStringIO(source): + state = state(line) + return lines.getValue() + +def removeSubroutinePrototypes(source): + expression = re.compile( + '/\* Subroutine \*/^\s*(?:(?:inline|static)\s+){0,2}(?!else|typedef|return)\w+\s+\*?\s*(\w+)\s*\([^0]+\)\s*;?' + ) + lines = LineQueue() + for line in UStringIO(source): + if not expression.match(line): + lines.add(line) + + return lines.getValue() + +def removeBuiltinFunctions(source): + lines = LineQueue() + def LookingForBuiltinFunctions(line): + if line.strip() == '/* Builtin functions */': + return InBuiltInFunctions + else: + lines.add(line) + return LookingForBuiltinFunctions + + def InBuiltInFunctions(line): + if line.strip() == '': + return LookingForBuiltinFunctions + else: + return InBuiltInFunctions + + state = LookingForBuiltinFunctions + for line in UStringIO(source): state = state(line) return lines.getValue() @@ -240,6 +277,8 @@ def scrubSource(source, nsteps=None, verbose=False): ('clean source', cleanSource), ('clean comments', cleanComments), ('replace dlamch_() calls', replaceDlamch), + ('remove prototypes', removeSubroutinePrototypes), + ('remove builtin function prototypes', removeBuiltinFunctions), ] if nsteps is not None: diff --git a/numpy/linalg/lapack_lite/f2c.h b/numpy/linalg/lapack_lite/f2c.h index e27d7ae57..f5b90cd67 100644 --- a/numpy/linalg/lapack_lite/f2c.h +++ b/numpy/linalg/lapack_lite/f2c.h @@ -214,4 +214,173 @@ typedef doublereal E_f; /* real function with -R not specified */ #undef unix #undef vax #endif + +/* https://anonscm.debian.org/cgit/collab-maint/libf2c2.git/tree/f2ch.add */ + +/* If you are using a C++ compiler, append the following to f2c.h + for compiling libF77 and libI77. */ + +#ifdef __cplusplus +extern "C" { +#endif + +extern int abort_(void); +extern double c_abs(complex *); +extern void c_cos(complex *, complex *); +extern void c_div(complex *, complex *, complex *); +extern void c_exp(complex *, complex *); +extern void c_log(complex *, complex *); +extern void c_sin(complex *, complex *); +extern void c_sqrt(complex *, complex *); +extern double d_abs(double *); +extern double d_acos(double *); +extern double d_asin(double *); +extern double d_atan(double *); +extern double d_atn2(double *, double *); +extern void d_cnjg(doublecomplex *, doublecomplex *); +extern double d_cos(double *); +extern double d_cosh(double *); +extern double d_dim(double *, double *); +extern double d_exp(double *); +extern double d_imag(doublecomplex *); +extern double d_int(double *); +extern double d_lg10(double *); +extern double d_log(double *); +extern double d_mod(double *, double *); +extern double d_nint(double *); +extern double d_prod(float *, float *); +extern double d_sign(double *, double *); +extern double d_sin(double *); +extern double d_sinh(double *); +extern double d_sqrt(double *); +extern double d_tan(double *); +extern double d_tanh(double *); +extern double derf_(double *); +extern double derfc_(double *); +extern void do_fio(ftnint *, char *, ftnlen); +extern integer do_lio(ftnint *, ftnint *, char *, ftnlen); +extern integer do_uio(ftnint *, char *, ftnlen); +extern integer e_rdfe(void); +extern integer e_rdue(void); +extern integer e_rsfe(void); +extern integer e_rsfi(void); +extern integer e_rsle(void); +extern integer e_rsli(void); +extern integer e_rsue(void); +extern integer e_wdfe(void); +extern integer e_wdue(void); +extern void e_wsfe(void); +extern integer e_wsfi(void); +extern integer e_wsle(void); +extern integer e_wsli(void); +extern integer e_wsue(void); +extern int ef1asc_(ftnint *, ftnlen *, ftnint *, ftnlen *); +extern integer ef1cmc_(ftnint *, ftnlen *, ftnint *, ftnlen *); + +extern double erf_(float *); +extern double erfc_(float *); +extern integer f_back(alist *); +extern integer f_clos(cllist *); +extern integer f_end(alist *); +extern void f_exit(void); +extern integer f_inqu(inlist *); +extern integer f_open(olist *); +extern integer f_rew(alist *); +extern int flush_(void); +extern void getarg_(integer *, char *, ftnlen); +extern void getenv_(char *, char *, ftnlen, ftnlen); +extern short h_abs(short *); +extern short h_dim(short *, short *); +extern short h_dnnt(double *); +extern short h_indx(char *, char *, ftnlen, ftnlen); +extern short h_len(char *, ftnlen); +extern short h_mod(short *, short *); +extern short h_nint(float *); +extern short h_sign(short *, short *); +extern short hl_ge(char *, char *, ftnlen, ftnlen); +extern short hl_gt(char *, char *, ftnlen, ftnlen); +extern short hl_le(char *, char *, ftnlen, ftnlen); +extern short hl_lt(char *, char *, ftnlen, ftnlen); +extern integer i_abs(integer *); +extern integer i_dim(integer *, integer *); +extern integer i_dnnt(double *); +extern integer i_indx(char *, char *, ftnlen, ftnlen); +extern integer i_len(char *, ftnlen); +extern integer i_mod(integer *, integer *); +extern integer i_nint(float *); +extern integer i_sign(integer *, integer *); +extern integer iargc_(void); +extern ftnlen l_ge(char *, char *, ftnlen, ftnlen); +extern ftnlen l_gt(char *, char *, ftnlen, ftnlen); +extern ftnlen l_le(char *, char *, ftnlen, ftnlen); +extern ftnlen l_lt(char *, char *, ftnlen, ftnlen); +extern void pow_ci(complex *, complex *, integer *); +extern double pow_dd(double *, double *); +extern double pow_di(double *, integer *); +extern short pow_hh(short *, shortint *); +extern integer pow_ii(integer *, integer *); +extern double pow_ri(float *, integer *); +extern void pow_zi(doublecomplex *, doublecomplex *, integer *); +extern void pow_zz(doublecomplex *, doublecomplex *, doublecomplex *); +extern double r_abs(float *); +extern double r_acos(float *); +extern double r_asin(float *); +extern double r_atan(float *); +extern double r_atn2(float *, float *); +extern void r_cnjg(complex *, complex *); +extern double r_cos(float *); +extern double r_cosh(float *); +extern double r_dim(float *, float *); +extern double r_exp(float *); +extern float r_imag(complex *); +extern double r_int(float *); +extern float r_lg10(real *); +extern double r_log(float *); +extern double r_mod(float *, float *); +extern double r_nint(float *); +extern double r_sign(float *, float *); +extern double r_sin(float *); +extern double r_sinh(float *); +extern double r_sqrt(float *); +extern double r_tan(float *); +extern double r_tanh(float *); +extern void s_cat(char *, char **, integer *, integer *, ftnlen); +extern integer s_cmp(char *, char *, ftnlen, ftnlen); +extern void s_copy(char *, char *, ftnlen, ftnlen); +extern int s_paus(char *, ftnlen); +extern integer s_rdfe(cilist *); +extern integer s_rdue(cilist *); +extern integer s_rnge(char *, integer, char *, integer); +extern integer s_rsfe(cilist *); +extern integer s_rsfi(icilist *); +extern integer s_rsle(cilist *); +extern integer s_rsli(icilist *); +extern integer s_rsne(cilist *); +extern integer s_rsni(icilist *); +extern integer s_rsue(cilist *); +extern int s_stop(char *, ftnlen); +extern integer s_wdfe(cilist *); +extern integer s_wdue(cilist *); +extern void s_wsfe( cilist *); +extern integer s_wsfi(icilist *); +extern integer s_wsle(cilist *); +extern integer s_wsli(icilist *); +extern integer s_wsne(cilist *); +extern integer s_wsni(icilist *); +extern integer s_wsue(cilist *); +extern void sig_die(char *, int); +extern integer signal_(integer *, void (*)(int)); +extern integer system_(char *, ftnlen); +extern double z_abs(doublecomplex *); +extern void z_cos(doublecomplex *, doublecomplex *); +extern void z_div(doublecomplex *, doublecomplex *, doublecomplex *); +extern void z_exp(doublecomplex *, doublecomplex *); +extern void z_log(doublecomplex *, doublecomplex *); +extern void z_sin(doublecomplex *, doublecomplex *); +extern void z_sqrt(doublecomplex *, doublecomplex *); + +#ifdef __cplusplus + } +#endif + #endif diff --git a/numpy/linalg/lapack_lite/f2c_blas.c b/numpy/linalg/lapack_lite/f2c_blas.c index 9ce0ce86d..3af506b71 100644 --- a/numpy/linalg/lapack_lite/f2c_blas.c +++ b/numpy/linalg/lapack_lite/f2c_blas.c @@ -200,9 +200,6 @@ L20: integer i__1, i__2; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, ix, iy; static complex ctemp; @@ -378,9 +375,6 @@ L20: i__3, i__4, i__5, i__6; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, l, info; static logical nota, notb; @@ -1051,9 +1045,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static complex temp; @@ -1442,9 +1433,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, jy, kx, info; static complex temp; @@ -1837,9 +1825,6 @@ L20: real r__1; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static complex temp1, temp2; @@ -2248,9 +2233,6 @@ L20: real r__1; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static complex temp1, temp2; @@ -2677,9 +2659,6 @@ L20: real r__1; complex q__1, q__2, q__3, q__4, q__5, q__6; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, l, info; static complex temp1, temp2; @@ -3329,9 +3308,6 @@ L20: real r__1; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, l, info; static complex temp; @@ -4039,9 +4015,6 @@ L20: real r__1, r__2; complex q__1; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static integer i__, nincx; @@ -4196,9 +4169,6 @@ L20: i__6; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, k, info; static complex temp; @@ -4859,9 +4829,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, jx, kx, info; static complex temp; @@ -5396,9 +5363,6 @@ L20: i__6, i__7; complex q__1, q__2, q__3; - /* Builtin functions */ - void c_div(complex *, complex *, complex *), r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, k, info; static complex temp; @@ -6069,9 +6033,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2, q__3; - /* Builtin functions */ - void c_div(complex *, complex *, complex *), r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, ix, jx, kx, info; static complex temp; @@ -6667,9 +6628,6 @@ doublereal dcabs1_(doublecomplex *z__) /* System generated locals */ doublereal ret_val, d__1, d__2; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Purpose ======= @@ -7719,9 +7677,6 @@ doublereal dnrm2_(integer *n, doublereal *x, integer *incx) integer i__1, i__2; doublereal ret_val, d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer ix; static doublereal ssq, norm, scale, absxi; @@ -10627,9 +10582,6 @@ doublereal dznrm2_(integer *n, doublecomplex *x, integer *incx) integer i__1, i__2, i__3; doublereal ret_val, d__1; - /* Builtin functions */ - double d_imag(doublecomplex *), sqrt(doublereal); - /* Local variables */ static integer ix; static doublereal ssq, temp, norm, scale; @@ -11125,9 +11077,6 @@ doublereal scabs1_(complex *z__) /* System generated locals */ real ret_val, r__1, r__2; - /* Builtin functions */ - double r_imag(complex *); - /* Purpose @@ -11148,9 +11097,6 @@ doublereal scasum_(integer *n, complex *cx, integer *incx) integer i__1, i__2, i__3; real ret_val, r__1, r__2; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static integer i__, nincx; static real stemp; @@ -11220,9 +11166,6 @@ doublereal scnrm2_(integer *n, complex *x, integer *incx) integer i__1, i__2, i__3; real ret_val, r__1; - /* Builtin functions */ - double r_imag(complex *), sqrt(doublereal); - /* Local variables */ static integer ix; static real ssq, temp, norm, scale; @@ -12337,9 +12280,6 @@ doublereal snrm2_(integer *n, real *x, integer *incx) integer i__1, i__2; real ret_val, r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer ix; static real ssq, norm, scale, absxi; @@ -15342,9 +15282,6 @@ L20: integer i__1, i__2; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, ix, iy; static doublecomplex ztemp; @@ -15725,9 +15662,6 @@ L20: i__3, i__4, i__5, i__6; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, l, info; static logical nota, notb; @@ -16399,9 +16333,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static doublecomplex temp; @@ -16791,9 +16722,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, jy, kx, info; static doublecomplex temp; @@ -17187,9 +17115,6 @@ L20: doublereal d__1; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static doublecomplex temp1, temp2; @@ -17599,9 +17524,6 @@ L20: doublereal d__1; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, iy, jx, jy, kx, ky, info; static doublecomplex temp1, temp2; @@ -18028,9 +17950,6 @@ L20: doublereal d__1; doublecomplex z__1, z__2, z__3, z__4, z__5, z__6; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, l, info; static doublecomplex temp1, temp2; @@ -18680,9 +18599,6 @@ L20: doublereal d__1; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, l, info; static doublecomplex temp; @@ -19339,9 +19255,6 @@ L20: i__6; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, k, info; static doublecomplex temp; @@ -20002,9 +19915,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, jx, kx, info; static doublecomplex temp; @@ -20539,10 +20449,6 @@ L20: i__6, i__7; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void z_div(doublecomplex *, doublecomplex *, doublecomplex *), d_cnjg( - doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, k, info; static doublecomplex temp; @@ -21213,10 +21119,6 @@ L20: integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void z_div(doublecomplex *, doublecomplex *, doublecomplex *), d_cnjg( - doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, ix, jx, kx, info; static doublecomplex temp; diff --git a/numpy/linalg/lapack_lite/f2c_c_lapack.c b/numpy/linalg/lapack_lite/f2c_c_lapack.c index 85dcf9477..25221ba55 100644 --- a/numpy/linalg/lapack_lite/f2c_c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_c_lapack.c @@ -270,9 +270,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; real r__1, r__2; - /* Builtin functions */ - double r_imag(complex *), c_abs(complex *); - /* Local variables */ static real c__, f, g; static integer i__, j, k, l, m; @@ -664,9 +661,6 @@ L210: integer a_dim1, a_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__; static complex alpha; @@ -1313,10 +1307,6 @@ L210: real r__1, r__2; complex q__1, q__2; - /* Builtin functions */ - double sqrt(doublereal), r_imag(complex *); - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, k, ihi; static real scl; @@ -1832,9 +1822,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__; static complex alpha; @@ -2704,9 +2691,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, k; static complex alpha; @@ -3079,9 +3063,6 @@ L50: integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2, i__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, ie, il, ir, iu, blk; static real dum[1], eps; @@ -5695,10 +5676,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - double c_abs(complex *); - void c_div(complex *, complex *, complex *); - /* Local variables */ static integer i__, j, jp; extern /* Subroutine */ int cscal_(integer *, complex *, complex *, @@ -6216,9 +6193,6 @@ L50: integer a_dim1, a_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real eps; static integer inde; @@ -7256,9 +7230,6 @@ L50: complex q__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static complex hl[2401] /* was [49][49] */; static integer kbot, nmin; @@ -8178,9 +8149,6 @@ L50: integer i__1, i__2; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, ioff; @@ -8480,9 +8448,6 @@ L50: real r__1; complex q__1; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int sgemm_(char *, char *, integer *, integer *, @@ -8624,9 +8589,6 @@ L50: real r__1, r__2, r__3, r__4; complex q__1; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static real zi, zr; extern /* Subroutine */ int sladiv_(real *, real *, real *, real *, real * @@ -8680,10 +8642,6 @@ L50: integer q_dim1, q_offset, qstore_dim1, qstore_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, k, ll, iq, lgn, msd2, smm1, spm1, spm2; static real temp; @@ -9033,9 +8991,6 @@ L80: /* System generated locals */ integer q_dim1, q_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, k, n1, n2, iq, iw, iz, ptr, indx, curr, indxc, indxp; extern /* Subroutine */ int claed8_(integer *, integer *, integer *, @@ -9338,9 +9293,6 @@ L80: integer q_dim1, q_offset, q2_dim1, q2_offset, i__1; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real c__; static integer i__, j; @@ -9761,13 +9713,6 @@ L100: real r__1, r__2, r__3, r__4, r__5, r__6; complex q__1, q__2, q__3, q__4, q__5, q__6, q__7; - /* Builtin functions */ - double r_imag(complex *); - void r_cnjg(complex *, complex *); - double c_abs(complex *); - void c_sqrt(complex *, complex *), pow_ci(complex *, complex *, integer *) - ; - /* Local variables */ static integer i__, j, k, l, m; static real s; @@ -10808,9 +10753,6 @@ doublereal clange_(char *norm, integer *m, integer *n, complex *a, integer * integer a_dim1, a_offset, i__1, i__2; real ret_val, r__1, r__2; - /* Builtin functions */ - double c_abs(complex *), sqrt(doublereal); - /* Local variables */ static integer i__, j; static real sum, scale; @@ -10977,9 +10919,6 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, complex *a, integer * integer a_dim1, a_offset, i__1, i__2; real ret_val, r__1, r__2, r__3; - /* Builtin functions */ - double c_abs(complex *), sqrt(doublereal); - /* Local variables */ static integer i__, j; static real sum, absa, scale; @@ -11215,10 +11154,6 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, complex *a, integer * real r__1, r__2, r__3, r__4, r__5, r__6, r__7, r__8; complex q__1, q__2, q__3, q__4, q__5; - /* Builtin functions */ - double r_imag(complex *); - void c_sqrt(complex *, complex *); - /* Local variables */ static integer i__, k; static real s; @@ -12000,9 +11935,6 @@ L80: real r__1, r__2, r__3, r__4, r__5, r__6; complex q__1, q__2, q__3, q__4, q__5, q__6, q__7, q__8; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static real s; static complex h21s, h31s; @@ -12175,10 +12107,6 @@ L80: real r__1, r__2, r__3, r__4, r__5, r__6; complex q__1, q__2; - /* Builtin functions */ - double r_imag(complex *); - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j; static complex s; @@ -12753,10 +12681,6 @@ L80: real r__1, r__2, r__3, r__4, r__5, r__6; complex q__1, q__2; - /* Builtin functions */ - double r_imag(complex *); - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j; static complex s; @@ -13347,10 +13271,6 @@ L80: real r__1, r__2, r__3, r__4, r__5, r__6, r__7, r__8; complex q__1, q__2, q__3, q__4, q__5; - /* Builtin functions */ - double r_imag(complex *); - void c_sqrt(complex *, complex *); - /* Local variables */ static integer i__, k; static real s; @@ -14136,10 +14056,6 @@ L80: real r__1, r__2, r__3, r__4, r__5, r__6, r__7, r__8, r__9, r__10; complex q__1, q__2, q__3, q__4, q__5, q__6, q__7, q__8; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - double r_imag(complex *); - /* Local variables */ static integer j, k, m, i2, j2, i4, j4, k1; static real h11, h12, h21, h22; @@ -15482,9 +15398,6 @@ L80: real r__1; complex q__1; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int sgemm_(char *, char *, integer *, integer *, @@ -15802,9 +15715,6 @@ L80: work_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j; extern /* Subroutine */ int cgemm_(char *, char *, integer *, integer *, @@ -16645,9 +16555,6 @@ L80: real r__1, r__2; complex q__1, q__2; - /* Builtin functions */ - double r_imag(complex *), r_sign(real *, real *); - /* Local variables */ static integer j, knt; static real beta; @@ -17146,11 +17053,6 @@ L36: real r__1, r__2, r__3, r__4, r__5, r__6, r__7, r__8, r__9, r__10; complex q__1, q__2, q__3; - /* Builtin functions */ - double log(doublereal), pow_ri(real *, integer *), r_imag(complex *), - sqrt(doublereal); - void r_cnjg(complex *, complex *); - /* Local variables */ static real d__; static integer i__; @@ -18493,9 +18395,6 @@ L10: integer i__1, i__2, i__3; real r__1; - /* Builtin functions */ - double r_imag(complex *); - /* Local variables */ static integer ix; static real temp1; @@ -19150,10 +19049,6 @@ L10: real r__1, r__2, r__3, r__4; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - double r_imag(complex *); - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j; static real xj, rec, tjj; @@ -20672,9 +20567,6 @@ L185: real r__1; complex q__1, q__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer j; static real ajj; @@ -21348,9 +21240,6 @@ L40: integer i__1, i__2, i__3, i__4; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, ix, iy; static complex stemp; @@ -21485,11 +21374,6 @@ L20: integer z_dim1, z_offset, i__1, i__2, i__3, i__4; real r__1, r__2; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, m; static real p; @@ -21955,9 +21839,6 @@ L70: integer z_dim1, z_offset, i__1, i__2; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static real b, c__, f, g; static integer i__, j, k, l, m; @@ -22558,10 +22439,6 @@ L160: real r__1, r__2, r__3; complex q__1, q__2; - /* Builtin functions */ - double r_imag(complex *); - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, k, ii, ki, is; static real ulp; @@ -23060,9 +22937,6 @@ L130: integer q_dim1, q_offset, t_dim1, t_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer k, m1, m2, m3; static real cs; @@ -23246,9 +23120,6 @@ L130: integer a_dim1, a_offset, i__1, i__2; complex q__1; - /* Builtin functions */ - void c_div(complex *, complex *, complex *); - /* Local variables */ static integer j; static complex ajj; @@ -23415,9 +23286,6 @@ L130: complex q__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer j, jb, nb, nn; extern logical lsame_(char *, char *); @@ -24266,9 +24134,6 @@ L130: integer a_dim1, a_offset, i__1, i__2, i__3; complex q__1, q__2; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int cscal_(integer *, complex *, complex *, @@ -24959,9 +24824,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, i1, i2, i3, mi, ni, nq; static complex aii; @@ -25174,9 +25036,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, i1, i2, i3, ic, jc, mi, ni, nq; static complex aii; @@ -25395,9 +25254,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2]; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -25738,9 +25594,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, nh, ni, nq, nw; static logical left; @@ -25965,9 +25818,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; complex q__1; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ static integer i__, i1, i2, i3, ic, jc, mi, ni, nq; static complex aii; @@ -26195,9 +26045,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static complex t[4160] /* was [65][64] */; @@ -26503,9 +26350,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static complex t[4160] /* was [65][64] */; @@ -26804,9 +26648,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static complex t[4160] /* was [65][64] */; @@ -27104,9 +26945,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2, i__3; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; diff --git a/numpy/linalg/lapack_lite/f2c_config.c b/numpy/linalg/lapack_lite/f2c_config.c index 1aa11ce5c..2fe608227 100644 --- a/numpy/linalg/lapack_lite/f2c_config.c +++ b/numpy/linalg/lapack_lite/f2c_config.c @@ -43,9 +43,6 @@ doublereal dlamch_(char *cmach) integer i__1; doublereal ret_val; - /* Builtin functions */ - double pow_di(doublereal *, integer *); - /* Local variables */ static doublereal t; static integer it; @@ -397,10 +394,6 @@ L30: integer i__1; doublereal d__1, d__2, d__3, d__4, d__5; - /* Builtin functions */ - double pow_di(doublereal *, integer *); - integer s_wsfe(cilist *), do_fio(integer *, char *, ftnlen), e_wsfe(void); - /* Local variables */ static doublereal a, b, c__; static integer i__, lt; @@ -696,7 +689,7 @@ L10: doublereal dlamc3_(doublereal *a, doublereal *b) { /* System generated locals */ - volatile doublereal ret_val; + doublereal ret_val; /* @@ -1121,9 +1114,6 @@ doublereal slamch_(char *cmach) integer i__1; real ret_val; - /* Builtin functions */ - double pow_ri(real *, integer *); - /* Local variables */ static real t; static integer it; @@ -1474,10 +1464,6 @@ L30: integer i__1; real r__1, r__2, r__3, r__4, r__5; - /* Builtin functions */ - double pow_ri(real *, integer *); - integer s_wsfe(cilist *), do_fio(integer *, char *, ftnlen), e_wsfe(void); - /* Local variables */ static real a, b, c__; static integer i__, lt; @@ -1773,7 +1759,7 @@ L10: doublereal slamc3_(real *a, real *b) { /* System generated locals */ - volatile real ret_val; + real ret_val; /* diff --git a/numpy/linalg/lapack_lite/f2c_d_lapack.c b/numpy/linalg/lapack_lite/f2c_d_lapack.c index b84ef2ec0..1a6675ef1 100644 --- a/numpy/linalg/lapack_lite/f2c_d_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_d_lapack.c @@ -63,9 +63,6 @@ static doublereal c_b3192 = 2.; integer u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double d_sign(doublereal *, doublereal *), log(doublereal); - /* Local variables */ static integer i__, j, k; static doublereal p, r__; @@ -555,10 +552,6 @@ L40: i__2; doublereal d__1, d__2, d__3, d__4; - /* Builtin functions */ - double pow_dd(doublereal *, doublereal *), sqrt(doublereal), d_sign( - doublereal *, doublereal *); - /* Local variables */ static doublereal f, g, h__; static integer i__, j, m; @@ -2660,9 +2653,6 @@ L210: i__2, i__3; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, k; static doublereal r__, cs, sn; @@ -4067,9 +4057,6 @@ L50: /* System generated locals */ integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2, i__3, i__4; - /* Builtin functions */ - double log(doublereal); - /* Local variables */ static integer ie, il, mm; static doublereal eps, anrm, bnrm; @@ -5132,9 +5119,6 @@ L10: integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2, i__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, ie, il, ir, iu, blk; static doublereal dum[1], eps; @@ -7496,9 +7480,6 @@ L10: doublereal d__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublereal hl[2401] /* was [49][49] */; @@ -7986,9 +7967,6 @@ logical disnan_(doublereal *din) /* Subroutine */ int dlabad_(doublereal *small, doublereal *large) { - /* Builtin functions */ - double d_lg10(doublereal *), sqrt(doublereal); - /* -- LAPACK auxiliary routine (version 3.2) -- @@ -8612,9 +8590,6 @@ logical disnan_(doublereal *din) /* System generated locals */ doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal ab, df, tb, sm, rt, adf, acmn, acmx; @@ -8741,10 +8716,6 @@ logical disnan_(doublereal *din) integer q_dim1, q_offset, qstore_dim1, qstore_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, k, iq, lgn, msd2, smm1, spm1, spm2; static doublereal temp; @@ -9388,9 +9359,6 @@ L20: integer q_dim1, q_offset, i__1, i__2; doublereal d__1, d__2, d__3, d__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal c__; static integer i__, j; @@ -9902,9 +9870,6 @@ L190: integer q_dim1, q_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer i__, j, n2, n12, ii, n23, iq2; static doublereal temp; @@ -10209,9 +10174,6 @@ L120: integer i__1; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal a, b, c__; static integer j; @@ -11155,9 +11117,6 @@ L250: /* System generated locals */ doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal b, c__, w, del, tau, temp; @@ -11283,9 +11242,6 @@ L250: integer i__1; doublereal d__1, d__2, d__3, d__4; - /* Builtin functions */ - double sqrt(doublereal), log(doublereal), pow_di(doublereal *, integer *); - /* Local variables */ static doublereal a, b, c__, f; static integer i__; @@ -11639,9 +11595,6 @@ L60: /* System generated locals */ integer q_dim1, q_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, k, n1, n2, is, iw, iz, iq2, ptr, ldq2, indx, curr; extern /* Subroutine */ int dgemm_(char *, char *, integer *, integer *, @@ -11968,9 +11921,6 @@ L30: integer q_dim1, q_offset, q2_dim1, q2_offset, i__1; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal c__; static integer i__, j; @@ -12427,9 +12377,6 @@ L110: integer q_dim1, q_offset, s_dim1, s_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer i__, j; static doublereal temp; @@ -12674,10 +12621,6 @@ L120: /* System generated locals */ integer i__1, i__2, i__3; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, k, mid, ptr; extern /* Subroutine */ int drot_(integer *, doublereal *, integer *, @@ -12936,9 +12879,6 @@ L120: /* System generated locals */ doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal ab, df, cs, ct, tb, sm, tn, rt, adf, acs; static integer sgn1, sgn2; @@ -13549,9 +13489,6 @@ L50: integer h_dim1, h_offset, z_dim1, z_offset, i__1, i__2, i__3; doublereal d__1, d__2, d__3, d__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, l, m; static doublereal s, v[3]; @@ -15525,9 +15462,6 @@ logical dlaisnan_(doublereal *din1, doublereal *din2) u_dim1, u_offset, vt_dim1, vt_offset, z_dim1, z_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, i1, ic, lf, nd, ll, nl, nr, im1, nlf, nrf, lvl, ndb1, nlp1, lvl2, nrp1, nlvl, sqre; @@ -15965,9 +15899,6 @@ L90: integer b_dim1, b_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double log(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer c__, i__, j, k; static doublereal r__; @@ -16583,9 +16514,6 @@ doublereal dlange_(char *norm, integer *m, integer *n, doublereal *a, integer integer a_dim1, a_offset, i__1, i__2; doublereal ret_val, d__1, d__2, d__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j; static doublereal sum, scale; @@ -16751,9 +16679,6 @@ doublereal dlanst_(char *norm, integer *n, doublereal *d__, doublereal *e) integer i__1; doublereal ret_val, d__1, d__2, d__3, d__4, d__5; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__; static doublereal sum, scale; @@ -16888,9 +16813,6 @@ doublereal dlansy_(char *norm, char *uplo, integer *n, doublereal *a, integer integer a_dim1, a_offset, i__1, i__2; doublereal ret_val, d__1, d__2, d__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j; static doublereal sum, absa, scale; @@ -17097,9 +17019,6 @@ doublereal dlansy_(char *norm, char *uplo, integer *n, doublereal *a, integer /* System generated locals */ doublereal d__1, d__2; - /* Builtin functions */ - double d_sign(doublereal *, doublereal *), sqrt(doublereal); - /* Local variables */ static doublereal p, z__, aa, bb, cc, dd, cs1, sn1, sab, sac, eps, tau, temp, scale, bcmax, bcmis, sigma; @@ -17312,9 +17231,6 @@ doublereal dlapy2_(doublereal *x, doublereal *y) /* System generated locals */ doublereal ret_val, d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal w, z__, xabs, yabs; @@ -17365,9 +17281,6 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) /* System generated locals */ doublereal ret_val, d__1, d__2, d__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal w, xabs, yabs, zabs; @@ -18309,9 +18222,6 @@ L90: wv_offset, z_dim1, z_offset, i__1, i__2, i__3, i__4; doublereal d__1, d__2, d__3, d__4, d__5, d__6; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static doublereal s, aa, bb, cc, dd, cs, sn; @@ -18988,9 +18898,6 @@ L60: wv_offset, z_dim1, z_offset, i__1, i__2, i__3, i__4; doublereal d__1, d__2, d__3, d__4, d__5, d__6; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static doublereal s, aa, bb, cc, dd, cs, sn; @@ -22434,9 +22341,6 @@ L90: integer i__1; doublereal d__1; - /* Builtin functions */ - double d_sign(doublereal *, doublereal *); - /* Local variables */ static integer j, knt; static doublereal beta; @@ -23585,9 +23489,6 @@ L410: integer i__1; doublereal d__1, d__2; - /* Builtin functions */ - double log(doublereal), pow_di(doublereal *, integer *), sqrt(doublereal); - /* Local variables */ static integer i__; static doublereal f1, g1, eps, scale; @@ -23750,9 +23651,6 @@ L30: /* System generated locals */ doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal c__, fa, ga, ha, as, at, au, fhmn, fhmx; @@ -24210,9 +24108,6 @@ L10: /* System generated locals */ integer u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, m, i1, ic, lf, nd, ll, nl, nr, im1, ncc, nlf, nrf, iwk, lvl, ndb1, nlp1, nrp1; @@ -25341,9 +25236,6 @@ L120: vt_offset, vt2_dim1, vt2_offset, i__1, i__2; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer i__, j, m, n, jc; static doublereal rho; @@ -25761,9 +25653,6 @@ L100: integer i__1; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal a, b, c__; static integer j; @@ -26771,9 +26660,6 @@ L240: /* System generated locals */ doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal b, c__, w, del, tau, delsq; @@ -27789,9 +27675,6 @@ L100: integer difr_dim1, difr_offset, i__1, i__2; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer i__, j; static doublereal dj, rho; @@ -28091,9 +27974,6 @@ L100: poles_dim1, poles_offset, u_dim1, u_offset, vt_dim1, vt_offset, z_dim1, z_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, m, i1, ic, lf, nd, ll, nl, vf, nr, vl, im1, ncc, nlf, nrf, vfi, iwk, vli, lvl, nru, ndb1, nlp1, lvl2, nrp1; @@ -28908,9 +28788,6 @@ L100: /* System generated locals */ integer i__1, i__2; - /* Builtin functions */ - double log(doublereal); - /* Local variables */ static integer i__, il, ir, maxn; static doublereal temp; @@ -29159,9 +29036,6 @@ L100: integer i__1, i__2; doublereal d__1, d__2, d__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__; static doublereal eps; @@ -29346,9 +29220,6 @@ L100: integer i__1, i__2, i__3; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal d__, e, g; static integer k; @@ -29926,9 +29797,6 @@ L170: integer i__1; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal s, t; static integer j4, nn; @@ -30260,9 +30128,6 @@ L90: integer i__1; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal s, a2, b1, b2; static integer i4, nn, np; @@ -31827,9 +31692,6 @@ L110: /* System generated locals */ doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static doublereal a, d__, l, m, r__, s, t, fa, ga, ha, ft, gt, ht, mm, tt, clt, crt, slt, srt; @@ -35022,9 +34884,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2]; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -35356,9 +35215,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, nh, ni, nq, nw; static logical left; @@ -35790,9 +35646,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublereal t[4160] /* was [65][64] */; @@ -36097,9 +35950,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublereal t[4160] /* was [65][64] */; @@ -36397,9 +36247,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublereal t[4160] /* was [65][64] */; @@ -36696,9 +36543,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2, i__3; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -36963,9 +36807,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer j; static doublereal ajj; @@ -37616,11 +37457,6 @@ L40: integer z_dim1, z_offset, i__1, i__2; doublereal d__1, d__2; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, m; static doublereal p; @@ -38082,9 +37918,6 @@ L50: integer z_dim1, z_offset, i__1, i__2; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static doublereal b, c__, f, g; static integer i__, j, k, l, m; @@ -38682,9 +38515,6 @@ L190: integer i__1; doublereal d__1, d__2, d__3; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static doublereal c__; static integer i__, l, m; @@ -39124,9 +38954,6 @@ L180: integer a_dim1, a_offset, i__1, i__2, i__3; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal eps; static integer inde; @@ -40078,9 +39905,6 @@ L180: i__2, i__3; doublereal d__1, d__2, d__3, d__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static doublereal x[4] /* was [2][2] */; @@ -41838,9 +41662,6 @@ L20: integer a_dim1, a_offset, i__1, i__2[2], i__3, i__4, i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer j, jb, nb, nn; extern logical lsame_(char *, char *); diff --git a/numpy/linalg/lapack_lite/f2c_lapack.c b/numpy/linalg/lapack_lite/f2c_lapack.c index e1aa860fa..d956ddbbb 100644 --- a/numpy/linalg/lapack_lite/f2c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_lapack.c @@ -476,10 +476,6 @@ integer ilaenv_(integer *ispec, char *name__, char *opts, integer *n1, /* System generated locals */ integer ret_val; - /* Builtin functions */ - /* Subroutine */ int s_copy(char *, char *, ftnlen, ftnlen); - integer s_cmp(char *, char *, ftnlen, ftnlen); - /* Local variables */ static integer i__; static char c1[1], c2[2], c3[3], c4[2]; @@ -1395,10 +1391,6 @@ integer iparmq_(integer *ispec, char *name__, char *opts, integer *n, integer integer ret_val, i__1, i__2; real r__1; - /* Builtin functions */ - double log(doublereal); - integer i_nint(real *); - /* Local variables */ static integer nh, ns; diff --git a/numpy/linalg/lapack_lite/f2c_s_lapack.c b/numpy/linalg/lapack_lite/f2c_s_lapack.c index 9bd8d2455..04080f81d 100644 --- a/numpy/linalg/lapack_lite/f2c_s_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_s_lapack.c @@ -59,9 +59,6 @@ static real c_b2863 = 2.f; integer u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double r_sign(real *, real *), log(doublereal); - /* Local variables */ static integer i__, j, k; static real p, r__; @@ -549,10 +546,6 @@ L40: real r__1, r__2, r__3, r__4; doublereal d__1; - /* Builtin functions */ - double pow_dd(doublereal *, doublereal *), sqrt(doublereal), r_sign(real * - , real *); - /* Local variables */ static real f, g, h__; static integer i__, j, m; @@ -2648,9 +2641,6 @@ L210: i__2, i__3; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, k; static real r__, cs, sn; @@ -4407,9 +4397,6 @@ L50: integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2, i__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, ie, il, ir, iu, blk; static real dum[1], eps; @@ -6770,9 +6757,6 @@ L50: real r__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static real hl[2401] /* was [49][49] */; @@ -7258,9 +7242,6 @@ logical sisnan_(real *sin__) /* Subroutine */ int slabad_(real *small, real *large) { - /* Builtin functions */ - double r_lg10(real *), sqrt(doublereal); - /* -- LAPACK auxiliary routine (version 3.2) -- @@ -7881,9 +7862,6 @@ logical sisnan_(real *sin__) /* System generated locals */ real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real ab, df, tb, sm, rt, adf, acmn, acmx; @@ -8009,10 +7987,6 @@ logical sisnan_(real *sin__) integer q_dim1, q_offset, qstore_dim1, qstore_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, k, iq, lgn, msd2, smm1, spm1, spm2; static real temp; @@ -8648,9 +8622,6 @@ L20: integer q_dim1, q_offset, i__1, i__2; real r__1, r__2, r__3, r__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real c__; static integer i__, j; @@ -9160,9 +9131,6 @@ L190: integer q_dim1, q_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static integer i__, j, n2, n12, ii, n23, iq2; static real temp; @@ -9465,9 +9433,6 @@ L120: integer i__1; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real a, b, c__; static integer j; @@ -10410,9 +10375,6 @@ L250: /* System generated locals */ real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real b, c__, w, del, tau, temp; @@ -10538,9 +10500,6 @@ L250: integer i__1; real r__1, r__2, r__3, r__4; - /* Builtin functions */ - double sqrt(doublereal), log(doublereal), pow_ri(real *, integer *); - /* Local variables */ static real a, b, c__, f; static integer i__; @@ -10896,9 +10855,6 @@ L60: /* System generated locals */ integer q_dim1, q_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, k, n1, n2, is, iw, iz, iq2, ptr, ldq2, indx, curr, indxc; @@ -11223,9 +11179,6 @@ L30: integer q_dim1, q_offset, q2_dim1, q2_offset, i__1; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real c__; static integer i__, j; @@ -11682,9 +11635,6 @@ L110: integer q_dim1, q_offset, s_dim1, s_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static integer i__, j; static real temp; @@ -11928,10 +11878,6 @@ L120: /* System generated locals */ integer i__1, i__2, i__3; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, k, mid, ptr, curr; extern /* Subroutine */ int srot_(integer *, real *, integer *, real *, @@ -12186,9 +12132,6 @@ L120: /* System generated locals */ real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real ab, df, cs, ct, tb, sm, tn, rt, adf, acs; static integer sgn1, sgn2; @@ -12799,9 +12742,6 @@ L50: integer h_dim1, h_offset, z_dim1, z_offset, i__1, i__2, i__3; real r__1, r__2, r__3, r__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, l, m; static real s, v[3]; @@ -14428,9 +14368,6 @@ doublereal slange_(char *norm, integer *m, integer *n, real *a, integer *lda, integer a_dim1, a_offset, i__1, i__2; real ret_val, r__1, r__2, r__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j; static real sum, scale; @@ -14596,9 +14533,6 @@ doublereal slanst_(char *norm, integer *n, real *d__, real *e) integer i__1; real ret_val, r__1, r__2, r__3, r__4, r__5; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__; static real sum, scale; @@ -14733,9 +14667,6 @@ doublereal slansy_(char *norm, char *uplo, integer *n, real *a, integer *lda, integer a_dim1, a_offset, i__1, i__2; real ret_val, r__1, r__2, r__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j; static real sum, absa, scale; @@ -14941,9 +14872,6 @@ doublereal slansy_(char *norm, char *uplo, integer *n, real *a, integer *lda, /* System generated locals */ real r__1, r__2; - /* Builtin functions */ - double r_sign(real *, real *), sqrt(doublereal); - /* Local variables */ static real p, z__, aa, bb, cc, dd, cs1, sn1, sab, sac, eps, tau, temp, scale, bcmax, bcmis, sigma; @@ -15156,9 +15084,6 @@ doublereal slapy2_(real *x, real *y) /* System generated locals */ real ret_val, r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real w, z__, xabs, yabs; @@ -15209,9 +15134,6 @@ doublereal slapy3_(real *x, real *y, real *z__) /* System generated locals */ real ret_val, r__1, r__2, r__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real w, xabs, yabs, zabs; @@ -16147,9 +16069,6 @@ L90: wv_offset, z_dim1, z_offset, i__1, i__2, i__3, i__4; real r__1, r__2, r__3, r__4, r__5, r__6; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static real s, aa, bb, cc, dd, cs, sn; @@ -16822,9 +16741,6 @@ L60: wv_offset, z_dim1, z_offset, i__1, i__2, i__3, i__4; real r__1, r__2, r__3, r__4, r__5, r__6; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static real s, aa, bb, cc, dd, cs, sn; @@ -20258,9 +20174,6 @@ L90: integer i__1; real r__1; - /* Builtin functions */ - double r_sign(real *, real *); - /* Local variables */ static integer j, knt; static real beta; @@ -21404,9 +21317,6 @@ L410: integer i__1; real r__1, r__2; - /* Builtin functions */ - double log(doublereal), pow_ri(real *, integer *), sqrt(doublereal); - /* Local variables */ static integer i__; static real f1, g1, eps, scale; @@ -21569,9 +21479,6 @@ L30: /* System generated locals */ real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real c__, fa, ga, ha, as, at, au, fhmn, fhmx; @@ -22030,9 +21937,6 @@ L10: /* System generated locals */ integer u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, m, i1, ic, lf, nd, ll, nl, nr, im1, ncc, nlf, nrf, iwk, lvl, ndb1, nlp1, nrp1; @@ -23153,9 +23057,6 @@ L120: vt_offset, vt2_dim1, vt2_offset, i__1, i__2; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static integer i__, j, m, n, jc; static real rho; @@ -23570,9 +23471,6 @@ L100: integer i__1; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real a, b, c__; static integer j; @@ -24579,9 +24477,6 @@ L240: /* System generated locals */ real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real b, c__, w, del, tau, delsq; @@ -25592,9 +25487,6 @@ L100: integer difr_dim1, difr_offset, i__1, i__2; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static integer i__, j; static real dj, rho; @@ -25891,9 +25783,6 @@ L100: poles_dim1, poles_offset, u_dim1, u_offset, vt_dim1, vt_offset, z_dim1, z_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, m, i1, ic, lf, nd, ll, nl, vf, nr, vl, im1, ncc, nlf, nrf, vfi, iwk, vli, lvl, nru, ndb1, nlp1, lvl2, nrp1; @@ -26703,9 +26592,6 @@ L100: /* System generated locals */ integer i__1, i__2; - /* Builtin functions */ - double log(doublereal); - /* Local variables */ static integer i__, il, ir, maxn; static real temp; @@ -26954,9 +26840,6 @@ L100: integer i__1, i__2; real r__1, r__2, r__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__; static real eps; @@ -27138,9 +27021,6 @@ L100: integer i__1, i__2, i__3; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real d__, e, g; static integer k; @@ -27719,9 +27599,6 @@ L170: integer i__1; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real s, t; static integer j4, nn; @@ -28049,9 +27926,6 @@ L90: integer i__1; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real s, a2, b1, b2; static integer i4, nn, np; @@ -29612,9 +29486,6 @@ L110: /* System generated locals */ real r__1; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static real a, d__, l, m, r__, s, t, fa, ga, ha, ft, gt, ht, mm, tt, clt, crt, slt, srt; @@ -32792,9 +32663,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2]; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -33124,9 +32992,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, nh, ni, nq, nw; static logical left; @@ -33557,9 +33422,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static real t[4160] /* was [65][64] */; @@ -33864,9 +33726,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static real t[4160] /* was [65][64] */; @@ -34165,9 +34024,6 @@ L50: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static real t[4160] /* was [65][64] */; @@ -34464,9 +34320,6 @@ L50: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2, i__3; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -34731,9 +34584,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer j; static real ajj; @@ -35376,11 +35226,6 @@ L40: integer z_dim1, z_offset, i__1, i__2; real r__1, r__2; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, m; static real p; @@ -35837,9 +35682,6 @@ L50: integer z_dim1, z_offset, i__1, i__2; real r__1, r__2; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static real b, c__, f, g; static integer i__, j, k, l, m; @@ -36433,9 +36275,6 @@ L190: integer i__1; real r__1, r__2, r__3; - /* Builtin functions */ - double sqrt(doublereal), r_sign(real *, real *); - /* Local variables */ static real c__; static integer i__, l, m; @@ -36875,9 +36714,6 @@ L180: integer a_dim1, a_offset, i__1, i__2; real r__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static real eps; static integer inde; @@ -37813,9 +37649,6 @@ L180: i__2, i__3; real r__1, r__2, r__3, r__4; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k; static real x[4] /* was [2][2] */; @@ -39569,9 +39402,6 @@ L20: integer a_dim1, a_offset, i__1, i__2[2], i__3, i__4, i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer j, jb, nb, nn; extern logical lsame_(char *, char *); diff --git a/numpy/linalg/lapack_lite/f2c_z_lapack.c b/numpy/linalg/lapack_lite/f2c_z_lapack.c index e310331a3..0f11f2e72 100644 --- a/numpy/linalg/lapack_lite/f2c_z_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_z_lapack.c @@ -270,9 +270,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; doublereal d__1, d__2; - /* Builtin functions */ - double d_imag(doublecomplex *), z_abs(doublecomplex *); - /* Local variables */ static doublereal c__, f, g; static integer i__, j, k, l, m; @@ -664,9 +661,6 @@ L210: integer a_dim1, a_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__; static doublecomplex alpha; @@ -1316,10 +1310,6 @@ L210: doublereal d__1, d__2; doublecomplex z__1, z__2; - /* Builtin functions */ - double sqrt(doublereal), d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, k, ihi; static doublereal scl; @@ -1840,9 +1830,6 @@ L50: integer a_dim1, a_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__; static doublecomplex alpha; @@ -2721,9 +2708,6 @@ L50: /* System generated locals */ integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2, i__3, i__4; - /* Builtin functions */ - double log(doublereal); - /* Local variables */ static integer ie, il, mm; static doublereal eps, anrm, bnrm; @@ -3461,9 +3445,6 @@ L10: integer a_dim1, a_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, k; static doublecomplex alpha; @@ -3841,9 +3822,6 @@ L10: integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1, i__2, i__3; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer i__, ie, il, ir, iu, blk; static doublereal dum[1], eps; @@ -6471,10 +6449,6 @@ L10: integer a_dim1, a_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - double z_abs(doublecomplex *); - void z_div(doublecomplex *, doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, jp; static doublereal sfmin; @@ -6993,9 +6967,6 @@ L10: integer a_dim1, a_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal eps; static integer inde; @@ -8042,9 +8013,6 @@ L10: doublecomplex z__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static doublecomplex hl[2401] /* was [49][49] */; static integer kbot, nmin; @@ -8968,9 +8936,6 @@ L10: integer i__1, i__2; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, ioff; @@ -9271,9 +9236,6 @@ L10: doublereal d__1; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int dgemm_(char *, char *, integer *, integer *, @@ -9416,9 +9378,6 @@ L10: doublereal d__1, d__2, d__3, d__4; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static doublereal zi, zr; extern /* Subroutine */ int dladiv_(doublereal *, doublereal *, @@ -9472,10 +9431,6 @@ L10: integer q_dim1, q_offset, qstore_dim1, qstore_offset, i__1, i__2; doublereal d__1; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, k, ll, iq, lgn, msd2, smm1, spm1, spm2; static doublereal temp; @@ -9824,9 +9779,6 @@ L80: /* System generated locals */ integer q_dim1, q_offset, i__1, i__2; - /* Builtin functions */ - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, k, n1, n2, iq, iw, iz, ptr, indx, curr, indxc, indxp; extern /* Subroutine */ int dlaed9_(integer *, integer *, integer *, @@ -10132,9 +10084,6 @@ L80: integer q_dim1, q_offset, q2_dim1, q2_offset, i__1; doublereal d__1; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static doublereal c__; static integer i__, j; @@ -10554,13 +10503,6 @@ L100: doublereal d__1, d__2, d__3, d__4, d__5, d__6; doublecomplex z__1, z__2, z__3, z__4, z__5, z__6, z__7; - /* Builtin functions */ - double d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - double z_abs(doublecomplex *); - void z_sqrt(doublecomplex *, doublecomplex *), pow_zi(doublecomplex *, - doublecomplex *, integer *); - /* Local variables */ static integer i__, j, k, l, m; static doublereal s; @@ -11612,9 +11554,6 @@ L150: doublereal d__1; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static integer i__, j, m, n; static doublereal dj; @@ -12154,10 +12093,6 @@ L150: i__2, i__3, i__4, i__5, i__6; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - integer pow_ii(integer *, integer *); - /* Local variables */ static integer i__, j, i1, ic, lf, nd, ll, nl, nr, im1, nlf, nrf, lvl, ndb1, nlp1, lvl2, nrp1, jcol, nlvl, sqre, jrow, jimag; @@ -12808,10 +12743,6 @@ L330: doublereal d__1; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *), log(doublereal), d_sign(doublereal *, - doublereal *); - /* Local variables */ static integer c__, i__, j, k; static doublereal r__; @@ -13550,9 +13481,6 @@ doublereal zlange_(char *norm, integer *m, integer *n, doublecomplex *a, integer a_dim1, a_offset, i__1, i__2; doublereal ret_val, d__1, d__2; - /* Builtin functions */ - double z_abs(doublecomplex *), sqrt(doublereal); - /* Local variables */ static integer i__, j; static doublereal sum, scale; @@ -13719,9 +13647,6 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, integer a_dim1, a_offset, i__1, i__2; doublereal ret_val, d__1, d__2, d__3; - /* Builtin functions */ - double z_abs(doublecomplex *), sqrt(doublereal); - /* Local variables */ static integer i__, j; static doublereal sum, absa, scale; @@ -13957,10 +13882,6 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, doublereal d__1, d__2, d__3, d__4, d__5, d__6, d__7, d__8; doublecomplex z__1, z__2, z__3, z__4, z__5; - /* Builtin functions */ - double d_imag(doublecomplex *); - void z_sqrt(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, k; static doublereal s; @@ -14745,9 +14666,6 @@ L80: doublereal d__1, d__2, d__3, d__4, d__5, d__6; doublecomplex z__1, z__2, z__3, z__4, z__5, z__6, z__7, z__8; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static doublereal s; static doublecomplex h21s, h31s; @@ -14921,10 +14839,6 @@ L80: doublereal d__1, d__2, d__3, d__4, d__5, d__6; doublecomplex z__1, z__2; - /* Builtin functions */ - double d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j; static doublecomplex s; @@ -15507,10 +15421,6 @@ L80: doublereal d__1, d__2, d__3, d__4, d__5, d__6; doublecomplex z__1, z__2; - /* Builtin functions */ - double d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j; static doublecomplex s; @@ -16110,10 +16020,6 @@ L80: doublereal d__1, d__2, d__3, d__4, d__5, d__6, d__7, d__8; doublecomplex z__1, z__2, z__3, z__4, z__5; - /* Builtin functions */ - double d_imag(doublecomplex *); - void z_sqrt(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, k; static doublereal s; @@ -16903,10 +16809,6 @@ L80: doublereal d__1, d__2, d__3, d__4, d__5, d__6, d__7, d__8, d__9, d__10; doublecomplex z__1, z__2, z__3, z__4, z__5, z__6, z__7, z__8; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - double d_imag(doublecomplex *); - /* Local variables */ static integer j, k, m, i2, j2, i4, j4, k1; static doublereal h11, h12, h21, h22; @@ -18253,9 +18155,6 @@ L80: doublereal d__1; doublecomplex z__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int dgemm_(char *, char *, integer *, integer *, @@ -18575,9 +18474,6 @@ L80: work_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j; extern logical lsame_(char *, char *); @@ -19420,9 +19316,6 @@ L80: doublereal d__1, d__2; doublecomplex z__1, z__2; - /* Builtin functions */ - double d_imag(doublecomplex *), d_sign(doublereal *, doublereal *); - /* Local variables */ static integer j, knt; static doublereal beta, alphi, alphr; @@ -19923,11 +19816,6 @@ L36: doublereal d__1, d__2, d__3, d__4, d__5, d__6, d__7, d__8, d__9, d__10; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - double log(doublereal), pow_di(doublereal *, integer *), d_imag( - doublecomplex *), sqrt(doublereal); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static doublereal d__; static integer i__; @@ -21272,9 +21160,6 @@ L10: integer i__1, i__2, i__3; doublereal d__1; - /* Builtin functions */ - double d_imag(doublecomplex *); - /* Local variables */ static integer ix; static doublereal temp1; @@ -21931,10 +21816,6 @@ L10: doublereal d__1, d__2, d__3, d__4; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - double d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j; static doublereal xj, rec, tjj; @@ -23456,9 +23337,6 @@ L210: doublereal d__1; doublecomplex z__1, z__2; - /* Builtin functions */ - double sqrt(doublereal); - /* Local variables */ static integer j; static doublereal ajj; @@ -24133,9 +24011,6 @@ L40: integer i__1, i__2, i__3, i__4; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, ix, iy; static doublecomplex stemp; @@ -24270,11 +24145,6 @@ L20: integer z_dim1, z_offset, i__1, i__2, i__3, i__4; doublereal d__1, d__2; - /* Builtin functions */ - double log(doublereal); - integer pow_ii(integer *, integer *); - double sqrt(doublereal); - /* Local variables */ static integer i__, j, k, m; static doublereal p; @@ -24742,9 +24612,6 @@ L70: integer z_dim1, z_offset, i__1, i__2; doublereal d__1, d__2; - /* Builtin functions */ - double sqrt(doublereal), d_sign(doublereal *, doublereal *); - /* Local variables */ static doublereal b, c__, f, g; static integer i__, j, k, l, m; @@ -25345,10 +25212,6 @@ L160: doublereal d__1, d__2, d__3; doublecomplex z__1, z__2; - /* Builtin functions */ - double d_imag(doublecomplex *); - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, k, ii, ki, is; static doublereal ulp; @@ -25848,9 +25711,6 @@ L130: integer q_dim1, q_offset, t_dim1, t_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer k, m1, m2, m3; static doublereal cs; @@ -26035,9 +25895,6 @@ L130: integer a_dim1, a_offset, i__1, i__2; doublecomplex z__1; - /* Builtin functions */ - void z_div(doublecomplex *, doublecomplex *, doublecomplex *); - /* Local variables */ static integer j; static doublecomplex ajj; @@ -26204,9 +26061,6 @@ L130: doublecomplex z__1; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer j, jb, nb, nn; extern logical lsame_(char *, char *); @@ -27059,9 +26913,6 @@ L130: integer a_dim1, a_offset, i__1, i__2, i__3; doublecomplex z__1, z__2; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, j, l; extern /* Subroutine */ int zscal_(integer *, doublecomplex *, @@ -27757,9 +27608,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, i1, i2, i3, mi, ni, nq; static doublecomplex aii; @@ -27972,9 +27820,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, i1, i2, i3, ic, jc, mi, ni, nq; static doublecomplex aii; @@ -28193,9 +28038,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2]; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; @@ -28534,9 +28376,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, nh, ni, nq, nw; static logical left; @@ -28761,9 +28600,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3; doublecomplex z__1; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ static integer i__, i1, i2, i3, ic, jc, mi, ni, nq; static doublecomplex aii; @@ -28991,9 +28827,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublecomplex t[4160] /* was [65][64] */; @@ -29302,9 +29135,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublecomplex t[4160] /* was [65][64] */; @@ -29607,9 +29437,6 @@ L130: i__5; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i__; static doublecomplex t[4160] /* was [65][64] */; @@ -29911,9 +29738,6 @@ L130: integer a_dim1, a_offset, c_dim1, c_offset, i__1[2], i__2, i__3; char ch__1[2]; - /* Builtin functions */ - /* Subroutine */ int s_cat(char *, char **, integer *, integer *, ftnlen); - /* Local variables */ static integer i1, i2, nb, mi, ni, nq, nw; static logical left; diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py index 4c6495229..61102d6ab 100755 --- a/numpy/linalg/lapack_lite/make_lite.py +++ b/numpy/linalg/lapack_lite/make_lite.py @@ -4,7 +4,7 @@ Usage: make_lite.py <wrapped_routines_file> <lapack_dir> <output_dir> Typical invocation: - make_lite.py wrapped_routines /tmp/lapack-3.x.x . + make_lite.py wrapped_routines /tmp/lapack-3.x.x Requires the following to be on the path: * f2c @@ -16,10 +16,18 @@ from __future__ import division, absolute_import, print_function import sys import os import subprocess +import shutil import fortran import clapack_scrub +PY2 = sys.version_info < (3, 0) + +if PY2: + from distutils.spawn import find_executable as which +else: + from shutil import which + # Arguments to pass to f2c. You'll always want -A for ANSI C prototypes # Others of interest: -a to not make variables static by default # -C to check array subscripts @@ -251,6 +259,7 @@ class F2CError(Exception): pass def runF2C(fortran_filename, output_dir): + fortran_filename = fortran_filename.replace('\\', '/') try: subprocess.check_call( ["f2c"] + F2C_ARGS + ['-d', output_dir, fortran_filename] @@ -266,13 +275,29 @@ def scrubF2CSource(c_file): fo.write(HEADER) fo.write(source) +def ensure_executable(name): + try: + which(name) + except: + raise SystemExit(name + ' not found') + def main(): - if len(sys.argv) != 4: + if len(sys.argv) != 3: print(__doc__) return + # Make sure that patch and f2c are found on path + ensure_executable('f2c') + ensure_executable('patch') + wrapped_routines_file = sys.argv[1] lapack_src_dir = sys.argv[2] - output_dir = sys.argv[3] + output_dir = os.path.join(os.path.dirname(__file__), 'build') + + try: + shutil.rmtree(output_dir) + except: + pass + os.makedirs(output_dir) wrapped_routines, ignores = getWrappedRoutineNames(wrapped_routines_file) library = getLapackRoutines(wrapped_routines, ignores, lapack_src_dir) @@ -286,8 +311,8 @@ def main(): routines = library.allRoutinesByType(typename) concatenateRoutines(routines, fortran_file) - # apply the patch - patch_file = fortran_file + '.patch' + # apply the patchpatch + patch_file = os.path.basename(fortran_file) + '.patch' if os.path.exists(patch_file): subprocess.check_call(['patch', '-u', fortran_file, patch_file]) print("Patched {}".format(fortran_file)) @@ -305,5 +330,14 @@ def main(): print() + for fname in os.listdir(output_dir): + if fname.endswith('.c'): + print('Copying ' + fname) + shutil.copy( + os.path.join(output_dir, fname), + os.path.dirname(__file__), + ) + + if __name__ == '__main__': main() diff --git a/numpy/linalg/lapack_lite/python_xerbla.c b/numpy/linalg/lapack_lite/python_xerbla.c index c4d2e484e..dfc195556 100644 --- a/numpy/linalg/lapack_lite/python_xerbla.c +++ b/numpy/linalg/lapack_lite/python_xerbla.c @@ -1,4 +1,6 @@ #include "Python.h" + +#undef c_abs #include "f2c.h" /* |