[gentoo-commits] gentoo-x86 commit in sci-libs/scipy/files: scipy-0.9.0-superlu.patch scipy-0.9.0-qhull.patch

[gentoo-commits] gentoo-x86 commit in sci-libs/scipy/files: scipy-0.9.0-superlu.patch scipy-0.9.0-qhull.patch

[Justin Lecher (jlec)]

jlec        11/03/26 17:10:43

  Added:                scipy-0.9.0-superlu.patch scipy-0.9.0-qhull.patch
  Log:
  Unbundled Superlu and Qhull, #357879
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/scipy/files/scipy-0.9.0-superlu.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.9.0-superlu.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.9.0-superlu.patch?rev=1.1&content-type=text/plain

Index: scipy-0.9.0-superlu.patch
===================================================================
--- scipy/sparse/linalg/dsolve/_superluobject.h.orig	2011-03-24 22:05:15.995923005 +1300
+++ scipy/sparse/linalg/dsolve/_superluobject.h	2011-03-24 22:06:09.638923002 +1300
@@ -9,11 +9,10 @@
 #define __SUPERLU_OBJECT
 
 #include "Python.h"
-#include "SuperLU/SRC/slu_zdefs.h"
+#include "superlu/slu_zdefs.h"
 #include "numpy/arrayobject.h"
-#include "SuperLU/SRC/slu_util.h"
-#include "SuperLU/SRC/slu_dcomplex.h"
-#include "SuperLU/SRC/slu_scomplex.h"
+#include "superlu/slu_util.h"
+#include "superlu/slu_dcomplex.h"
 
 
 #define _CHECK_INTEGER(x) (PyArray_ISINTEGER(x) && (x)->descr->elsize == sizeof(int))
 
--- scipy/sparse/linalg/dsolve/setup.py.orig	2011-02-20 22:58:20.000000000 +1300
+++ scipy/sparse/linalg/dsolve/setup.py	2011-03-25 11:08:02.691267018 +1300
@@ -25,18 +25,12 @@
         # when using MSVC + MKL, lsame is already in MKL
         sources.remove(join(superlu_src, 'lsame.c'))
 
-    config.add_library('superlu_src',
-                       sources = sources,
-                       macros = superlu_defs,
-                       include_dirs=[superlu_src],
-                       )
-
     # Extension
     config.add_extension('_superlu',
                          sources = ['_superlumodule.c',
                                     '_superlu_utils.c',
                                     '_superluobject.c'],
-                         libraries = ['superlu_src'],
+                         libraries = ['superlu'],
                          extra_info = lapack_opt,
                          )
 



1.1                  sci-libs/scipy/files/scipy-0.9.0-qhull.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.9.0-qhull.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.9.0-qhull.patch?rev=1.1&content-type=text/plain

Index: scipy-0.9.0-qhull.patch
===================================================================
 scipy/spatial/qhull.c  |    4 ++--
 scipy/spatial/setup.py |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scipy/spatial/qhull.c b/scipy/spatial/qhull.c
index 91e22b3..e433ae9 100644
--- a/scipy/spatial/qhull.c
+++ b/scipy/spatial/qhull.c
@@ -202,8 +202,8 @@
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
 #include "math.h"
-#include "qhull/src/qset.h"
-#include "qhull/src/qhull.h"
+#include "qhull/qset.h"
+#include "qhull/qhull.h"
 #include "qhull_blas.h"
 
 
diff --git a/scipy/spatial/setup.py b/scipy/spatial/setup.py
index 7401d55..254c23d 100755
--- a/scipy/spatial/setup.py
+++ b/scipy/spatial/setup.py
@@ -16,13 +16,13 @@ def configuration(parent_package = '', top_path = None):
                  'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
                  'userprintf.c']
 
-    config.add_library('qhull',
-                       sources=[join('qhull', 'src', x) for x in qhull_src],
-                       include_dirs=[get_python_inc(),
-                                     get_numpy_include_dirs()],
-                       # XXX: GCC dependency!
-                       #extra_compiler_args=['-fno-strict-aliasing'],
-                       )
+#    config.add_library('qhull',
+#                       sources=[join('qhull', 'src', x) for x in qhull_src],
+#                       include_dirs=[get_python_inc(),
+#                                     get_numpy_include_dirs()],
+#                       # XXX: GCC dependency!
+#                       #extra_compiler_args=['-fno-strict-aliasing'],
+#                       )
 
     lapack = dict(get_info('lapack_opt'))
     try:

[gentoo-commits] gentoo-x86 commit in sci-libs/scipy/files: scipy-0.9.0-superlu.patch scipy-0.9.0-qhull.patch

[Sebastien Fabbro (bicatali)]

bicatali    14/05/05 20:21:53

  Removed:              scipy-0.9.0-superlu.patch scipy-0.9.0-qhull.patch
  Log:
  Version bump. Reintroduced ppc and ppc64 because mpmath is not mandatory anymore for testing
  
  (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)