aparler/PyNorch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fix shape of reshape

Browse source
This commit is contained in:
lucasdelimanogueira 2024-05-03 13:34:43 -03:00
parent 8449575e70
commit 18c50dbeb8
4 changed files with 26 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
build/libtensor.so
View file

Binary file not shown.

BIN
build/tensor.o
View file

Binary file not shown.

21
norch/csrc/tensor.cpp
View file

@ -565,14 +565,25 @@ extern "C" {
exit(-1);
}
int ndim = new_ndim;
int* shape = (int*)malloc(ndim * sizeof(int));
if (shape == NULL) {
fprintf(stderr, "Memory allocation failed\n");
exit(1);
}
for (int i = 0; i < ndim; i++) {
shape[i] = new_shape[i];
}
// Calculate the total number of elements in the new shape
int new_size = 1;
int size = 1;
for (int i = 0; i < new_ndim; i++) {
new_size *= new_shape[i];
size *= shape[i];
}
// Check if the total number of elements matches the current tensor's size
if (new_size != tensor->size) {
if (size != tensor->size) {
fprintf(stderr, "Cannot reshape tensor. Total number of elements in new shape does not match the current size of the tensor.\n");
exit(1);
}
@ -582,7 +593,7 @@ extern "C" {
float* result_data;
cudaMalloc((void **)&result_data, tensor->size * sizeof(float));
assign_tensor_cuda(tensor, result_data);
return create_tensor(result_data, new_shape, new_ndim, device);
return create_tensor(result_data, shape, ndim, device);
}
else {
float* result_data = (float*)malloc(tensor->size * sizeof(float));
@ -591,7 +602,7 @@ extern "C" {
exit(1);
}
assign_tensor_cpu(tensor, result_data);
return create_tensor(result_data, new_shape, new_ndim, device);
return create_tensor(result_data, shape, ndim, device);
}
}

40
test.py
View file

@ -28,39 +28,19 @@ if __name__ == "__main__":
[[7.890, 8.901], [9.012, 1.234], [2.345, 3.456]]
], requires_grad=True)
b = norch.Tensor([[
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 1.91],
],[
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 1.91],
],[
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 1.91],
],[
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 1.91],
],[
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 5.91],
]])
b = norch.Tensor([
[1.234, 2.123, 1.5]])
[1.234, 2.123, 1.5],
[5.678, 6.789, 1.293],
[3.635, 4.456, 1.0202],
[7.890, 8.901, 1.91],
])
#b = norch.Tensor([
# [1.234, 2.123, 1.5]])
#print(a.shape)
b = a.reshape([2,3,5])
print(b.shape)
c = a.reshape([2,3,5])
print(b @ c)
#c = result.sum()
#c.backward()
#print(a.grad)