Skip to content
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

Jump to bottom

Final fix for Slice.h and getitem, which now works just like numpy #103

Merged
merged 2 commits into from
Nov 10, 2019
Merged

Final fix for Slice.h and getitem, which now works just like numpy #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee00045
fixed Slicing with negative steps
gunjannandy Nov 10, 2019
674fe50
Added testing in basic.py
gunjannandy Nov 10, 2019
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
131 changes: 75 additions & 56 deletions deepC/sliceTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
import dnnc as dc
import numpy as np

t_np = np.array([[0,1,2],[3,4,5],[6,7,8],[9,10,11]])
t_dc = dc.array([[0,1,2],[3,4,5],[6,7,8],[9,10,11]])
t_np = np.array([[12,1,2],[3,4,5],[6,7,8],[9,10,11]])
t_dc = dc.array([[12,1,2],[3,4,5],[6,7,8],[9,10,11]])

# start = dc.array([1,1]).asTypeULong()
# stop = dc.array([2,2]).asTypeULong()
# axis = dc.array([0,1]).asTypeInt()
# step = dc.array([1,1]).asTypeULong()
start = dc.array([1,1]).asTypeInt()
stop = dc.array([-1,-1]).asTypeInt()
axis = dc.array([0,1]).asTypeInt()
step = dc.array([-1,-1]).asTypeInt()

result = ""

def run(function):
print("\n>>>", function)
Expand All @@ -21,61 +20,81 @@ def run(function):
print("Took %.8s" % elapsed_time, "secs\n")
return

def main():

run("print(t_np)")
# run("print(t_dc)")

# run("print(t_np[2])")
# run("print(t_dc[2])")

# run("print(t_np[2,1])")
# run("print(t_dc[2,1])")

# run("print(t_np[2:3,:])")
# run("print(t_dc[2:3,:])")

# run("print(t_np[2])")
# run("print(t_dc[2])")

# run("print(t_np[2,:])")
# run("print(t_dc[2,:])")

# run("print(t_np[2:3,1:2])")
# run("print(t_dc[2:3,1:2])")

# run("print(t_np[1,::2])")
# run("print(t_dc[1,::2])")

# run("print(t_np[1:2:1,1:2])")
# run("print(t_dc[1:2:1,1:2])")

# run("print(t_np[...])")
# run("print(t_dc[...])")

# run("print(t_np[2:3,...])")
# run("print(t_dc[2:3,...])")

# run("print(t_np[...,2:3:3])")
# run("print(t_dc[...,2:3:3])")

# run("print(t_np[:,1])")
# run("print(t_dc[:,1])")

# run("print(t_np[...,1])")
# run("print(t_dc[...,1])")

def tested():

run("print(t_np[2])")
run("print(t_dc[2])")

run("print(t_np[2,1])")
run("print(t_dc[2,1])")

run("print(t_np[2:3,:])")
run("print(t_dc[2:3,:])")

run("print(t_np[2])")
run("print(t_dc[2])")

run("print(t_np[2,:])")
run("print(t_dc[2,:])")

run("print(t_np[2:3,1:2])")
run("print(t_dc[2:3,1:2])")

run("print(t_np[1,::2])")
run("print(t_dc[1,::2])")

run("print(t_np[1:2:1,1:2])")
run("print(t_dc[1:2:1,1:2])")

run("print(t_np[...])")
run("print(t_dc[...])")

run("print(t_np[2:3,...])")
run("print(t_dc[2:3,...])")

run("print(t_np[...,2:3:3])")
run("print(t_dc[...,2:3:3])")

run("print(t_np[:,1])")
run("print(t_dc[:,1])")

run("print(t_np[...,1])")
run("print(t_dc[...,1])")

run("print(t_np[-2])")
run("print(t_dc[-2])")

run("print(t_np[-1:,-2:])")
run("print(t_dc[-1:,-2:])")

run("print(t_np[::-2,::-1])")
run("print(t_dc[::-2,::-1])")

run("print(t_np[1::-1,1::-1])")
run("print(dc.slice(t_dc, start, stop, axis, step))")

run("print(t_np[2::-1,2::-1])")
run("print(t_dc[2::-1,2::-1])")

run("print(t_np[::-2,1::-1])")
run("print(t_dc[::-2,1::-1])")

return


def testing():

run("print(t_np[...,3:-1:-1])")
run("print(t_dc[...,3:-1:-1])")

return


def main():

run("print(t_np)")

tested()

testing()

# run("print(dc.slice(t_dc, start, stop, axis, step))")


if __name__ == "__main__":
Expand Down
83 changes: 48 additions & 35 deletions deepC/tensor.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ extern std::vector<size_t> listTupleToVector_SizeT(PyObject *);
/* Binary Left Shift */
%pyinplaceoper(__lshift__, dnnc::tensor::__lshift__, binaryfunc, nb_lshift);
dnnc::tensor<int> __lshift__(dnnc::tensor<int>& other) {
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
std::string direction = "LEFT";
dnnc::BitShift<int> op("pythonOp", direction);
return op.compute(other_int, other);
Expand All @@ -132,7 +132,7 @@ extern std::vector<size_t> listTupleToVector_SizeT(PyObject *);
/* Assignment Left Shift */
%pyinplaceoper(__ilshift__, dnnc::tensor::__ilshift__, binaryfunc, nb_inplace_lshift);
dnnc::tensor<int> __ilshift__(dnnc::tensor<int>& other) {
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
std::string direction = "LEFT";
dnnc::BitShift<int> op("pythonOp", direction);
return op.compute(other_int, other);
Expand All @@ -151,13 +151,13 @@ extern std::vector<size_t> listTupleToVector_SizeT(PyObject *);
/* Binary Right Shift */
%pyinplaceoper(__rshift__, dnnc::tensor::__rshift__, binaryfunc, nb_rshift);
dnnc::tensor<int> __rshift__(dnnc::tensor<int>& other) {
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
std::string direction = "RIGHT";
dnnc::BitShift<int> op("pythonOp", direction);
return op.compute(other_int, other);
}
dnnc::tensor<int> __rshift__(int scalar) {
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other(std::vector<size_t>(1,1));
other.load(&scalar);
std::string direction = "RIGHT";
Expand All @@ -169,7 +169,7 @@ extern std::vector<size_t> listTupleToVector_SizeT(PyObject *);
/* Assignment Right Shift */
%pyinplaceoper(__irshift__, dnnc::tensor::__irshift__, binaryfunc, nb_inplace_rshift);
dnnc::tensor<int> __irshift__(dnnc::tensor<int>& other) {
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
dnnc::tensor<int> other_int = (*$self).copy().asTypeInt();
std::string direction = "RIGHT";
dnnc::BitShift<int> op("pythonOp", direction);
return op.compute(other_int, other);
Expand All @@ -196,7 +196,7 @@ def __getitem__(self, index):
start = item
if (start < 0):
start += self.shape()[axis]
stop = item+1
stop = start+1
step = 1
if(start >= self.shape()[axis]):
errorMsg = "index value " + str(start) + " along axis " + str(axis) + " is beyond the size " + str(self.shape()[axis]) + " of input tensor along that axis"
Expand All @@ -216,8 +216,8 @@ def __getitem__(self, index):
raise TypeError(errorMsg)
flag = 1
elif step < 0:
start = self.shape()[axis]
stop = 0
start = self.shape()[axis] -1
stop = -1
elif str(type(item.step)).split("'")[1] == "NoneType":
pass
else:
Expand All @@ -244,22 +244,22 @@ def __getitem__(self, index):
errorMsg = "stop of " + str(type(item.stop)) + " not supported!"
raise TypeError(errorMsg)
flag = 1
if(start > self.shape()[axis]):
errorMsg = "index value " + str(start) + " along axis " + str(axis) + " is beyond the size " + str(self.shape()[axis]) + " of input tensor along that axis"
raise IndexError(errorMsg)
flag = 1
if(stop > self.shape()[axis]):
errorMsg = "index value " + str(stop) + " along axis " + str(axis) + " is beyond the size " + str(self.shape()[axis]) + " of input tensor along that axis"
raise IndexError(errorMsg)
flag = 1
if (step < 0) and not (start > stop):
errorMsg = "stop index " + str(stop) + " along axis " + str(axis) + " is greater than start index " + str(start) + " while step is negative"
raise IndexError(errorMsg)
flag = 1
elif (step > 0) and not (start < stop):
errorMsg = "stop index " + str(stop) + " along axis " + str(axis) + " is smaller than start index " + str(start) + " while step is positive"
raise IndexError(errorMsg)
flag = 1
# if(start > self.shape()[axis]):
# errorMsg = "index value " + str(start) + " along axis " + str(axis) + " is beyond the size " + str(self.shape()[axis]) + " of input tensor along that axis"
# raise IndexError(errorMsg)
# flag = 1
# if(stop > self.shape()[axis]):
# errorMsg = "index value " + str(stop) + " along axis " + str(axis) + " is beyond the size " + str(self.shape()[axis]) + " of input tensor along that axis"
# raise IndexError(errorMsg)
# flag = 1
# if (step < 0) and not (start > stop):
# errorMsg = "stop index " + str(stop) + " along axis " + str(axis) + " is greater than start index " + str(start) + " while step is negative"
# raise IndexError(errorMsg)
# flag = 1
# elif (step > 0) and not (start < stop):
# errorMsg = "stop index " + str(stop) + " along axis " + str(axis) + " is smaller than start index " + str(start) + " while step is positive"
# raise IndexError(errorMsg)
# flag = 1

return start, stop, step, flag

Expand Down Expand Up @@ -393,7 +393,7 @@ def __getitem__(self, index):
# print("test stop list : ", stop_list)
# print("test axis list : ", axis_list)
# print("test step list : ", step_list)

result = slice(self, start_list, stop_list, axis_list, step_list)

if 0 in reshape_list:
Expand All @@ -410,14 +410,6 @@ def __getitem__(self, index):
return intTensor()



def __iter__(self):
axis = 0
while (axis < self.shape()[0]):
yield self[axis]
axis += 1


def __add__(self, other):
return add(self, other)

Expand Down Expand Up @@ -694,26 +686,47 @@ def numpy(self) :
convert tensor to numpy array.
"""
import numpy as np
return np.array(self.data()).reshape(self.shape())
return np.array(self.data()).reshape(self.shape())

def len(self):
"""
return length of tensor.
"""
return self.length()

def __iter__(self):
"""
iterates over the tensor.
"""
axis = 0
while (axis < self.shape()[0]):
yield self[axis]
axis += 1

def __int__(self):
"""
convert tensor to int tensor.
"""
if (self.len() > 1):
raise TypeError("only length-1 tensor can be converted to Python scalars")
elif(self.len() == 0):
return
return self.asTypeInt()

def __float__(self):
"""
convert tensor to float tensor.
"""
if (self.len() > 1):
raise TypeError("only length-1 tensor can be converted to Python scalars")
elif(self.len() == 0):
return
return self.asTypeFloat()

def __bool__(self):
"""
convert tensor to bool tensor.
"""
if (self.len() > 1):
raise ValueError("The truth value of an array with more than one element is ambiguous. Use dc.any() or dc.all()")
elif(self.len() == 0):
Expand All @@ -733,7 +746,7 @@ def reshape(self, *args):
new_shape.append(arg)
else:
return $action (self, vectorSizeT(arg))

if len(new_shape):
return $action (self, vectorSizeT(new_shape))

Expand Down
Loading