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

[BugFix] Fix breaking behaviour in 0.18.0 #1801

Merged
merged 6 commits into from
Jul 15, 2022
Merged

[BugFix] Fix breaking behaviour in 0.18.0 #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
703b90c
Bug fix
KexinFeng Jul 15, 2022
3534b94
comment update
KexinFeng Jul 15, 2022
460440d
add Test of float index array
KexinFeng Jul 15, 2022
c24f9f0
comment
KexinFeng Jul 15, 2022
d2d34a2
dataType check
KexinFeng Jul 15, 2022
106e21e
format
KexinFeng Jul 15, 2022
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
6 changes: 3 additions & 3 deletions api/src/main/java/ai/djl/ndarray/index/NDIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import ai.djl.ndarray.index.dim.NDIndexPick;
import ai.djl.ndarray.index.dim.NDIndexSlice;
import ai.djl.ndarray.index.dim.NDIndexTake;
import ai.djl.ndarray.types.DataType;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -370,10 +369,11 @@ private int addIndexItem(String indexItem, int argIndex, Object[] args) {
return argIndex + 1;
} else if (arg instanceof NDArray) {
NDArray array = (NDArray) arg;
if (array.getDataType() == DataType.BOOLEAN) {
if (array.getDataType().isBoolean()) {
indices.add(new NDIndexBooleans(array));
return argIndex + 1;
} else if (array.getDataType().isInteger()) {
KexinFeng marked this conversation as resolved.
Show resolved Hide resolved
} else if (array.getDataType().isInteger()
|| array.getDataType().isFloating()) {
indices.add(new NDIndexTake(array));
return argIndex + 1;
}
Expand Down
9 changes: 9 additions & 0 deletions api/src/main/java/ai/djl/ndarray/types/DataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ public boolean isInteger() {
return format == Format.UINT || format == Format.INT;
}

/**
* Checks whether it is a boolean data type.
*
* @return whether it is a boolean data type
*/
public boolean isBoolean() {
return format == Format.BOOLEAN;
}

/**
* Returns the data type to use for a data buffer.
*
Expand Down
21 changes: 12 additions & 9 deletions integration/src/main/java/ai/djl/integration/tests/ndarray/NDIndexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void testPick() {
public void testGather() {
try (NDManager manager = NDManager.newBaseManager()) {
NDArray original = manager.arange(20f).reshape(-1, 4);
NDArray index = manager.create(new long[] {0, 0, 2, 1, 1, 2}, new Shape(3, 2));
NDArray index = manager.create(new float[] {0, 0, 2, 1, 1, 2}, new Shape(3, 2));
NDArray actual = original.gather(index, 1);
NDArray expected = manager.create(new float[] {0, 0, 6, 5, 9, 10}, new Shape(3, 2));
Assert.assertEquals(actual, expected);
Expand All @@ -68,7 +68,7 @@ public void testGather() {
public void testTake() {
try (NDManager manager = NDManager.newBaseManager()) {
NDArray original = manager.arange(1, 7f).reshape(-1, 3);
NDArray index = manager.create(new long[] {0, 4, 1, 2}, new Shape(2, 2));
NDArray index = manager.create(new float[] {0, 4, 1, 2}, new Shape(2, 2));
NDArray actual = original.take(index);
NDArray expected = manager.create(new float[] {1, 5, 2, 3}, new Shape(2, 2));
Assert.assertEquals(actual, expected);
Expand Down Expand Up @@ -119,25 +119,28 @@ public void testGet() {
expected = manager.arange(5).reshape(1, 5);
Assert.assertEquals(original.get(bool), expected);

// get from int array
// get from integer array (higher rank included) or float array
original = manager.arange(1, 7f).reshape(-1, 2);
NDArray index = manager.create(new long[] {0, 0, 1, 2}, new Shape(2, 2));
NDArray indexFloat = manager.create(new float[] {0, 0, 1, 2}, new Shape(2, 2));
NDArray actual = original.get(index);
NDArray actual2 = original.get(indexFloat);
expected = manager.create(new float[] {1, 2, 1, 2, 3, 4, 5, 6}, new Shape(2, 2, 2));
Assert.assertEquals(actual, expected);
Assert.assertEquals(actual2, expected);

// indexing with boolean, broadcast int array and slice
// indexing with boolean, slice, and integer array (higher rank included) or float array
original = manager.arange(3 * 3 * 3 * 3).reshape(3, 3, 3, 3);
NDArray bool1 = manager.create(new boolean[] {true, false, true});
NDArray index1 = manager.create(new long[] {2, 2}, new Shape(1, 2));
NDArray index2 = manager.create(new long[] {0, 1}, new Shape(1, 2));
NDArray index2 = manager.create(new float[] {0, 1}, new Shape(1, 2));
actual = original.get(":{}, {}, {}, {}", 2, index1, bool1, index2);
expected = manager.create(new int[] {18, 25, 45, 52}, new Shape(2, 1, 2));
Assert.assertEquals(actual, expected);

// indexing with null, broadcast int array and slice
// indexing with null, slice and integer array (higher rank included) or float array
original = manager.arange(3 * 3 * 3).reshape(3, 3, 3);
index1 = manager.create(new long[] {0, 1}, new Shape(2));
index1 = manager.create(new float[] {0, 1}, new Shape(2));
index2 = manager.create(new long[] {0, 0, 2, 1}, new Shape(2, 2));
actual = original.get(":{}, {}, {}, {}", 2, index1, index2, null);
expected = manager.create(new int[] {0, 3, 2, 4, 9, 12, 11, 13}, new Shape(2, 2, 2, 1));
Expand All @@ -160,7 +163,7 @@ public void testSetArray() {

// set by index array
original = manager.arange(1, 10).reshape(3, 3);
NDArray index = manager.create(new long[] {0, 1}, new Shape(2));
NDArray index = manager.create(new float[] {0, 1}, new Shape(2));
value = manager.create(new int[] {666, 777, 888, 999}, new Shape(2, 2));
original.set(new NDIndex("{}, :{}", index, 2), value);
expected =
Expand Down Expand Up @@ -258,7 +261,7 @@ public void testPut() {
try (NDManager manager = NDManager.newBaseManager()) {
NDArray original = manager.create(new float[] {1, 2, 3, 4}, new Shape(2, 2));
NDArray expected = manager.create(new float[] {1, 8, 666, 77}, new Shape(2, 2));
NDArray idx = manager.create(new long[] {2, 3, 1}, new Shape(3));
NDArray idx = manager.create(new float[] {2, 3, 1}, new Shape(3));
NDArray data = manager.create(new float[] {666, 77, 8}, new Shape(3));
Assert.assertEquals(original.put(idx, data), expected);
}
Expand Down