Skip to content

Added support of AFArray indexing #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support of AFArray indexing #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions arrayfire_wrapper/lib/create_and_modify_array/assignment_and_indexing/_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from typing import Any

from arrayfire_wrapper.lib._broadcast import bcast_var
from arrayfire_wrapper.lib.create_and_modify_array.manage_array import release_array

from arrayfire_wrapper.lib.create_and_modify_array.manage_array import release_array, retain_array
from arrayfire_wrapper.defines import AFArray

class _IndexSequence(ctypes.Structure):
"""
Expand Down Expand Up @@ -186,7 +186,7 @@ class IndexStructure(ctypes.Structure):
-----------

idx: key
- If of type af.Array, self.idx.arr = idx, self.isSeq = False
- If of type AFArray, self.idx.arr = idx, self.isSeq = False
- If of type af.ParallelRange, self.idx.seq = idx, self.isBatch = True
- Default:, self.idx.seq = af._IndexSequence(idx)

Expand All @@ -197,26 +197,21 @@ class IndexStructure(ctypes.Structure):

"""

def __init__(self, idx: Any) -> None:
def __init__(self, idx: int | slice | AFArray) -> None:
self.idx = _IndexUnion()
self.isBatch = False
self.isSeq = True

# BUG cyclic reimport
# if isinstance(idx, Array):
# if idx.dtype == af_bool:
# self.idx.arr = everything.where(idx.arr)
# else:
# self.idx.arr = everything.retain_array(idx.arr)

# self.isSeq = False

if isinstance(idx, ParallelRange):
if isinstance(idx, int) or isinstance(idx, slice):
self.idx.seq = _IndexSequence(idx)
elif isinstance(idx, ParallelRange):
self.idx.seq = idx
self.isBatch = True

elif isinstance(idx, AFArray):
self.idx.arr = retain_array(idx)
self.isSeq = False
else:
self.idx.seq = _IndexSequence(idx)
raise IndexError("Invalid type while indexing arrayfire.array")

def __del__(self) -> None:
if not self.isSeq:
Expand Down Expand Up @@ -247,7 +242,7 @@ def __setitem__(self, idx: int, value: IndexStructure) -> None:
self.idxs[idx] = value


def get_indices(key: int | slice | tuple[int | slice, ...]) -> CIndexStructure: # BUG
def get_indices(key: int | slice | tuple[int | slice | AFArray, ...] | AFArray) -> CIndexStructure: # BUG
indices = CIndexStructure()

if isinstance(key, tuple):
Expand Down
Loading