[python-arrayfire] 05/11: BUGFIX: Fixes issue with numpy interop on Windows + python2.7
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun May 1 19:50:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository python-arrayfire.
commit 1594809a8774cc025274626526c01aba328cdaf8
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date: Wed Apr 27 19:12:08 2016 -0400
BUGFIX: Fixes issue with numpy interop on Windows + python2.7
---
arrayfire/array.py | 2 +-
arrayfire/interop.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arrayfire/array.py b/arrayfire/array.py
index 660baef..8ec9d82 100644
--- a/arrayfire/array.py
+++ b/arrayfire/array.py
@@ -407,7 +407,7 @@ class Array(BaseArray):
buf,buf_len = tmp.buffer_info()
_type_char = tmp.typecode
numdims, idims = _get_info(dims, buf_len)
- elif isinstance(src, int) or isinstance(src, ct.c_void_p):
+ elif isinstance(src, long) or isinstance(src, int) or isinstance(src, ct.c_void_p):
buf = src if not isinstance(src, ct.c_void_p) else src.value
numdims, idims = _get_info(dims, buf_len)
diff --git a/arrayfire/interop.py b/arrayfire/interop.py
index 0fb55c1..e512b75 100644
--- a/arrayfire/interop.py
+++ b/arrayfire/interop.py
@@ -40,7 +40,7 @@ try:
"""
in_shape = np_arr.shape
- in_ptr = np_arr.ctypes.data
+ in_ptr = np_arr.ctypes.data_as(ct.c_void_p)
in_dtype = np_arr.dtype.char
if (np_arr.flags['F_CONTIGUOUS']):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-arrayfire.git
More information about the debian-science-commits
mailing list