[python-arrayfire] 65/250: STYLE: Changing array class to Array to comply with python style guide
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Mar 28 22:59:31 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 71b0955ed5dd1245d89624f2f2de85cb18fb5ee4
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date: Thu Aug 27 18:16:39 2015 -0400
STYLE: Changing array class to Array to comply with python style guide
- Also helps in avoiding path conflicts and
---
arrayfire/__init__.py | 2 +-
arrayfire/algorithm.py | 28 ++++++++++++-------------
arrayfire/arith.py | 14 ++++++-------
arrayfire/array.py | 24 ++++++++++-----------
arrayfire/base.py | 2 +-
arrayfire/blas.py | 10 ++++-----
arrayfire/data.py | 32 ++++++++++++++--------------
arrayfire/features.py | 10 ++++-----
arrayfire/image.py | 56 ++++++++++++++++++++++++-------------------------
arrayfire/index.py | 6 +++---
arrayfire/lapack.py | 24 ++++++++++-----------
arrayfire/signal.py | 32 ++++++++++++++--------------
arrayfire/statistics.py | 10 ++++-----
arrayfire/vision.py | 8 +++----
tests/simple_array.py | 6 +++---
tests/simple_index.py | 4 ++--
16 files changed, 134 insertions(+), 134 deletions(-)
diff --git a/arrayfire/__init__.py b/arrayfire/__init__.py
index 905fda6..dbe10e0 100644
--- a/arrayfire/__init__.py
+++ b/arrayfire/__init__.py
@@ -32,7 +32,7 @@ del numbers
del os
#do not export internal classes
-del base_array
+del BaseArray
del uidx
del seq
del index
diff --git a/arrayfire/algorithm.py b/arrayfire/algorithm.py
index 7607dd8..e045e55 100644
--- a/arrayfire/algorithm.py
+++ b/arrayfire/algorithm.py
@@ -11,7 +11,7 @@ from .library import *
from .array import *
def parallel_dim(a, dim, c_func):
- out = array()
+ out = Array()
safe_call(c_func(ct.pointer(out.arr), a.arr, ct.c_int(dim)))
return out
@@ -67,8 +67,8 @@ def count(a, dim=None):
def imin(a, dim=None):
if dim is not None:
- out = array()
- idx = array()
+ out = Array()
+ idx = Array()
safe_call(clib.af_imin(ct.pointer(out.arr), ct.pointer(idx.arr), a.arr, ct.c_int(dim)))
return out,idx
else:
@@ -83,8 +83,8 @@ def imin(a, dim=None):
def imax(a, dim=None):
if dim is not None:
- out = array()
- idx = array()
+ out = Array()
+ idx = Array()
safe_call(clib.af_imax(ct.pointer(out.arr), ct.pointer(idx.arr), a.arr, ct.c_int(dim)))
return out,idx
else:
@@ -102,7 +102,7 @@ def accum(a, dim=0):
return parallel_dim(a, dim, clib.af_accum)
def where(a):
- out = array()
+ out = Array()
safe_call(clib.af_where(ct.pointer(out.arr), a.arr))
return out
@@ -113,35 +113,35 @@ def diff2(a, dim=0):
return parallel_dim(a, dim, clib.af_diff2)
def sort(a, dim=0, is_ascending=True):
- out = array()
+ out = Array()
safe_call(clib.af_sort(ct.pointer(out.arr), a.arr, ct.c_uint(dim), ct.c_bool(is_ascending)))
return out
def sort_index(a, dim=0, is_ascending=True):
- out = array()
- idx = array()
+ out = Array()
+ idx = Array()
safe_call(clib.af_sort_index(ct.pointer(out.arr), ct.pointer(idx.arr), a.arr, \
ct.c_uint(dim), ct.c_bool(is_ascending)))
return out,idx
def sort_by_key(iv, ik, dim=0, is_ascending=True):
- ov = array()
- ok = array()
+ ov = Array()
+ ok = Array()
safe_call(clib.af_sort_by_key(ct.pointer(ov.arr), ct.pointer(ok.arr), \
iv.arr, ik.arr, ct.c_uint(dim), ct.c_bool(is_ascending)))
return ov,ok
def set_unique(a, is_sorted=False):
- out = array()
+ out = Array()
safe_call(clib.af_set_unique(ct.pointer(out.arr), a.arr, ct.c_bool(is_sorted)))
return out
def set_union(a, b, is_unique=False):
- out = array()
+ out = Array()
safe_call(clib.af_set_union(ct.pointer(out.arr), a.arr, b.arr, ct.c_bool(is_unique)))
return out
def set_intersect(a, b, is_unique=False):
- out = array()
+ out = Array()
safe_call(clib.af_set_intersect(ct.pointer(out.arr), a.arr, b.arr, ct.c_bool(is_unique)))
return out
diff --git a/arrayfire/arith.py b/arrayfire/arith.py
index ffc8c5b..a9f942b 100644
--- a/arrayfire/arith.py
+++ b/arrayfire/arith.py
@@ -12,10 +12,10 @@ from .array import *
from .broadcast import *
def arith_binary_func(lhs, rhs, c_func):
- out = array()
+ out = Array()
- is_left_array = isinstance(lhs, array)
- is_right_array = isinstance(rhs, array)
+ is_left_array = isinstance(lhs, Array)
+ is_right_array = isinstance(rhs, Array)
if not (is_left_array or is_right_array):
raise TypeError("Atleast one input needs to be of type arrayfire.array")
@@ -26,26 +26,26 @@ def arith_binary_func(lhs, rhs, c_func):
elif (is_number(rhs)):
ldims = dim4_tuple(lhs.dims())
rty = number_dtype(rhs)
- other = array()
+ other = Array()
other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], rty)
safe_call(c_func(ct.pointer(out.arr), lhs.arr, other.arr, bcast.get()))
else:
rdims = dim4_tuple(rhs.dims())
lty = number_dtype(lhs)
- other = array()
+ other = Array()
other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], lty)
safe_call(c_func(ct.pointer(out.arr), other.arr, rhs.arr, bcast.get()))
return out
def arith_unary_func(a, c_func):
- out = array()
+ out = Array()
safe_call(c_func(ct.pointer(out.arr), a.arr))
return out
def cast(a, dtype=f32):
- out=array()
+ out=Array()
safe_call(clib.af_cast(ct.pointer(out.arr), a.arr, dtype))
return out
diff --git a/arrayfire/array.py b/arrayfire/array.py
index aacafb3..0fdf83d 100644
--- a/arrayfire/array.py
+++ b/arrayfire/array.py
@@ -55,15 +55,15 @@ def constant_array(val, d0, d1=None, d2=None, d3=None, dtype=f32):
def binary_func(lhs, rhs, c_func):
- out = array()
+ out = Array()
other = rhs
if (is_number(rhs)):
ldims = dim4_tuple(lhs.dims())
rty = number_dtype(rhs)
- other = array()
+ other = Array()
other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], rty)
- elif not isinstance(rhs, array):
+ elif not isinstance(rhs, Array):
raise TypeError("Invalid parameter to binary function")
safe_call(c_func(ct.pointer(out.arr), lhs.arr, other.arr, bcast.get()))
@@ -71,15 +71,15 @@ def binary_func(lhs, rhs, c_func):
return out
def binary_funcr(lhs, rhs, c_func):
- out = array()
+ out = Array()
other = lhs
if (is_number(lhs)):
rdims = dim4_tuple(rhs.dims())
lty = number_dtype(lhs)
- other = array()
+ other = Array()
other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], lty)
- elif not isinstance(lhs, array):
+ elif not isinstance(lhs, Array):
raise TypeError("Invalid parameter to binary function")
c_func(ct.pointer(out.arr), other.arr, rhs.arr, bcast.get())
@@ -87,7 +87,7 @@ def binary_funcr(lhs, rhs, c_func):
return out
def transpose(a, conj=False):
- out = array()
+ out = Array()
safe_call(clib.af_transpose(ct.pointer(out.arr), a.arr, conj))
return out
@@ -124,11 +124,11 @@ def get_info(dims, buf_len):
return numdims, idims
-class array(base_array):
+class Array(BaseArray):
def __init__(self, src=None, dims=(0,), type_char=None):
- super(array, self).__init__()
+ super(Array, self).__init__()
buf=None
buf_len=0
@@ -137,7 +137,7 @@ class array(base_array):
if src is not None:
- if (isinstance(src, array)):
+ if (isinstance(src, Array)):
safe_call(clib.af_retain_array(ct.pointer(self.arr), src.arr))
return
@@ -178,7 +178,7 @@ class array(base_array):
self.arr = create_array(buf, numdims, idims, to_dtype[_type_char])
def copy(self):
- out = array()
+ out = Array()
safe_call(clib.af_copy_array(ct.pointer(out.arr), self.arr))
return out
@@ -424,7 +424,7 @@ class array(base_array):
def __getitem__(self, key):
try:
- out = array()
+ out = Array()
n_dims = self.numdims()
inds = get_indices(key, n_dims)
diff --git a/arrayfire/base.py b/arrayfire/base.py
index 26d5ade..6376557 100644
--- a/arrayfire/base.py
+++ b/arrayfire/base.py
@@ -9,6 +9,6 @@
from .library import *
from .util import *
-class base_array(object):
+class BaseArray(object):
def __init__(self):
self.arr = ct.c_void_p(0)
diff --git a/arrayfire/blas.py b/arrayfire/blas.py
index da78919..f450896 100644
--- a/arrayfire/blas.py
+++ b/arrayfire/blas.py
@@ -11,31 +11,31 @@ from .library import *
from .array import *
def matmul(lhs, rhs, lhs_opts=AF_MAT_NONE, rhs_opts=AF_MAT_NONE):
- out = array()
+ out = Array()
safe_call(clib.af_matmul(ct.pointer(out.arr), lhs.arr, rhs.arr,\
lhs_opts, rhs_opts))
return out
def matmulTN(lhs, rhs):
- out = array()
+ out = Array()
safe_call(clib.af_matmul(ct.pointer(out.arr), lhs.arr, rhs.arr,\
AF_MAT_TRANS, AF_MAT_NONE))
return out
def matmulNT(lhs, rhs):
- out = array()
+ out = Array()
safe_call(clib.af_matmul(ct.pointer(out.arr), lhs.arr, rhs.arr,\
AF_MAT_NONE, AF_MAT_TRANS))
return out
def matmulTT(lhs, rhs):
- out = array()
+ out = Array()
safe_call(clib.af_matmul(ct.pointer(out.arr), lhs.arr, rhs.arr,\
AF_MAT_TRANS, AF_MAT_TRANS))
return out
def dot(lhs, rhs, lhs_opts=AF_MAT_NONE, rhs_opts=AF_MAT_NONE):
- out = array()
+ out = Array()
safe_call(clib.af_dot(ct.pointer(out.arr), lhs.arr, rhs.arr,\
lhs_opts, rhs_opts))
return out
diff --git a/arrayfire/data.py b/arrayfire/data.py
index d3edb2c..ef769b9 100644
--- a/arrayfire/data.py
+++ b/arrayfire/data.py
@@ -13,7 +13,7 @@ from .array import *
from .util import *
def constant(val, d0, d1=None, d2=None, d3=None, dtype=f32):
- out = array()
+ out = Array()
out.arr = constant_array(val, d0, d1, d2, d3, dtype)
return out
@@ -28,7 +28,7 @@ def range(d0, d1=None, d2=None, d3=None, dim=-1, dtype=f32):
else:
raise TypeError("Invalid dtype")
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
safe_call(clib.af_range(ct.pointer(out.arr), 4, ct.pointer(dims), dim, dtype))
@@ -42,7 +42,7 @@ def iota(d0, d1=None, d2=None, d3=None, dim=-1, tile_dims=None, dtype=f32):
else:
raise TypeError("Invalid dtype")
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
td=[1]*4
@@ -63,7 +63,7 @@ def randu(d0, d1=None, d2=None, d3=None, dtype=f32):
else:
raise TypeError("Invalid dtype")
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
safe_call(clib.af_randu(ct.pointer(out.arr), 4, ct.pointer(dims), dtype))
@@ -77,7 +77,7 @@ def randn(d0, d1=None, d2=None, d3=None, dtype=f32):
else:
raise TypeError("Invalid dtype")
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
safe_call(clib.af_randn(ct.pointer(out.arr), 4, ct.pointer(dims), dtype))
@@ -99,14 +99,14 @@ def identity(d0, d1=None, d2=None, d3=None, dtype=f32):
else:
raise TypeError("Invalid dtype")
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
safe_call(clib.af_identity(ct.pointer(out.arr), 4, ct.pointer(dims), dtype))
return out
def diag(a, num=0, extract=True):
- out = array()
+ out = Array()
if extract:
safe_call(clib.af_diag_extract(ct.pointer(out.arr), a.arr, ct.c_int(num)))
else:
@@ -114,7 +114,7 @@ def diag(a, num=0, extract=True):
return out
def join(dim, first, second, third=None, fourth=None):
- out = array()
+ out = Array()
if (third is None and fourth is None):
safe_call(clib.af_join(ct.pointer(out.arr), dim, first.arr, second.arr))
else:
@@ -131,43 +131,43 @@ def join(dim, first, second, third=None, fourth=None):
def tile(a, d0, d1=1, d2=1, d3=1):
- out = array()
+ out = Array()
safe_call(clib.af_tile(ct.pointer(out.arr), a.arr, d0, d1, d2, d3))
return out
def reorder(a, d0=1, d1=0, d2=2, d3=3):
- out = array()
+ out = Array()
safe_call(clib.af_reorder(ct.pointer(out.arr), a.arr, d0, d1, d2, d3))
return out
def shift(a, d0, d1=0, d2=0, d3=0):
- out = array()
+ out = Array()
safe_call(clib.af_shift(ct.pointer(out.arr), a.arr, d0, d1, d2, d3))
return out
def moddims(a, d0, d1=1, d2=1, d3=1):
- out = array()
+ out = Array()
dims = dim4(d0, d1, d2, d3)
safe_call(clib.af_moddims(ct.pointer(out.arr), a.arr, 4, ct.pointer(dims)))
return out
def flat(a):
- out = array()
+ out = Array()
safe_call(clib.af_flat(ct.pointer(out.arr), a.arr))
return out
def flip(a, dim=0):
- out = array()
+ out = Array()
safe_call(clib.af_flip(ct.pointer(out.arr), a.arr, ct.c_int(dim)))
return out
def lower(a, is_unit_diag=False):
- out = array()
+ out = Array()
safe_call(clib.af_lower(ct.pointer(out.arr), a.arr, is_unit_diag))
return out
def upper(a, is_unit_diag=False):
- out = array()
+ out = Array()
safe_call(clib.af_upper(ct.pointer(out.arr), a.arr, is_unit_diag))
return out
diff --git a/arrayfire/features.py b/arrayfire/features.py
index 2a1854d..b30731c 100644
--- a/arrayfire/features.py
+++ b/arrayfire/features.py
@@ -24,26 +24,26 @@ class features(object):
return num
def get_xpos():
- out = array()
+ out = Array()
safe_call(clib.af_get_features_xpos(ct.pointer(out.arr), self.feat))
return out
def get_ypos():
- out = array()
+ out = Array()
safe_call(clib.af_get_features_ypos(ct.pointer(out.arr), self.feat))
return out
def get_score():
- out = array()
+ out = Array()
safe_call(clib.af_get_features_score(ct.pointer(out.arr), self.feat))
return out
def get_orientation():
- out = array()
+ out = Array()
safe_call(clib.af_get_features_orientation(ct.pointer(out.arr), self.feat))
return out
def get_size():
- out = array()
+ out = Array()
safe_call(clib.af_get_features_size(ct.pointer(out.arr), self.feat))
return out
diff --git a/arrayfire/image.py b/arrayfire/image.py
index 227a895..057224a 100644
--- a/arrayfire/image.py
+++ b/arrayfire/image.py
@@ -13,14 +13,14 @@ from .data import constant
import os
def gradient(image):
- dx = array()
- dy = array()
+ dx = Array()
+ dy = Array()
safe_call(clib.af_gradient(ct.pointer(dx.arr), ct.pointer(dy.arr), image.arr))
return dx, dy
def load_image(file_name, is_color=False):
assert(os.path.isfile(file_name))
- image = array()
+ image = Array()
safe_call(clib.af_load_image(ct.pointer(image.arr), \
ct.c_char_p(file_name.encode('ascii')), is_color))
return image
@@ -40,39 +40,39 @@ def resize(image, scale=None, odim0=None, odim1=None, method=AF_INTERP_NEAREST):
odim0 = int(scale * idims[0])
odim1 = int(scale * idims[1])
- output = array()
+ output = Array()
safe_call(clib.af_resize(ct.pointer(output.arr),\
image.arr, ct.c_longlong(odim0), ct.c_longlong(odim1), method))
return output
def transform(image, transform, odim0 = 0, odim1 = 0, method=AF_INTERP_NEAREST, is_inverse=True):
- output = array()
+ output = Array()
safe_call(clib.af_transform(ct.pointer(output.arr),\
image.arr, transform.arr,\
ct.c_longlong(odim0), ct.c_longlong(odim1), method, is_inverse))
return output
def rotate(image, theta, is_crop = True, method = AF_INTERP_NEAREST):
- output = array()
+ output = Array()
safe_call(clib.af_rotate(ct.pointer(output.arr), image.arr, ct.c_double(theta), is_crop, method))
return output
def translate(image, trans0, trans1, odim0 = 0, odim1 = 0, method = AF_INTERP_NEAREST):
- output = array()
+ output = Array()
safe_call(clib.af_translate(ct.pointer(output.arr), \
image.arr, trans0, trans1, ct.c_longlong(odim0), ct.c_longlong(odim1), method))
return output
def scale(image, scale0, scale1, odim0 = 0, odim1 = 0, method = AF_INTERP_NEAREST):
- output = array()
+ output = Array()
safe_call(clib.af_scale(ct.pointer(output.arr),\
image.arr, ct.c_double(scale0), ct.c_double(scale1),\
ct.c_longlong(odim0), ct.c_longlong(odim1), method))
return output
def skew(image, skew0, skew1, odim0 = 0, odim1 = 0, method = AF_INTERP_NEAREST, is_inverse=True):
- output = array()
+ output = Array()
safe_call(clib.af_skew(ct.pointer(output.arr),\
image.arr, ct.c_double(skew0), ct.c_double(skew1), \
ct.c_longlong(odim0), ct.c_longlong(odim1), method, is_inverse))
@@ -89,13 +89,13 @@ def histogram(image, nbins, min_val = None, max_val = None):
if max_val is None:
max_val = af_max(image)
- output = array()
+ output = Array()
safe_call(clib.af_histogram(ct.pointer(output.arr),\
image.arr, ct.c_uint(nbins), ct.c_double(min_val), ct.c_double(max_val)))
return output
def hist_equal(image, hist):
- output = array()
+ output = Array()
safe_call(clib.af_hist_equal(ct.pointer(output.arr), image.arr, hist.arr))
return output
@@ -104,7 +104,7 @@ def dilate(image, mask = None):
if mask is None:
mask = constant(1, 3, 3, dtype=f32)
- output = array()
+ output = Array()
safe_call(clib.af_dilate(ct.pointer(output.arr), image.arr, mask.arr))
return output
@@ -114,7 +114,7 @@ def dilate3(image, mask = None):
if mask is None:
mask = constant(1, 3, 3, 3, dtype=f32)
- output = array()
+ output = Array()
safe_call(clib.af_dilate3(ct.pointer(output.arr), image.arr, mask.arr))
return output
@@ -124,7 +124,7 @@ def erode(image, mask = None):
if mask is None:
mask = constant(1, 3, 3, dtype=f32)
- output = array()
+ output = Array()
safe_call(clib.af_erode(ct.pointer(output.arr), image.arr, mask.arr))
return output
@@ -134,50 +134,50 @@ def erode3(image, mask = None):
if mask is None:
mask = constant(1, 3, 3, 3, dtype=f32)
- output = array()
+ output = Array()
safe_call(clib.af_erode3(ct.pointer(output.arr), image.arr, mask.arr))
return output
def bilateral(image, s_sigma, c_sigma, is_color = False):
- output = array()
+ output = Array()
safe_call(clib.af_bilateral(ct.pointer(output.arr),\
image.arr, ct.c_double(s_sigma), ct.c_double(c_sigma), is_color))
return output
def mean_shift(image, s_sigma, c_sigma, n_iter, is_color = False):
- output = array()
+ output = Array()
safe_call(clib.af_mean_shift(ct.pointer(output.arr),\
image.arr, ct.c_double(s_sigma), ct.c_double(c_sigma),\
ct.c_uint(n_iter), is_color))
return output
def medfilt(image, w_len = 3, w_wid = 3, edge_pad = AF_PAD_ZERO):
- output = array()
+ output = Array()
safe_call(clib.af_medfilt(ct.pointer(output.arr), \
image.arr, ct.c_longlong(w_len), ct.c_longlong(w_wid), edge_pad))
return output
def minfilt(image, w_len = 3, w_wid = 3, edge_pad = AF_PAD_ZERO):
- output = array()
+ output = Array()
safe_call(clib.af_minfilt(ct.pointer(output.arr), \
image.arr, ct.c_longlong(w_len), ct.c_longlong(w_wid), edge_pad))
return output
def maxfilt(image, w_len = 3, w_wid = 3, edge_pad = AF_PAD_ZERO):
- output = array()
+ output = Array()
safe_call(clib.af_maxfilt(ct.pointer(output.arr), \
image.arr, ct.c_longlong(w_len), ct.c_longlong(w_wid), edge_pad))
return output
def regions(image, connectivity = AF_CONNECTIVITY_4, out_type = f32):
- output = array()
+ output = Array()
safe_call(clib.af_regions(ct.pointer(output.arr), image.arr, connectivity, out_type))
return output
def sobel_derivatives(image, w_len=3):
- dx = array()
- dy = array()
+ dx = Array()
+ dy = Array()
safe_call(clib.af_sobel_operator(ct.pointer(dx.arr), ct.pointer(dy.arr),\
image.arr, ct.c_uint(w_len)))
return dx,dy
@@ -193,28 +193,28 @@ def sobel_filter(image, w_len = 3, is_fast = False):
return af_hypot(dx, dy)
def rgb2gray(image, r_factor = 0.2126, g_factor = 0.7152, b_factor = 0.0722):
- output=array()
+ output=Array()
safe_call(clib.af_rgb2gray(ct.pointer(output.arr), \
image.arr, ct.c_float(r_factor), ct.c_float(g_factor), ct.c_float(b_factor)))
return output
def gray2rgb(image, r_factor = 1.0, g_factor = 1.0, b_factor = 1.0):
- output=array()
+ output=Array()
safe_call(clib.af_gray2rgb(ct.pointer(output.arr), \
image.arr, ct.c_float(r_factor), ct.c_float(g_factor), ct.c_float(b_factor)))
return output
def hsv2rgb(image):
- output = array()
+ output = Array()
safe_call(clib.af_hsv2rgb(ct.pointer(output.arr), image.arr))
return output
def rgb2hsv(image):
- output = array()
+ output = Array()
safe_call(clib.af_rgb2hsv(ct.pointer(output.arr), image.arr))
return output
def color_space(image, to_type, from_type):
- output = array()
+ output = Array()
safe_call(clib.af_color_space(ct.pointer(output.arr), image.arr, to_type, from_type))
return output
diff --git a/arrayfire/index.py b/arrayfire/index.py
index 102be8e..bbf10fe 100644
--- a/arrayfire/index.py
+++ b/arrayfire/index.py
@@ -94,7 +94,7 @@ class index(ct.Structure):
self.isBatch = False
self.isSeq = True
- if isinstance(idx, base_array):
+ if isinstance(idx, BaseArray):
self.idx.arr = idx.arr
self.isSeq = False
elif isinstance(idx, parallel_range):
@@ -136,7 +136,7 @@ def get_assign_dims(key, idims):
elif isinstance(key, parallel_range):
dims[0] = slice_to_length(key.S, idims[0])
return dims
- elif isinstance(key, base_array):
+ elif isinstance(key, BaseArray):
dims[0] = key.elements()
return dims
elif isinstance(key, tuple):
@@ -148,7 +148,7 @@ def get_assign_dims(key, idims):
for n in range(n_inds):
if (is_number(key[n])):
dims[n] = 1
- elif (isinstance(key[n], base_array)):
+ elif (isinstance(key[n], BaseArray)):
dims[n] = key[n].elements()
elif (isinstance(key[n], slice)):
dims[n] = slice_to_length(key[n], idims[n])
diff --git a/arrayfire/lapack.py b/arrayfire/lapack.py
index 7300edb..6540fc4 100644
--- a/arrayfire/lapack.py
+++ b/arrayfire/lapack.py
@@ -11,32 +11,32 @@ from .library import *
from .array import *
def lu(A):
- L = array()
- U = array()
- P = array()
+ L = Array()
+ U = Array()
+ P = Array()
safe_call(clib.af_lu(ct.pointer(L.arr), ct.pointer(U.arr), ct.pointer(P.arr), A.arr))
return L,U,P
def lu_inplace(A, pivot="lapack"):
- P = array()
+ P = Array()
is_pivot_lapack = False if (pivot == "full") else True
safe_call(clib.af_lu_inplace(ct.pointer(P.arr), A.arr, is_pivot_lapack))
return P
def qr(A):
- Q = array()
- R = array()
- T = array()
+ Q = Array()
+ R = Array()
+ T = Array()
safe_call(clib.af_lu(ct.pointer(Q.arr), ct.pointer(R.arr), ct.pointer(T.arr), A.arr))
return Q,R,T
def qr_inplace(A):
- T = array()
+ T = Array()
safe_call(clib.af_qr_inplace(ct.pointer(T.arr), A.arr))
return T
def cholesky(A, is_upper=True):
- R = array()
+ R = Array()
info = ct.c_int(0)
safe_call(clib.af_cholesky(ct.pointer(R.arr), ct.pointer(info), A.arr, is_upper))
return R, info.value
@@ -47,17 +47,17 @@ def cholesky_inplace(A, is_upper=True):
return info.value
def solve(A, B, options=AF_MAT_NONE):
- X = array()
+ X = Array()
safe_call(clib.af_solve(ct.pointer(X.arr), A.arr, B.arr, options))
return X
def solve_lu(A, P, B, options=AF_MAT_NONE):
- X = array()
+ X = Array()
safe_call(clib.af_solve_lu(ct.pointer(X.arr), A.arr, P.arr, B.arr, options))
return X
def inverse(A, options=AF_MAT_NONE):
- I = array()
+ I = Array()
safe_call(clib.af_inverse(ct.pointer(I.arr), A.arr, options))
return I
diff --git a/arrayfire/signal.py b/arrayfire/signal.py
index fd0d50e..da68c68 100644
--- a/arrayfire/signal.py
+++ b/arrayfire/signal.py
@@ -11,13 +11,13 @@ from .library import *
from .array import *
def approx1(signal, pos0, method=AF_INTERP_LINEAR, off_grid=0.0):
- output = array()
+ output = Array()
safe_call(clib.af_approx1(ct.pointer(output.arr), signal.arr, pos0.arr,\
method, ct.c_double(off_grid)))
return output
def approx2(signal, pos0, pos1, method=AF_INTERP_LINEAR, off_grid=0.0):
- output = array()
+ output = Array()
safe_call(clib.af_approx2(ct.pointer(output.arr), signal.arr, \
pos0.arr, pos1.arr, method, ct.c_double(off_grid)))
return output
@@ -30,7 +30,7 @@ def fft(signal, dim0 = None , scale = None):
if scale is None:
scale = 1.0
- output = array()
+ output = Array()
safe_call(clib.af_fft(ct.pointer(output.arr), signal.arr, ct.c_double(scale), ct.c_longlong(dim0)))
return output
@@ -45,7 +45,7 @@ def fft2(signal, dim0 = None, dim1 = None , scale = None):
if scale is None:
scale = 1.0
- output = array()
+ output = Array()
safe_call(clib.af_fft2(ct.pointer(output.arr), signal.arr, ct.c_double(scale),\
ct.c_longlong(dim0), ct.c_longlong(dim1)))
return output
@@ -64,7 +64,7 @@ def fft3(signal, dim0 = None, dim1 = None , dim2 = None, scale = None):
if scale is None:
scale = 1.0
- output = array()
+ output = Array()
safe_call(clib.af_fft3(ct.pointer(output.arr), signal.arr, ct.c_double(scale),\
ct.c_longlong(dim0), ct.c_longlong(dim1), ct.c_longlong(dim2)))
return output
@@ -77,7 +77,7 @@ def ifft(signal, dim0 = None , scale = None):
if scale is None:
scale = 1.0/float(dim0)
- output = array()
+ output = Array()
safe_call(clib.af_ifft(ct.pointer(output.arr), signal.arr, ct.c_double(scale), ct.c_longlong(dim0)))
return output
@@ -97,7 +97,7 @@ def ifft2(signal, dim0 = None, dim1 = None , scale = None):
if scale is None:
scale = 1.0/float(dim0 * dim1)
- output = array()
+ output = Array()
safe_call(clib.af_ifft2(ct.pointer(output.arr), signal.arr, ct.c_double(scale),\
ct.c_longlong(dim0), ct.c_longlong(dim1)))
return output
@@ -121,7 +121,7 @@ def ifft3(signal, dim0 = None, dim1 = None , dim2 = None, scale = None):
if scale is None:
scale = 1.0 / float(dim0 * dim1 * dim2)
- output = array()
+ output = Array()
safe_call(clib.af_ifft3(ct.pointer(output.arr), signal.arr, ct.c_double(scale),\
ct.c_longlong(dim0), ct.c_longlong(dim1), ct.c_longlong(dim2)))
return output
@@ -155,17 +155,17 @@ def idft(signal, scale = None, odims=(None, None, None, None)):
return ifft3(signal, scale, dims[0], dims[1], dims[2])
def convolve1(signal, kernel, conv_mode = AF_CONV_DEFAULT, conv_domain = AF_CONV_AUTO):
- output = array()
+ output = Array()
safe_call(clib.af_convolve1(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode, conv_domain))
return output
def convolve2(signal, kernel, conv_mode = AF_CONV_DEFAULT, conv_domain = AF_CONV_AUTO):
- output = array()
+ output = Array()
safe_call(clib.af_convolve2(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode, conv_domain))
return output
def convolve3(signal, kernel, conv_mode = AF_CONV_DEFAULT, conv_domain = AF_CONV_AUTO):
- output = array()
+ output = Array()
safe_call(clib.af_convolve3(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode, conv_domain))
return output
@@ -181,17 +181,17 @@ def convolve(signal, kernel, conv_mode = AF_CONV_DEFAULT, conv_domain = AF_CONV_
return convolve3(signal, kernel, conv_mode, conv_domain)
def fft_convolve1(signal, kernel, conv_mode = AF_CONV_DEFAULT):
- output = array()
+ output = Array()
safe_call(clib.af_fft_convolve1(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode))
return output
def fft_convolve2(signal, kernel, conv_mode = AF_CONV_DEFAULT):
- output = array()
+ output = Array()
safe_call(clib.af_fft_convolve2(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode))
return output
def fft_convolve3(signal, kernel, conv_mode = AF_CONV_DEFAULT):
- output = array()
+ output = Array()
safe_call(clib.af_fft_convolve3(ct.pointer(output.arr), signal.arr, kernel.arr, conv_mode))
return output
@@ -207,11 +207,11 @@ def fft_convolve(signal, kernel, conv_mode = AF_CONV_DEFAULT):
return fft_convolve3(signal, kernel, conv_mode)
def fir(B, X):
- Y = array()
+ Y = Array()
safe_call(clib.af_fir(ct.pointer(Y.arr), B.arr, X.arr))
return Y
def iir(B, A, X):
- Y = array()
+ Y = Array()
safe_call(clib.af_iir(ct.pointer(Y.arr), B.arr, A.arr, X.arr))
return Y
diff --git a/arrayfire/statistics.py b/arrayfire/statistics.py
index e3dd0f7..30aedda 100644
--- a/arrayfire/statistics.py
+++ b/arrayfire/statistics.py
@@ -12,7 +12,7 @@ from .array import *
def mean(a, weights=None, dim=None):
if dim is not None:
- out = array()
+ out = Array()
if weights is None:
safe_call(clib.af_mean(ct.pointer(out.arr), a.arr, ct.c_int(dim)))
@@ -36,7 +36,7 @@ def mean(a, weights=None, dim=None):
def var(a, isbiased=False, weights=None, dim=None):
if dim is not None:
- out = array()
+ out = Array()
if weights is None:
safe_call(clib.af_var(ct.pointer(out.arr), a.arr, isbiased, ct.c_int(dim)))
@@ -60,7 +60,7 @@ def var(a, isbiased=False, weights=None, dim=None):
def stdev(a, dim=None):
if dim is not None:
- out = array()
+ out = Array()
safe_call(clib.af_stdev(ct.pointer(out.arr), a.arr, ct.c_int(dim)))
return out
else:
@@ -73,7 +73,7 @@ def stdev(a, dim=None):
def cov(a, isbiased=False, dim=None):
if dim is not None:
- out = array()
+ out = Array()
safe_call(clib.af_cov(ct.pointer(out.arr), a.arr, isbiased, ct.c_int(dim)))
return out
else:
@@ -86,7 +86,7 @@ def cov(a, isbiased=False, dim=None):
def median(a, dim=None):
if dim is not None:
- out = array()
+ out = Array()
safe_call(clib.af_median(ct.pointer(out.arr), a.arr, ct.c_int(dim)))
return out
else:
diff --git a/arrayfire/vision.py b/arrayfire/vision.py
index 80bc4bc..3ab9af5 100644
--- a/arrayfire/vision.py
+++ b/arrayfire/vision.py
@@ -19,21 +19,21 @@ def fast(image, threshold=20.0, arc_length=9, non_max=True, feature_ratio=0.05,
def orb(image, threshold=20.0, max_features=400, scale = 1.5, num_levels = 4, blur_image = False):
feat = features()
- desc = array()
+ desc = Array()
safe_call(clib.af_orb(ct.pointer(feat.feat), ct.pointer(desc.arr),\
ct.c_float(threshold), ct.c_uint(max_features),\
ct.c_float(scale), ct.c_uint(num_levels), blur_image))
return feat, desc
def hamming_matcher(query, database, dim = 0, num_nearest = 1):
- index = array()
- dist = array()
+ index = Array()
+ dist = Array()
safe_call(clib.af_hamming_matcher(ct.pointer(idx.arr), ct.pointer(dist.arr),\
query.arr, database.arr, \
ct.c_longlong(dim), ct.c_longlong(num_nearest)))
return index, dist
def match_template(image, template, match_type = AF_SAD):
- out = array()
+ out = Array()
safe_call(clib.af_match_template(ct.pointer(out.arr), image.arr, template.arr, match_type))
return out
diff --git a/tests/simple_array.py b/tests/simple_array.py
index 8f4f0f3..0360971 100755
--- a/tests/simple_array.py
+++ b/tests/simple_array.py
@@ -11,7 +11,7 @@
import arrayfire as af
import array as host
-a = af.array([1, 2, 3])
+a = af.Array([1, 2, 3])
af.display(a)
print(a.elements(), a.type(), a.dims(), a.numdims())
print(a.is_empty(), a.is_scalar(), a.is_column(), a.is_row())
@@ -19,14 +19,14 @@ print(a.is_complex(), a.is_real(), a.is_double(), a.is_single())
print(a.is_real_floating(), a.is_floating(), a.is_integer(), a.is_bool())
-a = af.array(host.array('i', [4, 5, 6]))
+a = af.Array(host.array('i', [4, 5, 6]))
af.display(a)
print(a.elements(), a.type(), a.dims(), a.numdims())
print(a.is_empty(), a.is_scalar(), a.is_column(), a.is_row())
print(a.is_complex(), a.is_real(), a.is_double(), a.is_single())
print(a.is_real_floating(), a.is_floating(), a.is_integer(), a.is_bool())
-a = af.array(host.array('l', [7, 8, 9] * 3), (3,3))
+a = af.Array(host.array('l', [7, 8, 9] * 3), (3,3))
af.display(a)
print(a.elements(), a.type(), a.dims(), a.numdims())
print(a.is_empty(), a.is_scalar(), a.is_column(), a.is_row())
diff --git a/tests/simple_index.py b/tests/simple_index.py
index 1ab9a66..012403e 100755
--- a/tests/simple_index.py
+++ b/tests/simple_index.py
@@ -13,7 +13,7 @@ import array as host
a = af.randu(5, 5)
af.display(a)
-b = af.array(a)
+b = af.Array(a)
af.display(b)
c = a.copy()
@@ -27,7 +27,7 @@ af.display(a[-2:-1,-1])
af.display(a[0:5])
af.display(a[0:5:2])
-idx = af.array(host.array('i', [0, 3, 2]))
+idx = af.Array(host.array('i', [0, 3, 2]))
af.display(idx)
aa = a[idx]
af.display(aa)
--
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