Merge pull request #5383 from charris/xerbla

charris · charris · commit bcd7169d6839 · 2014-12-24T13:49:06.000-05:00
BUG: Xerbla doesn't get linked in 1.10-devel.
diff --git a/numpy/core/bscript b/numpy/core/bscript
@@ -479,7 +479,9 @@ def pre_build(context):
                 ]
 
             if bld.env.HAS_CBLAS:
-                sources.append(pjoin('src', 'multiarray', 'cblasfuncs.c'))
+                sources.extend([pjoin('src', 'multiarray', 'cblasfuncs.c'),
+                                pjoin('src', 'multiarray', 'python_xerbla.c'),
+                               ])
         else:
             sources = extension.sources
 
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -839,7 +839,9 @@ def generate_multiarray_templated_sources(ext, build_dir):
     blas_info = get_info('blas_opt', 0)
     if blas_info and  ('HAVE_CBLAS', None) in blas_info.get('define_macros', []):
         extra_info = blas_info
-        multiarray_src.append(join('src', 'multiarray', 'cblasfuncs.c'))
+        multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'),
+                               join('src', 'multiarray', 'python_xerbla.c'),
+                              ])
     else:
         extra_info = {}
 
diff --git a/numpy/core/src/multiarray/multiarraymodule_onefile.c b/numpy/core/src/multiarray/multiarraymodule_onefile.c
@@ -56,5 +56,6 @@
 #include "multiarraymodule.c"
 
 #if defined(HAVE_CBLAS)
+#include "python_xerbla.c"
 #include "cblasfuncs.c"
 #endif
diff --git a/numpy/core/src/multiarray/python_xerbla.c b/numpy/core/src/multiarray/python_xerbla.c
@@ -0,0 +1,51 @@
+#include "Python.h"
+
+/*
+ * From f2c.h, this should be safe unless fortran is set to use 64
+ * bit integers. We don't seem to have any good way to detect that.
+ */
+typedef int integer;
+
+/*
+  From the original manpage:
+  --------------------------
+  XERBLA is an error handler for the LAPACK routines.
+  It is called by an LAPACK routine if an input parameter has an invalid value.
+  A message is printed and execution stops.
+
+  Instead of printing a message and stopping the execution, a
+  ValueError is raised with the message.
+
+  Parameters:
+  -----------
+  srname: Subroutine name to use in error message, maximum six characters.
+          Spaces at the end are skipped.
+  info: Number of the invalid parameter.
+*/
+
+int xerbla_(char *srname, integer *info)
+{
+        static const char format[] = "On entry to %.*s" \
+                " parameter number %d had an illegal value";
+        char buf[sizeof(format) + 6 + 4];   /* 6 for name, 4 for param. num. */
+
+        int len = 0; /* length of subroutine name*/
+#ifdef WITH_THREAD
+        PyGILState_STATE save;
+#endif
+
+        while( len<6 && srname[len]!='\0' )
+                len++;
+        while( len && srname[len-1]==' ' )
+                len--;
+#ifdef WITH_THREAD
+        save = PyGILState_Ensure();
+#endif
+        PyOS_snprintf(buf, sizeof(buf), format, len, srname, *info);
+        PyErr_SetString(PyExc_ValueError, buf);
+#ifdef WITH_THREAD
+        PyGILState_Release(save);
+#endif
+
+        return 0;
+}
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
@@ -1152,6 +1152,8 @@ def test_xerbla_override():
     # and may, or may not, abort the process depending on the LAPACK package.
     from nose import SkipTest
 
+    XERBLA_OK = 255
+
     try:
         pid = os.fork()
     except (OSError, AttributeError):
@@ -1181,15 +1183,16 @@ def test_xerbla_override():
                 a, a, 0, 0)
         except ValueError as e:
             if "DORGQR parameter number 5" in str(e):
-                # success
-                os._exit(os.EX_OK)
+                # success, reuse error code to mark success as
+                # FORTRAN STOP returns as success.
+                os._exit(XERBLA_OK)
 
         # Did not abort, but our xerbla was not linked in.
         os._exit(os.EX_CONFIG)
     else:
         # parent
         pid, status = os.wait()
-        if os.WEXITSTATUS(status) != os.EX_OK or os.WIFSIGNALED(status):
+        if os.WEXITSTATUS(status) != XERBLA_OK:
             raise SkipTest('Numpy xerbla not linked in.')
 
 

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,9 @@ def pre_build(context):`
`479`	`479`	`]`
`480`	`480`
`481`	`481`	`if bld.env.HAS_CBLAS:`
`482`		`- sources.append(pjoin('src', 'multiarray', 'cblasfuncs.c'))`
	`482`	`+ sources.extend([pjoin('src', 'multiarray', 'cblasfuncs.c'),`
	`483`	`+ pjoin('src', 'multiarray', 'python_xerbla.c'),`
	`484`	`+ ])`
`483`	`485`	`else:`
`484`	`486`	`sources = extension.sources`
`485`	`487`