Skip to content

Commit 8567b96

Browse files
committed
BUGFFIX: in join for num inputs > 2
- Added relevant tests
1 parent 439e3c5 commit 8567b96

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

arrayfire/data.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,17 @@ def join(dim, first, second, third=None, fourth=None):
118118
if (third is None and fourth is None):
119119
safe_call(clib.af_join(ct.pointer(out.arr), dim, first.arr, second.arr))
120120
else:
121-
ct.c_array_vec = dim4(first, second, 0, 0)
121+
c_void_p_4 = ct.c_void_p * 4
122+
c_array_vec = c_void_p_4(first.arr, second.arr, 0, 0)
122123
num = 2
123124
if third is not None:
124-
ct.c_array_vec[num] = third.arr
125+
c_array_vec[num] = third.arr
125126
num+=1
126127
if fourth is not None:
127-
ct.c_array_vec[num] = fourth.arr
128+
c_array_vec[num] = fourth.arr
128129
num+=1
129130

130-
safe_call(clib.af_join_many(ct.pointer(out.arr), dim, num, ct.pointer(ct.c_array_vec)))
131+
safe_call(clib.af_join_many(ct.pointer(out.arr), dim, num, ct.pointer(c_array_vec)))
131132
return out
132133

133134

tests/simple_data.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@
4343
af.display(af.diag(b, extract = False))
4444
af.display(af.diag(c, 1, extract = False))
4545

46+
af.display(af.join(0, a, a))
47+
af.display(af.join(1, a, a, a))
48+
4649
af.display(af.tile(a, 2, 2))
4750

51+
4852
af.display(af.reorder(a, 1, 0))
4953

5054
af.display(af.shift(a, -1, 1))

0 commit comments

Comments
 (0)