[python-scientific] 03/07: refresh the patch queue
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Thu Jan 23 16:40:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository python-scientific.
commit cd9950567e8d094f318fa07a785b260071e121fc
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Jan 23 13:15:25 2014 +0100
refresh the patch queue
---
...h => 0001-debian-deal-with-mpi-compilers.patch} | 13 +++---
.../0001-replace-PyObject_NEW-Pyobject_new.patch | 54 ----------------------
...eature-forwarded-numpy-arrayobject-header.patch | 24 ----------
debian/patches/series | 4 +-
4 files changed, 7 insertions(+), 88 deletions(-)
diff --git a/debian/patches/0002-debian-deal-with-mpi-compilers.patch b/debian/patches/0001-debian-deal-with-mpi-compilers.patch
similarity index 79%
rename from debian/patches/0002-debian-deal-with-mpi-compilers.patch
rename to debian/patches/0001-debian-deal-with-mpi-compilers.patch
index e645b78..67f0e67 100644
--- a/debian/patches/0002-debian-deal-with-mpi-compilers.patch
+++ b/debian/patches/0001-debian-deal-with-mpi-compilers.patch
@@ -1,13 +1,13 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 20 Sep 2011 21:17:10 +0200
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Mon, 19 Aug 2013 20:53:05 +0200
Subject: debian deal with mpi compilers
---
- Src/MPI/compile.py | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
+ Src/MPI/compile.py | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/Src/MPI/compile.py b/Src/MPI/compile.py
-index 1352686..e37055d 100644
+index b0af23b..fde75b6 100644
--- a/Src/MPI/compile.py
+++ b/Src/MPI/compile.py
@@ -11,6 +11,18 @@ cfgDict = distutils.sysconfig.get_config_vars()
@@ -19,7 +19,7 @@ index 1352686..e37055d 100644
+
+if os.environ.has_key('USE_OPENMPI'):
+ mpicompiler = 'mpicc.openmpi'
-+ mpiinclude = '/usr/include/openmpi'
++ mpiinclude = '/usr/include/openmpi -lmpi'
+ executable = 'mpipython.openmpi'
+if os.environ.has_key('USE_MPICH'):
+ mpicompiler = 'mpicc.mpich2'
@@ -42,4 +42,3 @@ index 1352686..e37055d 100644
cfgDict['INCLUDEPY'],
extra_compile_args,
sources,
---
diff --git a/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch b/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch
deleted file mode 100644
index 6466005..0000000
--- a/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 20 Sep 2011 21:15:28 +0200
-Subject: replace PyObject_NEW -> Pyobject_new
-
----
- Src/MPI/Scientific_mpi.c | 6 +++---
- Src/Scientific_netcdf.c | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Src/MPI/Scientific_mpi.c b/Src/MPI/Scientific_mpi.c
-index 4510ef1..cbf2240 100644
---- a/Src/MPI/Scientific_mpi.c
-+++ b/Src/MPI/Scientific_mpi.c
-@@ -101,7 +101,7 @@ newPyMPIOperationObject(MPI_Op mpi_op, char *op_name)
- {
- PyMPIOperationObject *self;
-
-- self = PyObject_NEW(PyMPIOperationObject, &PyMPIOperation_Type);
-+ self = PyObject_New(PyMPIOperationObject, &PyMPIOperation_Type);
- if (self == NULL)
- return NULL;
- self->mpi_op = mpi_op;
-@@ -161,7 +161,7 @@ newPyMPICommunicatorObject(MPI_Comm handle)
- {
- PyMPICommunicatorObject *self;
-
-- self = PyObject_NEW(PyMPICommunicatorObject, &PyMPICommunicator_Type);
-+ self = PyObject_New(PyMPICommunicatorObject, &PyMPICommunicator_Type);
- if (self == NULL)
- return NULL;
- self->handle = handle;
-@@ -1147,7 +1147,7 @@ newPyMPIRequestObject(MPI_Request rq, PyObject *buffer, int operation,
- {
- PyMPIRequestObject *self;
-
-- self = PyObject_NEW(PyMPIRequestObject, &PyMPIRequest_Type);
-+ self = PyObject_New(PyMPIRequestObject, &PyMPIRequest_Type);
- if (self == NULL)
- return NULL;
- self->handle[0] = rq;
-diff --git a/Src/Scientific_netcdf.c b/Src/Scientific_netcdf.c
-index 3b4323b..a6818bd 100644
---- a/Src/Scientific_netcdf.c
-+++ b/Src/Scientific_netcdf.c
-@@ -1313,7 +1313,7 @@ netcdf_variable_new(PyNetCDFFileObject *file, char *name, int id, int type,
- int recdim;
- int i;
- if (check_if_open(file, -1)) {
-- self = PyObject_NEW(PyNetCDFVariableObject, &PyNetCDFVariable_Type);
-+ self = PyObject_New(PyNetCDFVariableObject, &PyNetCDFVariable_Type);
- if (self == NULL)
- return NULL;
- self->file = file;
---
diff --git a/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch b/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch
deleted file mode 100644
index bdeeb09..0000000
--- a/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 20 Sep 2011 21:17:59 +0200
-Subject: feature forwarded numpy arrayobject header
-
----
- Src/MPI/compile.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Src/MPI/compile.py b/Src/MPI/compile.py
-index e37055d..829e0e1 100644
---- a/Src/MPI/compile.py
-+++ b/Src/MPI/compile.py
-@@ -28,8 +28,8 @@ sources='mpipython.c Scientific_mpi.c'
- extra_compile_args = ""
- if N.package == "NumPy":
- arrayobject_h_include = os.path.join(sys.prefix,
-- "lib/python%s.%s/site-packages/numpy/core/include"
-- % sys.version_info [:2])
-+ "%s/numpy/core/include"
-+ % distutils.sysconfig.get_python_lib())
- extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
-
- linkforshared = cfgDict['LINKFORSHARED']
---
diff --git a/debian/patches/series b/debian/patches/series
index e43807e..cf63566 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-replace-PyObject_NEW-Pyobject_new.patch
-0002-debian-deal-with-mpi-compilers.patch
-0003-feature-forwarded-numpy-arrayobject-header.patch
+0001-debian-deal-with-mpi-compilers.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-scientific.git
More information about the debian-science-commits
mailing list