[adios] 01/13: * remove mpi workaround patch, breaks things * Add comments to py3.patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Mar 1 11:42:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.9.0-8
in repository adios.
commit cdde0c19dbe4d75c466d5cbcc67c90a044405c29
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Oct 29 16:32:01 2015 +0000
* remove mpi workaround patch, breaks things
* Add comments to py3.patch
---
debian/changelog | 6 +++++
debian/patches/mpi-workaround.patch | 48 -------------------------------------
debian/patches/py3.patch | 31 +++++++++++++++++++++++-
debian/patches/series | 1 -
debian/patches/version-fix.patch | 13 ----------
5 files changed, 36 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d323c77..e4db42c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.9.0-3) unstable; urgency=medium
+
+ * Remove mpi-workaround.patch, breaks build on non-mpich archs
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 29 Oct 2015 17:02:01 +0000
+
adios (1.9.0-2) unstable; urgency=medium
* Build against all mpi versions again.
diff --git a/debian/patches/mpi-workaround.patch b/debian/patches/mpi-workaround.patch
deleted file mode 100644
index 1e13c89..0000000
--- a/debian/patches/mpi-workaround.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Hard-code use of mpich for the moment as openmpi doesn't
- work; bug in OpenMPI install.
-Last-Updated: 2015-10-25
-Forwarded: not-needed
-
-Index: adios-1.9.0/wrappers/numpy/mpi.cfg
-===================================================================
---- adios-1.9.0.orig/wrappers/numpy/mpi.cfg
-+++ adios-1.9.0/wrappers/numpy/mpi.cfg
-@@ -16,6 +16,9 @@
- # ---------------------
- [mpi]
-
-+mpicc = /usr/bin/mpicc.mpich
-+mpcxx = /usr/bin/mpicxx.mpich
-+
- ## mpi_dir = /usr
- ## mpi_dir = /usr/local
- ## mpi_dir = /usr/local/mpi
-Index: adios-1.9.0/wrappers/numpy/adios_mpi.pyx
-===================================================================
---- adios-1.9.0.orig/wrappers/numpy/adios_mpi.pyx
-+++ adios-1.9.0/wrappers/numpy/adios_mpi.pyx
-@@ -15,12 +15,12 @@ import cython
- cimport cython
-
- from libc.stdlib cimport malloc, free
--from cpython.string cimport PyString_AsString
-+from cpython.bytes cimport PyBytes_AsString
-
- cdef char ** to_cstring_array(list_str):
- cdef char **ret = <char **>malloc(len(list_str) * sizeof(char *))
- for i in xrange(len(list_str)):
-- ret[i] = PyString_AsString(list_str[i])
-+ ret[i] = PyBytes_AsString(list_str[i])
- return ret
-
- ## ====================
-@@ -423,7 +423,7 @@ cpdef int define_attribute_byvalue (int6
- cdef char ** pt2
- if (val_.dtype.char == 'S'):
- if (val_.size == 1):
-- pt1 = PyString_AsString(val)
-+ pt1 = PyBytes_AsString(val)
- adios_define_attribute_byvalue (group,
- name,
- path,
diff --git a/debian/patches/py3.patch b/debian/patches/py3.patch
index 14f088d..637f591 100644
--- a/debian/patches/py3.patch
+++ b/debian/patches/py3.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Python3 changes
+Last-Updated: 2015-10-29
+Forwarded: no
+
Index: adios-1.9.0/wrappers/numpy/setup3.py
===================================================================
--- /dev/null
@@ -74,7 +79,7 @@ Index: adios-1.9.0/wrappers/numpy/setup3.py
+ test_runner.run(test_suite)
+
+setup(name = 'adios',
-+ version = '1.8.1b3',
++ version = '1.9.0',
+ description = 'Python Module for Adios',
+ author = 'Jong Choi',
+ author_email = 'yyalli at gmail.com',
@@ -341,6 +346,21 @@ Index: adios-1.9.0/wrappers/numpy/adios_mpi.pyx
import numpy as np
cimport numpy as np
+@@ -14,12 +15,12 @@ import cython
+ cimport cython
+
+ from libc.stdlib cimport malloc, free
+-from cpython.string cimport PyString_AsString
++from cpython.bytes cimport PyBytes_AsString
+
+ cdef char ** to_cstring_array(list_str):
+ cdef char **ret = <char **>malloc(len(list_str) * sizeof(char *))
+ for i in xrange(len(list_str)):
+- ret[i] = PyString_AsString(list_str[i])
++ ret[i] = PyBytes_AsString(list_str[i])
+ return ret
+
+ ## ====================
@@ -346,7 +347,7 @@ cpdef int write_double (int64_t fd_p, ch
cpdef int read(int64_t fd_p, char * name, np.ndarray val):
@@ -350,6 +370,15 @@ Index: adios-1.9.0/wrappers/numpy/adios_mpi.pyx
return adios_read(fd_p, name, <void *> val.data, val.itemsize * val.size)
cpdef int close(int64_t fd_p):
+@@ -422,7 +423,7 @@ cpdef int define_attribute_byvalue (int6
+ cdef char ** pt2
+ if (val_.dtype.char == 'S'):
+ if (val_.size == 1):
+- pt1 = PyString_AsString(val)
++ pt1 = PyBytes_AsString(val)
+ adios_define_attribute_byvalue (group,
+ name,
+ path,
@@ -497,24 +498,24 @@ cpdef np.dtype adios2npdtype(ADIOS_DATAT
return ntype
diff --git a/debian/patches/series b/debian/patches/series
index 6fa30f9..ccb826f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,5 +13,4 @@ python_wrapper.patch
autotools-fixes.patch
multiarch_safe.patch
py3.patch
-mpi-workaround.patch
version-fix.patch
diff --git a/debian/patches/version-fix.patch b/debian/patches/version-fix.patch
index f552622..98ee690 100644
--- a/debian/patches/version-fix.patch
+++ b/debian/patches/version-fix.patch
@@ -16,16 +16,3 @@ Index: adios-1.9.0/wrappers/numpy/setup.py
description = 'Python Module for Adios',
author = 'Jong Choi',
author_email = 'yyalli at gmail.com',
-Index: adios-1.9.0/wrappers/numpy/setup3.py
-===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup3.py
-+++ adios-1.9.0/wrappers/numpy/setup3.py
-@@ -69,7 +69,7 @@ class adios_test(Command):
- test_runner.run(test_suite)
-
- setup(name = 'adios',
-- version = '1.8.1b3',
-+ version = '1.9.0',
- description = 'Python Module for Adios',
- author = 'Jong Choi',
- author_email = 'yyalli at gmail.com',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list