[Scipy-svn] r6346 - trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC

[scipy-svn at scipy.org]

Author: ptvirtan
Date: 2010-04-27 16:55:09 -0500 (Tue, 27 Apr 2010)
New Revision: 6346

Added:
   trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/scipy_slu_config.h
Modified:
   trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_Cnames.h
   trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_util.h
Log:
ENH: sparse.linalg.dsolve/SuperLU: patch SuperLU upstream sources to get some variables from Scipy

Added: trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/scipy_slu_config.h
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/scipy_slu_config.h	                        (rev 0)
+++ trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/scipy_slu_config.h	2010-04-27 21:55:09 UTC (rev 6346)
@@ -0,0 +1,34 @@
+#ifndef SCIPY_SLU_CONFIG_H
+#define SCIPY_SLU_CONFIG_H
+
+#include <stdlib.h>
+
+/*
+ * Support routines
+ */
+void superlu_python_module_abort(char *msg);
+void *superlu_python_module_malloc(size_t size);
+void superlu_python_module_free(void *ptr);
+
+#define USER_ABORT  superlu_python_module_abort
+#define USER_MALLOC superlu_python_module_malloc
+#define USER_FREE   superlu_python_module_free
+
+/* 
+ * Fortran configuration 
+ */
+#if defined(NO_APPEND_FORTRAN)
+#if defined(UPPERCASE_FORTRAN)
+#define UpCase 1
+#else
+#define NoChange 1
+#endif
+#else
+#if defined(UPPERCASE_FORTRAN)
+#error Uppercase and trailing slash in Fortran names not supported
+#else
+#define Add_ 1
+#endif
+#endif
+
+#endif

Modified: trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_Cnames.h
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_Cnames.h	2010-04-27 21:54:55 UTC (rev 6345)
+++ trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_Cnames.h	2010-04-27 21:55:09 UTC (rev 6346)
@@ -19,6 +19,7 @@
 #ifndef __SUPERLU_CNAMES /* allow multiple inclusions */
 #define __SUPERLU_CNAMES
 
+#include "scipy_slu_config.h"
 
 #define ADD_       0
 #define ADD__      1

Modified: trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_util.h
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_util.h	2010-04-27 21:54:55 UTC (rev 6345)
+++ trunk/scipy/sparse/linalg/dsolve/SuperLU/SRC/slu_util.h	2010-04-27 21:55:09 UTC (rev 6346)
@@ -21,6 +21,8 @@
 */
 #include <assert.h>
 
+#include "scipy_slu_config.h"
+
 /***********************************************************************
  * Macros
  ***********************************************************************/