ENH: core: add LAPACK64_ support in numpy.linalg

5 files changed, 447 insertions, 336 deletions

diff --git a/numpy/core/src/common/python_xerbla.c b/numpy/core/src/common/python_xerbla.c
index bdf0b9058..d88562b7a 100644
--- a/numpy/core/src/common/python_xerbla.c
+++ b/numpy/core/src/common/python_xerbla.c
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "numpy/npy_common.h"
 
 /*
  * From f2c.h, this should be safe unless fortran is set to use 64
@@ -49,3 +50,11 @@ int xerbla_(char *srname, integer *info)
 
         return 0;
 }
+
+
+/* Same for LAPACK64_ */
+npy_int64 xerbla_64_(char *srname, npy_int64 *info)
+{
+        integer info_int = (integer)*info;
+        return xerbla_(srname, &info_int);
+}
diff --git a/numpy/linalg/lapack_lite/python_xerbla.c b/numpy/linalg/lapack_lite/python_xerbla.c
index dfc195556..c239a3620 100644
--- a/numpy/linalg/lapack_lite/python_xerbla.c
+++ b/numpy/linalg/lapack_lite/python_xerbla.c
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "numpy/npy_common.h"
 
 #undef c_abs
 #include "f2c.h"
@@ -46,3 +47,11 @@ int xerbla_(char *srname, integer *info)
 
         return 0;
 }
+
+
+/* Same for LAPACK64_ */
+npy_int64 xerbla_64_(char *srname, npy_int64 *info)
+{
+        integer info_int = (integer)*info;
+        return xerbla_(srname, &info_int);
+}
diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c
index 696a6d874..c80179fdf 100644
--- a/numpy/linalg/lapack_litemodule.c
+++ b/numpy/linalg/lapack_litemodule.c
@@ -7,45 +7,80 @@ More modifications by Jeff Whitaker
 #include "Python.h"
 #include "numpy/arrayobject.h"
 
+
+#ifndef NPY_UMATH_USE_BLAS64_
+
+/*
+ * Standard BLAS
+ */
 #ifdef NO_APPEND_FORTRAN
 # define FNAME(x) x
 #else
 # define FNAME(x) x##_
 #endif
 
+#define FINT_PYFMT       "i"
+typedef int               fortran_int;
+
+#else
+
+/*
+ * BLAS64_
+ */
+
+#define FNAME(x) x##_64_
+
+typedef npy_int64         fortran_int;
+
+#if NPY_BITSOF_SHORT == 64
+#define FINT_PYFMT       "h"
+#elif NPY_BITSOF_INT == 64
+#define FINT_PYFMT       "i"
+#elif NPY_BITSOF_LONG == 64
+#define FINT_PYFMT       "l"
+#elif NPY_BITSOF_LONGLONG == 64
+#define FINT_PYFMT       "L"
+#else
+#error No compatible 64-bit integer size. \
+       Please contact NumPy maintainers and give detailed information about your \
+       compiler and platform, or set NPY_USE_BLAS64_=0
+#endif
+
+#endif
+
 typedef struct { float r, i; } f2c_complex;
 typedef struct { double r, i; } f2c_doublecomplex;
 /* typedef long int (*L_fp)(); */
 
-extern int FNAME(dgelsd)(int *m, int *n, int *nrhs,
-                          double a[], int *lda, double b[], int *ldb,
-                          double s[], double *rcond, int *rank,
-                          double work[], int *lwork, int iwork[], int *info);
+extern fortran_int FNAME(dgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+                          double a[], fortran_int *lda, double b[], fortran_int *ldb,
+                          double s[], double *rcond, fortran_int *rank,
+                          double work[], fortran_int *lwork, fortran_int iwork[], fortran_int *info);
 
-extern int FNAME(zgelsd)(int *m, int *n, int *nrhs,
-                          f2c_doublecomplex a[], int *lda,
-                          f2c_doublecomplex b[], int *ldb,
-                          double s[], double *rcond, int *rank,
-                          f2c_doublecomplex work[], int *lwork,
-                          double rwork[], int iwork[], int *info);
+extern fortran_int FNAME(zgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+                          f2c_doublecomplex a[], fortran_int *lda,
+                          f2c_doublecomplex b[], fortran_int *ldb,
+                          double s[], double *rcond, fortran_int *rank,
+                          f2c_doublecomplex work[], fortran_int *lwork,
+                          double rwork[], fortran_int iwork[], fortran_int *info);
 
-extern int FNAME(dgeqrf)(int *m, int *n, double a[], int *lda,
+extern fortran_int FNAME(dgeqrf)(fortran_int *m, fortran_int *n, double a[], fortran_int *lda,
                           double tau[], double work[],
-                          int *lwork, int *info);
+                          fortran_int *lwork, fortran_int *info);
 
-extern int FNAME(zgeqrf)(int *m, int *n, f2c_doublecomplex a[], int *lda,
+extern fortran_int FNAME(zgeqrf)(fortran_int *m, fortran_int *n, f2c_doublecomplex a[], fortran_int *lda,
                           f2c_doublecomplex tau[], f2c_doublecomplex work[],
-                          int *lwork, int *info);
+                          fortran_int *lwork, fortran_int *info);
 
-extern int FNAME(dorgqr)(int *m, int *n, int *k, double a[], int *lda,
+extern fortran_int FNAME(dorgqr)(fortran_int *m, fortran_int *n, fortran_int *k, double a[], fortran_int *lda,
                           double tau[], double work[],
-                          int *lwork, int *info);
+                          fortran_int *lwork, fortran_int *info);
 
-extern int FNAME(zungqr)(int *m, int *n, int *k, f2c_doublecomplex a[],
-                          int *lda, f2c_doublecomplex tau[],
-                          f2c_doublecomplex work[], int *lwork, int *info);
+extern fortran_int FNAME(zungqr)(fortran_int *m, fortran_int *n, fortran_int *k, f2c_doublecomplex a[],
+                          fortran_int *lda, f2c_doublecomplex tau[],
+                          f2c_doublecomplex work[], fortran_int *lwork, fortran_int *info);
 
-extern int FNAME(xerbla)(char *srname, int *info);
+extern fortran_int FNAME(xerbla)(char *srname, fortran_int *info);
 
 static PyObject *LapackError;
 
@@ -90,27 +125,31 @@ check_object(PyObject *ob, int t, char *obname,
 #define FDATA(p) ((float *) PyArray_DATA((PyArrayObject *)p))
 #define CDATA(p) ((f2c_complex *) PyArray_DATA((PyArrayObject *)p))
 #define ZDATA(p) ((f2c_doublecomplex *) PyArray_DATA((PyArrayObject *)p))
-#define IDATA(p) ((int *) PyArray_DATA((PyArrayObject *)p))
+#define IDATA(p) ((fortran_int *) PyArray_DATA((PyArrayObject *)p))
 
 static PyObject *
 lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-    int lapack_lite_status;
-    int m;
-    int n;
-    int nrhs;
+    fortran_int lapack_lite_status;
+    fortran_int m;
+    fortran_int n;
+    fortran_int nrhs;
     PyObject *a;
-    int lda;
+    fortran_int lda;
     PyObject *b;
-    int ldb;
+    fortran_int ldb;
     PyObject *s;
     double rcond;
-    int rank;
+    fortran_int rank;
     PyObject *work;
     PyObject *iwork;
-    int lwork;
-    int info;
-    TRY(PyArg_ParseTuple(args,"iiiOiOiOdiOiOi:dgelsd",
+    fortran_int lwork;
+    fortran_int info;
+
+    TRY(PyArg_ParseTuple(args,
+                         (FINT_PYFMT FINT_PYFMT FINT_PYFMT "O" FINT_PYFMT "O"
+                          FINT_PYFMT "O" "d" FINT_PYFMT "O" FINT_PYFMT "O"
+                          FINT_PYFMT ":dgelsd"),
                          &m,&n,&nrhs,&a,&lda,&b,&ldb,&s,&rcond,
                          &rank,&work,&lwork,&iwork,&info));
 
@@ -118,7 +157,11 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
     TRY(check_object(b,NPY_DOUBLE,"b","NPY_DOUBLE","dgelsd"));
     TRY(check_object(s,NPY_DOUBLE,"s","NPY_DOUBLE","dgelsd"));
     TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dgelsd"));
+#ifndef NPY_UMATH_USE_BLAS64_
     TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","dgelsd"));
+#else
+    TRY(check_object(iwork,NPY_INT64,"iwork","NPY_INT64","dgelsd"));
+#endif
 
     lapack_lite_status =
             FNAME(dgelsd)(&m,&n,&nrhs,DDATA(a),&lda,DDATA(b),&ldb,
@@ -128,8 +171,11 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
         return NULL;
     }
 
-    return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:d,s:i,s:i,s:i}","dgelsd_",
-                         lapack_lite_status,"m",m,"n",n,"nrhs",nrhs,
+    return Py_BuildValue(("{s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          ",s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          ",s:d,s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          ",s:" FINT_PYFMT "}"),
+                         "dgelsd_",lapack_lite_status,"m",m,"n",n,"nrhs",nrhs,
                          "lda",lda,"ldb",ldb,"rcond",rcond,"rank",rank,
                          "lwork",lwork,"info",info);
 }
@@ -137,13 +183,16 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
 static PyObject *
 lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-        int lapack_lite_status;
-        int m, n, lwork;
+        fortran_int lapack_lite_status;
+        fortran_int m, n, lwork;
         PyObject *a, *tau, *work;
-        int lda;
-        int info;
+        fortran_int lda;
+        fortran_int info;
 
-        TRY(PyArg_ParseTuple(args,"iiOiOOii:dgeqrf",&m,&n,&a,&lda,&tau,&work,&lwork,&info));
+        TRY(PyArg_ParseTuple(args,
+                             (FINT_PYFMT FINT_PYFMT "O" FINT_PYFMT "OO"
+                              FINT_PYFMT FINT_PYFMT ":dgeqrf"),
+                             &m,&n,&a,&lda,&tau,&work,&lwork,&info));
 
         /* check objects and convert to right storage order */
         TRY(check_object(a,NPY_DOUBLE,"a","NPY_DOUBLE","dgeqrf"));
@@ -157,7 +206,9 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
             return NULL;
         }
 
-        return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","dgeqrf_",
+        return Py_BuildValue(("{s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                              ",s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT "}"),
+                             "dgeqrf_",
                              lapack_lite_status,"m",m,"n",n,"lda",lda,
                              "lwork",lwork,"info",info);
 }
@@ -166,13 +217,17 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
 static PyObject *
 lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-        int lapack_lite_status;
-        int m, n, k, lwork;
+        fortran_int lapack_lite_status;
+        fortran_int m, n, k, lwork;
         PyObject *a, *tau, *work;
-        int lda;
-        int info;
-
-        TRY(PyArg_ParseTuple(args,"iiiOiOOii:dorgqr",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
+        fortran_int lda;
+        fortran_int info;
+
+        TRY(PyArg_ParseTuple(args,
+                             (FINT_PYFMT FINT_PYFMT FINT_PYFMT "O"
+                              FINT_PYFMT "OO" FINT_PYFMT FINT_PYFMT
+                              ":dorgqr"),
+                             &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
         TRY(check_object(a,NPY_DOUBLE,"a","NPY_DOUBLE","dorgqr"));
         TRY(check_object(tau,NPY_DOUBLE,"tau","NPY_DOUBLE","dorgqr"));
         TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dorgqr"));
@@ -191,23 +246,26 @@ lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args)
 static PyObject *
 lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-    int lapack_lite_status;
-    int m;
-    int n;
-    int nrhs;
+    fortran_int lapack_lite_status;
+    fortran_int m;
+    fortran_int n;
+    fortran_int nrhs;
     PyObject *a;
-    int lda;
+    fortran_int lda;
     PyObject *b;
-    int ldb;
+    fortran_int ldb;
     PyObject *s;
     double rcond;
-    int rank;
+    fortran_int rank;
     PyObject *work;
-    int lwork;
+    fortran_int lwork;
     PyObject *rwork;
     PyObject *iwork;
-    int info;
-    TRY(PyArg_ParseTuple(args,"iiiOiOiOdiOiOOi:zgelsd",
+    fortran_int info;
+    TRY(PyArg_ParseTuple(args,
+                         (FINT_PYFMT FINT_PYFMT FINT_PYFMT "O" FINT_PYFMT
+                          "O" FINT_PYFMT "Od" FINT_PYFMT "O" FINT_PYFMT
+                          "OO" FINT_PYFMT ":zgelsd"),
                          &m,&n,&nrhs,&a,&lda,&b,&ldb,&s,&rcond,
                          &rank,&work,&lwork,&rwork,&iwork,&info));
 
@@ -216,7 +274,11 @@ lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
     TRY(check_object(s,NPY_DOUBLE,"s","NPY_DOUBLE","zgelsd"));
     TRY(check_object(work,NPY_CDOUBLE,"work","NPY_CDOUBLE","zgelsd"));
     TRY(check_object(rwork,NPY_DOUBLE,"rwork","NPY_DOUBLE","zgelsd"));
+#ifndef NPY_UMATH_USE_BLAS64_
     TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","zgelsd"));
+#else
+    TRY(check_object(iwork,NPY_INT64,"iwork","NPY_INT64","zgelsd"));
+#endif
 
     lapack_lite_status =
         FNAME(zgelsd)(&m,&n,&nrhs,ZDATA(a),&lda,ZDATA(b),&ldb,DDATA(s),&rcond,
@@ -225,7 +287,11 @@ lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
         return NULL;
     }
 
-    return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i}","zgelsd_",
+    return Py_BuildValue(("{s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          ",s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          ",s:" FINT_PYFMT ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                          "}"),
+                         "zgelsd_",
                          lapack_lite_status,"m",m,"n",n,"nrhs",nrhs,"lda",lda,
                          "ldb",ldb,"rank",rank,"lwork",lwork,"info",info);
 }
@@ -233,13 +299,16 @@ lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args)
 static PyObject *
 lapack_lite_zgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-        int lapack_lite_status;
-        int m, n, lwork;
+        fortran_int lapack_lite_status;
+        fortran_int m, n, lwork;
         PyObject *a, *tau, *work;
-        int lda;
-        int info;
+        fortran_int lda;
+        fortran_int info;
 
-        TRY(PyArg_ParseTuple(args,"iiOiOOii:zgeqrf",&m,&n,&a,&lda,&tau,&work,&lwork,&info));
+        TRY(PyArg_ParseTuple(args,
+                             (FINT_PYFMT FINT_PYFMT "O" FINT_PYFMT "OO"
+                              FINT_PYFMT "" FINT_PYFMT ":zgeqrf"),
+                             &m,&n,&a,&lda,&tau,&work,&lwork,&info));
 
 /* check objects and convert to right storage order */
         TRY(check_object(a,NPY_CDOUBLE,"a","NPY_CDOUBLE","zgeqrf"));
@@ -253,20 +322,27 @@ lapack_lite_zgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
             return NULL;
         }
 
-        return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","zgeqrf_",lapack_lite_status,"m",m,"n",n,"lda",lda,"lwork",lwork,"info",info);
+        return Py_BuildValue(("{s:" FINT_PYFMT ",s:" FINT_PYFMT
+                              ",s:" FINT_PYFMT ",s:" FINT_PYFMT
+                              ",s:" FINT_PYFMT ",s:" FINT_PYFMT "}"),
+                             "zgeqrf_",lapack_lite_status,"m",m,"n",n,"lda",lda,"lwork",lwork,"info",info);
 }
 
 
 static PyObject *
 lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-        int lapack_lite_status;
-        int m, n, k, lwork;
+        fortran_int lapack_lite_status;
+        fortran_int m, n, k, lwork;
         PyObject *a, *tau, *work;
-        int lda;
-        int info;
-
-        TRY(PyArg_ParseTuple(args,"iiiOiOOii:zungqr",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
+        fortran_int lda;
+        fortran_int info;
+
+        TRY(PyArg_ParseTuple(args,
+                             (FINT_PYFMT FINT_PYFMT FINT_PYFMT "O"
+                              FINT_PYFMT "OO" FINT_PYFMT "" FINT_PYFMT
+                              ":zungqr"),
+                             &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
         TRY(check_object(a,NPY_CDOUBLE,"a","NPY_CDOUBLE","zungqr"));
         TRY(check_object(tau,NPY_CDOUBLE,"tau","NPY_CDOUBLE","zungqr"));
         TRY(check_object(work,NPY_CDOUBLE,"work","NPY_CDOUBLE","zungqr"));
@@ -279,7 +355,8 @@ lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args)
             return NULL;
         }
 
-        return Py_BuildValue("{s:i,s:i}","zungqr_",lapack_lite_status,
+        return Py_BuildValue(("{s:" FINT_PYFMT ",s:" FINT_PYFMT "}"),
+                             "zungqr_",lapack_lite_status,
                              "info",info);
 }
 
@@ -287,7 +364,7 @@ lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args)
 static PyObject *
 lapack_lite_xerbla(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-    int info = -1;
+    fortran_int info = -1;
 
     NPY_BEGIN_THREADS_DEF;
     NPY_BEGIN_THREADS;
diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py
index 66c07c9e1..f5cb04e89 100644
--- a/numpy/linalg/setup.py
+++ b/numpy/linalg/setup.py
@@ -26,7 +26,12 @@ def configuration(parent_package='', top_path=None):
     ]
     all_sources = config.paths(lapack_lite_src)
 
-    lapack_info = get_info('lapack_opt', 0)  # and {}
+    if (os.environ.get('NPY_USE_BLAS64_', "0") != "0"):
+        lapack_info = get_info('lapack64__opt', 2)
+        lapack_info.setdefault('define_macros', [])
+        lapack_info['define_macros'] += [('NPY_UMATH_USE_BLAS64_', None)]
+    else:
+        lapack_info = get_info('lapack_opt', 0)  # and {}
 
     def get_lapack_lite_sources(ext, build_dir):
         if not lapack_info:
diff --git a/numpy/linalg/umath_linalg.c.src b/numpy/linalg/umath_linalg.c.src
index ee103c327..b111f75d5 100644
--- a/numpy/linalg/umath_linalg.c.src
+++ b/numpy/linalg/umath_linalg.c.src
@@ -62,301 +62,318 @@ dbg_stack_trace()
  *****************************************************************************
  */
 
+#ifndef NPY_UMATH_USE_BLAS64_
+
 #ifdef NO_APPEND_FORTRAN
 # define FNAME(x) x
 #else
 # define FNAME(x) x##_
 #endif
 
+typedef int               fortran_int;
+
+#else
+
+#define FNAME(x) x##_64_
+
+typedef npy_int64         fortran_int;
+
+#endif
+
 typedef struct { float r, i; } f2c_complex;
 typedef struct { double r, i; } f2c_doublecomplex;
 /* typedef long int (*L_fp)(); */
 
-extern int
-FNAME(sgeev)(char *jobvl, char *jobvr, int *n,
-             float a[], int *lda, float wr[], float wi[],
-             float vl[], int *ldvl, float vr[], int *ldvr,
-             float work[], int lwork[],
-             int *info);
-extern int
-FNAME(dgeev)(char *jobvl, char *jobvr, int *n,
-             double a[], int *lda, double wr[], double wi[],
-             double vl[], int *ldvl, double vr[], int *ldvr,
-             double work[], int lwork[],
-             int *info);
-extern int
-FNAME(cgeev)(char *jobvl, char *jobvr, int *n,
-             f2c_doublecomplex a[], int *lda,
+typedef float             fortran_real;
+typedef double            fortran_doublereal;
+typedef f2c_complex       fortran_complex;
+typedef f2c_doublecomplex fortran_doublecomplex;
+
+extern fortran_int
+FNAME(sgeev)(char *jobvl, char *jobvr, fortran_int *n,
+             float a[], fortran_int *lda, float wr[], float wi[],
+             float vl[], fortran_int *ldvl, float vr[], fortran_int *ldvr,
+             float work[], fortran_int lwork[],
+             fortran_int *info);
+extern fortran_int
+FNAME(dgeev)(char *jobvl, char *jobvr, fortran_int *n,
+             double a[], fortran_int *lda, double wr[], double wi[],
+             double vl[], fortran_int *ldvl, double vr[], fortran_int *ldvr,
+             double work[], fortran_int lwork[],
+             fortran_int *info);
+extern fortran_int
+FNAME(cgeev)(char *jobvl, char *jobvr, fortran_int *n,
+             f2c_doublecomplex a[], fortran_int *lda,
              f2c_doublecomplex w[],
-             f2c_doublecomplex vl[], int *ldvl,
-             f2c_doublecomplex vr[], int *ldvr,
-             f2c_doublecomplex work[], int *lwork,
+             f2c_doublecomplex vl[], fortran_int *ldvl,
+             f2c_doublecomplex vr[], fortran_int *ldvr,
+             f2c_doublecomplex work[], fortran_int *lwork,
              double rwork[],
-             int *info);
-extern int
-FNAME(zgeev)(char *jobvl, char *jobvr, int *n,
-             f2c_doublecomplex a[], int *lda,
+             fortran_int *info);
+extern fortran_int
+FNAME(zgeev)(char *jobvl, char *jobvr, fortran_int *n,
+             f2c_doublecomplex a[], fortran_int *lda,
              f2c_doublecomplex w[],
-             f2c_doublecomplex vl[], int *ldvl,
-             f2c_doublecomplex vr[], int *ldvr,
-             f2c_doublecomplex work[], int *lwork,
+             f2c_doublecomplex vl[], fortran_int *ldvl,
+             f2c_doublecomplex vr[], fortran_int *ldvr,
+             f2c_doublecomplex work[], fortran_int *lwork,
              double rwork[],
-             int *info);
-
-extern int
-FNAME(ssyevd)(char *jobz, char *uplo, int *n,
-              float a[], int *lda, float w[], float work[],
-              int *lwork, int iwork[], int *liwork,
-              int *info);
-extern int
-FNAME(dsyevd)(char *jobz, char *uplo, int *n,
-              double a[], int *lda, double w[], double work[],
-              int *lwork, int iwork[], int *liwork,
-              int *info);
-extern int
-FNAME(cheevd)(char *jobz, char *uplo, int *n,
-              f2c_complex a[], int *lda,
+             fortran_int *info);
+
+extern fortran_int
+FNAME(ssyevd)(char *jobz, char *uplo, fortran_int *n,
+              float a[], fortran_int *lda, float w[], float work[],
+              fortran_int *lwork, fortran_int iwork[], fortran_int *liwork,
+              fortran_int *info);
+extern fortran_int
+FNAME(dsyevd)(char *jobz, char *uplo, fortran_int *n,
+              double a[], fortran_int *lda, double w[], double work[],
+              fortran_int *lwork, fortran_int iwork[], fortran_int *liwork,
+              fortran_int *info);
+extern fortran_int
+FNAME(cheevd)(char *jobz, char *uplo, fortran_int *n,
+              f2c_complex a[], fortran_int *lda,
               float w[], f2c_complex work[],
-              int *lwork, float rwork[], int *lrwork, int iwork[],
-              int *liwork,
-              int *info);
-extern int
-FNAME(zheevd)(char *jobz, char *uplo, int *n,
-              f2c_doublecomplex a[], int *lda,
+              fortran_int *lwork, float rwork[], fortran_int *lrwork, fortran_int iwork[],
+              fortran_int *liwork,
+              fortran_int *info);
+extern fortran_int
+FNAME(zheevd)(char *jobz, char *uplo, fortran_int *n,
+              f2c_doublecomplex a[], fortran_int *lda,
               double w[], f2c_doublecomplex work[],
-              int *lwork, double rwork[], int *lrwork, int iwork[],
-              int *liwork,
-              int *info);
-
-extern int
-FNAME(sgelsd)(int *m, int *n, int *nrhs,
-              float a[], int *lda, float b[], int *ldb,
-              float s[], float *rcond, int *rank,
-              float work[], int *lwork, int iwork[],
-              int *info);
-extern int
-FNAME(dgelsd)(int *m, int *n, int *nrhs,
-              double a[], int *lda, double b[], int *ldb,
-              double s[], double *rcond, int *rank,
-              double work[], int *lwork, int iwork[],
-              int *info);
-extern int
-FNAME(cgelsd)(int *m, int *n, int *nrhs,
-              f2c_complex a[], int *lda,
-              f2c_complex b[], int *ldb,
-              float s[], float *rcond, int *rank,
-              f2c_complex work[], int *lwork,
-              float rwork[], int iwork[],
-              int *info);
-extern int
-FNAME(zgelsd)(int *m, int *n, int *nrhs,
-              f2c_doublecomplex a[], int *lda,
-              f2c_doublecomplex b[], int *ldb,
-              double s[], double *rcond, int *rank,
-              f2c_doublecomplex work[], int *lwork,
-              double rwork[], int iwork[],
-              int *info);
-
-extern int
-FNAME(sgesv)(int *n, int *nrhs,
-             float a[], int *lda,
-             int ipiv[],
-             float b[], int *ldb,
-             int *info);
-extern int
-FNAME(dgesv)(int *n, int *nrhs,
-             double a[], int *lda,
-             int ipiv[],
-             double b[], int *ldb,
-             int *info);
-extern int
-FNAME(cgesv)(int *n, int *nrhs,
-             f2c_complex a[], int *lda,
-             int ipiv[],
-             f2c_complex b[], int *ldb,
-             int *info);
-extern int
-FNAME(zgesv)(int *n, int *nrhs,
-             f2c_doublecomplex a[], int *lda,
-             int ipiv[],
-             f2c_doublecomplex b[], int *ldb,
-             int *info);
-
-extern int
-FNAME(sgetrf)(int *m, int *n,
-              float a[], int *lda,
-              int ipiv[],
-              int *info);
-extern int
-FNAME(dgetrf)(int *m, int *n,
-              double a[], int *lda,
-              int ipiv[],
-              int *info);
-extern int
-FNAME(cgetrf)(int *m, int *n,
-              f2c_complex a[], int *lda,
-              int ipiv[],
-              int *info);
-extern int
-FNAME(zgetrf)(int *m, int *n,
-              f2c_doublecomplex a[], int *lda,
-              int ipiv[],
-              int *info);
-
-extern int
-FNAME(spotrf)(char *uplo, int *n,
-              float a[], int *lda,
-              int *info);
-extern int
-FNAME(dpotrf)(char *uplo, int *n,
-              double a[], int *lda,
-              int *info);
-extern int
-FNAME(cpotrf)(char *uplo, int *n,
-              f2c_complex a[], int *lda,
-              int *info);
-extern int
-FNAME(zpotrf)(char *uplo, int *n,
-              f2c_doublecomplex a[], int *lda,
-              int *info);
-
-extern int
-FNAME(sgesdd)(char *jobz, int *m, int *n,
-              float a[], int *lda, float s[], float u[],
-              int *ldu, float vt[], int *ldvt, float work[],
-              int *lwork, int iwork[], int *info);
-extern int
-FNAME(dgesdd)(char *jobz, int *m, int *n,
-              double a[], int *lda, double s[], double u[],
-              int *ldu, double vt[], int *ldvt, double work[],
-              int *lwork, int iwork[], int *info);
-extern int
-FNAME(cgesdd)(char *jobz, int *m, int *n,
-              f2c_complex a[], int *lda,
-              float s[], f2c_complex u[], int *ldu,
-              f2c_complex vt[], int *ldvt,
-              f2c_complex work[], int *lwork,
-              float rwork[], int iwork[], int *info);
-extern int
-FNAME(zgesdd)(char *jobz, int *m, int *n,
-              f2c_doublecomplex a[], int *lda,
-              double s[], f2c_doublecomplex u[], int *ldu,
-              f2c_doublecomplex vt[], int *ldvt,
-              f2c_doublecomplex work[], int *lwork,
-              double rwork[], int iwork[], int *info);
-
-extern int
-FNAME(spotrs)(char *uplo, int *n, int *nrhs,
-              float a[], int *lda,
-              float b[], int *ldb,
-              int *info);
-extern int
-FNAME(dpotrs)(char *uplo, int *n, int *nrhs,
-              double a[], int *lda,
-              double b[], int *ldb,
-              int *info);
-extern int
-FNAME(cpotrs)(char *uplo, int *n, int *nrhs,
-              f2c_complex a[], int *lda,
-              f2c_complex b[], int *ldb,
-              int *info);
-extern int
-FNAME(zpotrs)(char *uplo, int *n, int *nrhs,
-              f2c_doublecomplex a[], int *lda,
-              f2c_doublecomplex b[], int *ldb,
-              int *info);
-
-extern int
-FNAME(spotri)(char *uplo, int *n,
-              float a[], int *lda,
-              int *info);
-extern int
-FNAME(dpotri)(char *uplo, int *n,
-              double a[], int *lda,
-              int *info);
-extern int
-FNAME(cpotri)(char *uplo, int *n,
-              f2c_complex a[], int *lda,
-              int *info);
-extern int
-FNAME(zpotri)(char *uplo, int *n,
-              f2c_doublecomplex a[], int *lda,
-              int *info);
-
-extern int
-FNAME(scopy)(int *n,
-             float *sx, int *incx,
-             float *sy, int *incy);
-extern int
-FNAME(dcopy)(int *n,
-             double *sx, int *incx,
-             double *sy, int *incy);
-extern int
-FNAME(ccopy)(int *n,
-             f2c_complex *sx, int *incx,
-             f2c_complex *sy, int *incy);
-extern int
-FNAME(zcopy)(int *n,
-             f2c_doublecomplex *sx, int *incx,
-             f2c_doublecomplex *sy, int *incy);
+              fortran_int *lwork, double rwork[], fortran_int *lrwork, fortran_int iwork[],
+              fortran_int *liwork,
+              fortran_int *info);
+
+extern fortran_int
+FNAME(sgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+              float a[], fortran_int *lda, float b[], fortran_int *ldb,
+              float s[], float *rcond, fortran_int *rank,
+              float work[], fortran_int *lwork, fortran_int iwork[],
+              fortran_int *info);
+extern fortran_int
+FNAME(dgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+              double a[], fortran_int *lda, double b[], fortran_int *ldb,
+              double s[], double *rcond, fortran_int *rank,
+              double work[], fortran_int *lwork, fortran_int iwork[],
+              fortran_int *info);
+extern fortran_int
+FNAME(cgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+              f2c_complex a[], fortran_int *lda,
+              f2c_complex b[], fortran_int *ldb,
+              float s[], float *rcond, fortran_int *rank,
+              f2c_complex work[], fortran_int *lwork,
+              float rwork[], fortran_int iwork[],
+              fortran_int *info);
+extern fortran_int
+FNAME(zgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+              f2c_doublecomplex a[], fortran_int *lda,
+              f2c_doublecomplex b[], fortran_int *ldb,
+              double s[], double *rcond, fortran_int *rank,
+              f2c_doublecomplex work[], fortran_int *lwork,
+              double rwork[], fortran_int iwork[],
+              fortran_int *info);
+
+extern fortran_int
+FNAME(sgesv)(fortran_int *n, fortran_int *nrhs,
+             float a[], fortran_int *lda,
+             fortran_int ipiv[],
+             float b[], fortran_int *ldb,
+             fortran_int *info);
+extern fortran_int
+FNAME(dgesv)(fortran_int *n, fortran_int *nrhs,
+             double a[], fortran_int *lda,
+             fortran_int ipiv[],
+             double b[], fortran_int *ldb,
+             fortran_int *info);
+extern fortran_int
+FNAME(cgesv)(fortran_int *n, fortran_int *nrhs,
+             f2c_complex a[], fortran_int *lda,
+             fortran_int ipiv[],
+             f2c_complex b[], fortran_int *ldb,
+             fortran_int *info);
+extern fortran_int
+FNAME(zgesv)(fortran_int *n, fortran_int *nrhs,
+             f2c_doublecomplex a[], fortran_int *lda,
+             fortran_int ipiv[],
+             f2c_doublecomplex b[], fortran_int *ldb,
+             fortran_int *info);
+
+extern fortran_int
+FNAME(sgetrf)(fortran_int *m, fortran_int *n,
+              float a[], fortran_int *lda,
+              fortran_int ipiv[],
+              fortran_int *info);
+extern fortran_int
+FNAME(dgetrf)(fortran_int *m, fortran_int *n,
+              double a[], fortran_int *lda,
+              fortran_int ipiv[],
+              fortran_int *info);
+extern fortran_int
+FNAME(cgetrf)(fortran_int *m, fortran_int *n,
+              f2c_complex a[], fortran_int *lda,
+              fortran_int ipiv[],
+              fortran_int *info);
+extern fortran_int
+FNAME(zgetrf)(fortran_int *m, fortran_int *n,
+              f2c_doublecomplex a[], fortran_int *lda,
+              fortran_int ipiv[],
+              fortran_int *info);
+
+extern fortran_int
+FNAME(spotrf)(char *uplo, fortran_int *n,
+              float a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(dpotrf)(char *uplo, fortran_int *n,
+              double a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(cpotrf)(char *uplo, fortran_int *n,
+              f2c_complex a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(zpotrf)(char *uplo, fortran_int *n,
+              f2c_doublecomplex a[], fortran_int *lda,
+              fortran_int *info);
+
+extern fortran_int
+FNAME(sgesdd)(char *jobz, fortran_int *m, fortran_int *n,
+              float a[], fortran_int *lda, float s[], float u[],
+              fortran_int *ldu, float vt[], fortran_int *ldvt, float work[],
+              fortran_int *lwork, fortran_int iwork[], fortran_int *info);
+extern fortran_int
+FNAME(dgesdd)(char *jobz, fortran_int *m, fortran_int *n,
+              double a[], fortran_int *lda, double s[], double u[],
+              fortran_int *ldu, double vt[], fortran_int *ldvt, double work[],
+              fortran_int *lwork, fortran_int iwork[], fortran_int *info);
+extern fortran_int
+FNAME(cgesdd)(char *jobz, fortran_int *m, fortran_int *n,
+              f2c_complex a[], fortran_int *lda,
+              float s[], f2c_complex u[], fortran_int *ldu,
+              f2c_complex vt[], fortran_int *ldvt,
+              f2c_complex work[], fortran_int *lwork,
+              float rwork[], fortran_int iwork[], fortran_int *info);
+extern fortran_int
+FNAME(zgesdd)(char *jobz, fortran_int *m, fortran_int *n,
+              f2c_doublecomplex a[], fortran_int *lda,
+              double s[], f2c_doublecomplex u[], fortran_int *ldu,
+              f2c_doublecomplex vt[], fortran_int *ldvt,
+              f2c_doublecomplex work[], fortran_int *lwork,
+              double rwork[], fortran_int iwork[], fortran_int *info);
+
+extern fortran_int
+FNAME(spotrs)(char *uplo, fortran_int *n, fortran_int *nrhs,
+              float a[], fortran_int *lda,
+              float b[], fortran_int *ldb,
+              fortran_int *info);
+extern fortran_int
+FNAME(dpotrs)(char *uplo, fortran_int *n, fortran_int *nrhs,
+              double a[], fortran_int *lda,
+              double b[], fortran_int *ldb,
+              fortran_int *info);
+extern fortran_int
+FNAME(cpotrs)(char *uplo, fortran_int *n, fortran_int *nrhs,
+              f2c_complex a[], fortran_int *lda,
+              f2c_complex b[], fortran_int *ldb,
+              fortran_int *info);
+extern fortran_int
+FNAME(zpotrs)(char *uplo, fortran_int *n, fortran_int *nrhs,
+              f2c_doublecomplex a[], fortran_int *lda,
+              f2c_doublecomplex b[], fortran_int *ldb,
+              fortran_int *info);
+
+extern fortran_int
+FNAME(spotri)(char *uplo, fortran_int *n,
+              float a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(dpotri)(char *uplo, fortran_int *n,
+              double a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(cpotri)(char *uplo, fortran_int *n,
+              f2c_complex a[], fortran_int *lda,
+              fortran_int *info);
+extern fortran_int
+FNAME(zpotri)(char *uplo, fortran_int *n,
+              f2c_doublecomplex a[], fortran_int *lda,
+              fortran_int *info);
+
+extern fortran_int
+FNAME(scopy)(fortran_int *n,
+             float *sx, fortran_int *incx,
+             float *sy, fortran_int *incy);
+extern fortran_int
+FNAME(dcopy)(fortran_int *n,
+             double *sx, fortran_int *incx,
+             double *sy, fortran_int *incy);
+extern fortran_int
+FNAME(ccopy)(fortran_int *n,
+             f2c_complex *sx, fortran_int *incx,
+             f2c_complex *sy, fortran_int *incy);
+extern fortran_int
+FNAME(zcopy)(fortran_int *n,
+             f2c_doublecomplex *sx, fortran_int *incx,
+             f2c_doublecomplex *sy, fortran_int *incy);
 
 extern float
-FNAME(sdot)(int *n,
-            float *sx, int *incx,
-            float *sy, int *incy);
+FNAME(sdot)(fortran_int *n,
+            float *sx, fortran_int *incx,
+            float *sy, fortran_int *incy);
 extern double
-FNAME(ddot)(int *n,
-            double *sx, int *incx,
-            double *sy, int *incy);
+FNAME(ddot)(fortran_int *n,
+            double *sx, fortran_int *incx,
+            double *sy, fortran_int *incy);
 extern void
-FNAME(cdotu)(f2c_complex *ret, int *n,
-             f2c_complex *sx, int *incx,
-             f2c_complex *sy, int *incy);
+FNAME(cdotu)(f2c_complex *ret, fortran_int *n,
+             f2c_complex *sx, fortran_int *incx,
+             f2c_complex *sy, fortran_int *incy);
 extern void
-FNAME(zdotu)(f2c_doublecomplex *ret, int *n,
-             f2c_doublecomplex *sx, int *incx,
-             f2c_doublecomplex *sy, int *incy);
+FNAME(zdotu)(f2c_doublecomplex *ret, fortran_int *n,
+             f2c_doublecomplex *sx, fortran_int *incx,
+             f2c_doublecomplex *sy, fortran_int *incy);
 extern void
-FNAME(cdotc)(f2c_complex *ret, int *n,
-             f2c_complex *sx, int *incx,
-             f2c_complex *sy, int *incy);
+FNAME(cdotc)(f2c_complex *ret, fortran_int *n,
+             f2c_complex *sx, fortran_int *incx,
+             f2c_complex *sy, fortran_int *incy);
 extern void
-FNAME(zdotc)(f2c_doublecomplex *ret, int *n,
-             f2c_doublecomplex *sx, int *incx,
-             f2c_doublecomplex *sy, int *incy);
+FNAME(zdotc)(f2c_doublecomplex *ret, fortran_int *n,
+             f2c_doublecomplex *sx, fortran_int *incx,
+             f2c_doublecomplex *sy, fortran_int *incy);
 
-extern int
+extern fortran_int
 FNAME(sgemm)(char *transa, char *transb,
-             int *m, int *n, int *k,
+             fortran_int *m, fortran_int *n, fortran_int *k,
              float *alpha,
-             float *a, int *lda,
-             float *b, int *ldb,
+             float *a, fortran_int *lda,
+             float *b, fortran_int *ldb,
              float *beta,
-             float *c, int *ldc);
-extern int
+             float *c, fortran_int *ldc);
+extern fortran_int
 FNAME(dgemm)(char *transa, char *transb,
-             int *m, int *n, int *k,
+             fortran_int *m, fortran_int *n, fortran_int *k,
              double *alpha,
-             double *a, int *lda,
-             double *b, int *ldb,
+             double *a, fortran_int *lda,
+             double *b, fortran_int *ldb,
              double *beta,
-             double *c, int *ldc);
-extern int
+             double *c, fortran_int *ldc);
+extern fortran_int
 FNAME(cgemm)(char *transa, char *transb,
-             int *m, int *n, int *k,
+             fortran_int *m, fortran_int *n, fortran_int *k,
              f2c_complex *alpha,
-             f2c_complex *a, int *lda,
-             f2c_complex *b, int *ldb,
+             f2c_complex *a, fortran_int *lda,
+             f2c_complex *b, fortran_int *ldb,
              f2c_complex *beta,
-             f2c_complex *c, int *ldc);
-extern int
+             f2c_complex *c, fortran_int *ldc);
+extern fortran_int
 FNAME(zgemm)(char *transa, char *transb,
-             int *m, int *n, int *k,
+             fortran_int *m, fortran_int *n, fortran_int *k,
              f2c_doublecomplex *alpha,
-             f2c_doublecomplex *a, int *lda,
-             f2c_doublecomplex *b, int *ldb,
+             f2c_doublecomplex *a, fortran_int *lda,
+             f2c_doublecomplex *b, fortran_int *ldb,
              f2c_doublecomplex *beta,
-             f2c_doublecomplex *c, int *ldc);
+             f2c_doublecomplex *c, fortran_int *ldc);
 
 
 #define LAPACK_T(FUNC)                                          \
@@ -369,12 +386,6 @@ FNAME(zgemm)(char *transa, char *transb,
 #define LAPACK(FUNC)                            \
     FNAME(FUNC)
 
-typedef int               fortran_int;
-typedef float             fortran_real;
-typedef double            fortran_doublereal;
-typedef f2c_complex       fortran_complex;
-typedef f2c_doublecomplex fortran_doublecomplex;
-
 
 /*
  *****************************************************************************