[adios] 01/11: WIP: update py3 patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/1.9.0-2
in repository adios.

commit b5bc8eac3bba63231711c09319de6b1fbfcf4f81
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Aug 19 22:27:58 2015 +0100

    WIP: update py3 patch
---
 debian/patches/py3.patch | 90 +++++++++++++++++++++++++++++++++++-------------
 debian/rules             |  3 +-
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/debian/patches/py3.patch b/debian/patches/py3.patch
index 2060f64..c78a823 100644
--- a/debian/patches/py3.patch
+++ b/debian/patches/py3.patch
@@ -116,8 +116,8 @@ Index: adios-1.9.0/wrappers/numpy/setup3_mpi.py
 +  sys.exit(0)
 +
 +# Default option values
-+include_dirs = ['../../src/public', np.get_include()],
-+library_dirs = ['../../debian/tmp/usr/lib'],
++include_dirs = ['../../src/public', np.get_include()]
++library_dirs = ['../../debian/tmp/usr/lib']
 +extra_compile_args = []
 +extra_link_args = []
 +
@@ -232,15 +232,17 @@ Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
  
  ## Credit: http://svn.apache.org/repos/asf/subversion/tags/0.20.1/subversion/bindings/swig/python/setup.py
  def _do_usage():
-@@ -27,7 +28,7 @@ def _do_usage():
+@@ -27,8 +28,8 @@ def _do_usage():
    sys.exit(0)
  
  # Default option values
 -include_dirs = ['../../src/public'],
-+include_dirs = ['../../src/public', np.get_include()],
- library_dirs = ['../../debian/tmp/usr/lib'],
+-library_dirs = ['../../debian/tmp/usr/lib'],
++include_dirs = ['../../src/public', np.get_include()]
++library_dirs = ['../../debian/tmp/usr/lib']
  extra_compile_args = []
  extra_link_args = []
+ 
 @@ -65,7 +66,6 @@ for option in options:
  sys.argv[1:] = leftovers
  
@@ -257,25 +259,6 @@ Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
  extra_compile_args.insert(0, '-Wno-uninitialized')
  extra_compile_args.insert(0, '-Wno-unused-function')
  
-@@ -100,15 +99,15 @@ p = subprocess.Popen(["adios_config", "-
- pp = p.communicate()[0].decode(encoding='UTF-8').strip()
- for path in str(pp).split(" "):
-     if path.startswith('-I'):
--        m1.include_dirs.append(path.replace('-I', '', 1))
-+        m1.include_dirs[0].append(path.replace('-I', '', 1))
- 
- p = subprocess.Popen(["adios_config", "-l"], stdout=subprocess.PIPE)
- pp = p.communicate()[0].decode(encoding='UTF-8').strip()
- for path in str(pp).split(" "):
-     if path.startswith('-L'):
--        m1.library_dirs.append(path.replace('-L', '', 1))
-+        m1.library_dirs[0].append(path.replace('-L', '', 1))
-     if path.startswith('-l'):
--        m1.libraries.append(path.replace('-l', '', 1))
-+        m1.libraries[0].append(path.replace('-l', '', 1))
- 
- class adios_test(Command):
-     user_options = []
 @@ -125,7 +124,7 @@ class adios_test(Command):
          raise SystemExit(errno)
      
@@ -285,3 +268,62 @@ Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
        description = 'Python Module for Adios MPI',
        author = 'Jong Choi',
        author_email = 'yyalli at gmail.com',
+Index: adios-1.9.0/wrappers/numpy/Makefile
+===================================================================
+--- adios-1.9.0.orig/wrappers/numpy/Makefile
++++ adios-1.9.0/wrappers/numpy/Makefile
+@@ -1,17 +1,24 @@
+ MPI=n
+ CYTHON=n
++CYTHON3=n
+ 
+-OBJ = adios.so
++OBJ = adios.so adios3.so
+ 
+ ifeq ($(CYTHON), y)
+ 	OBJ := adios.cpp $(OBJ)
+ endif
++ifeq ($(CYTHON3), y)
++	OBJ := adios.cpp adios3.cpp $(OBJ)
++endif
+ 
+ ifeq ($(MPI),y)
+-	OBJ += adios_mpi.so
++	OBJ += adios_mpi.so adios3_mpi.so
+ 	ifeq ($(CYTHON), y)
+ 		OBJ := adios_mpi.cpp $(OBJ)
+ 	endif
++	ifeq ($(CYTHON3), y)
++		OBJ := adios3_mpi.cpp $(OBJ)
++	endif
+ endif
+ 
+ 
+@@ -29,15 +36,27 @@ python: $(OBJ)
+ adios.cpp:  adios.pyx
+ 	cython --cplus adios.pyx
+ 
++adios3.cpp:  adios.pyx
++	cython3 --cplus -3 -o adios3.cpp adios.pyx 
++
+ adios.so:  
+ 	python setup.py build_ext -lrt
+ 
++adios3.so:  
++	python3 setup3.py build_ext -lrt
++
+ adios_mpi.cpp:  adios_mpi.pyx
+ 	cython --cplus adios_mpi.pyx
+ 
++adios3_mpi.cpp:  adios_mpi.pyx
++	cython3 --cplus -3 -o adios3_mpi.cpp adios_mpi.pyx
++
+ adios_mpi.so:  
+ 	python setup_mpi.py build
+ 
++adios3_mpi.so:  
++	python3 setup3_mpi.py build
++
+ clean:
+ 	rm -rf build
+ 
diff --git a/debian/rules b/debian/rules
index ce69f9a..4c7465b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ override_dh_auto_configure:
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
 		--prefix=/usr MPIFC=mpif77 CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
-		LIBS=' -lpthread' CYTHON=y CYTHON3=y 
+		LIBS=' -lpthread' 
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -73,6 +73,7 @@ override_dh_auto_build:
 	mv debian/tmp/usr/lib/*/*.a debian/tmp/usr/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	chmod +x adios_config
+	$(MAKE) -C wrappers/numpy python CYTHON=y CYTHON3=y MPI=y
 	( cd wrappers/numpy && \
 		    ${PY2VERS} ./setup.py     install --prefix=$(TOP)/debian/tmpp  ;\
 		    ${PY2VERS} ./setup_mpi.py install --prefix=$(TOP)/debian/tmpp  ;\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git