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

Decimal32 Build Fix [skip ci] #7544

Merged
merged 22 commits into from
Mar 9, 2021
Merged

Decimal32 Build Fix [skip ci] #7544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ceeddd2
cast child columns for structs and lists
razajafri Feb 20, 2021
78e633a
don't copy column
razajafri Feb 21, 2021
895433c
replace cols in list and struct
razajafri Feb 22, 2021
160d06c
updated method names
razajafri Feb 27, 2021
c82534f
addressed review comments
razajafri Mar 1, 2021
2836e86
code cleanup
razajafri Mar 1, 2021
c8a35c6
reformatted code
razajafri Mar 1, 2021
4be9b22
addressed review comments
razajafri Mar 2, 2021
5e79b21
updated method doc
razajafri Mar 2, 2021
0518c6e
addressed review comments
razajafri Mar 3, 2021
1e17bdf
Update java/src/main/java/ai/rapids/cudf/ColumnView.java
razajafri Mar 3, 2021
84d463c
Update java/src/main/java/ai/rapids/cudf/ColumnView.java
razajafri Mar 3, 2021
beb05a4
Update java/src/main/native/src/ColumnViewJni.cpp
razajafri Mar 3, 2021
6ed07cb
fixed the return
razajafri Mar 3, 2021
6abc629
d32 changes
razajafri Mar 4, 2021
2555030
Merge remote-tracking branch 'upstream/branch-0.19' into decimal32
razajafri Mar 4, 2021
ffd6b69
Merge branch 'branch-0.19' into decimal32
razajafri Mar 4, 2021
2937b31
code cleanup
razajafri Mar 4, 2021
ee866b2
addressed review comments
razajafri Mar 7, 2021
b6306ff
Merge branch 'branch-0.19' into decimal32
razajafri Mar 9, 2021
b67060f
fix build
razajafri Mar 9, 2021
3adc86b
addressed review comments
razajafri Mar 9, 2021
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
8 changes: 6 additions & 2 deletions java/src/main/java/ai/rapids/cudf/ColumnView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,9 +1394,13 @@ public ColumnView replaceChildrenWithViews(int[] indices,
List<ColumnView> newChildren = new ArrayList<>(getNumChildren());
IntStream.range(0, getNumChildren()).forEach(i -> {
ColumnView view = map.remove(i);
ColumnView child = getChildColumnView(i);
if (view == null) {
newChildren.add(getChildColumnView(i));
newChildren.add(child);
} else {
if (child.getRowCount() != view.getRowCount()) {
throw new IllegalArgumentException("Child row count doesn't match the old child");
}
newChildren.add(view);
}
});
Expand Down Expand Up @@ -1431,7 +1435,7 @@ public ColumnView replaceChildrenWithViews(int[] indices,
*/
public ColumnView replaceListChild(ColumnView child) {
assert(type == DType.LIST);
return replaceChildrenWithViews(new int[]{1}, new ColumnView[]{child});
return replaceChildrenWithViews(new int[]{0}, new ColumnView[]{child});
}

/**
Expand Down
9 changes: 6 additions & 3 deletions java/src/test/java/ai/rapids/cudf/ColumnVectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4005,7 +4005,7 @@ void testReplaceLeafNodeInList() {

@Test
void testReplaceLeafNodeInListWithIllegal() {
assertThrows(IllegalArgumentException.class, () -> {
Exception e = assertThrows(IllegalArgumentException.class, () -> {
try (ColumnVector child1 =
ColumnVector.decimalFromDoubles(DType.create(DType.DTypeEnum.DECIMAL64, 3),
RoundingMode.HALF_UP, 770.892, 961.110);
Expand All @@ -4023,6 +4023,7 @@ void testReplaceLeafNodeInListWithIllegal() {
ColumnView replacedView = created.replaceListChild(newChild)) {
}
});
assertTrue(e.getMessage().contains("Child row count doesn't match the old child"));
}

@Test
Expand All @@ -4049,7 +4050,7 @@ void testReplaceColumnInStruct() {

@Test
void testReplaceIllegalIndexColumnInStruct() {
assertThrows(IllegalArgumentException.class, () -> {
Exception e = assertThrows(IllegalArgumentException.class, () -> {
try (ColumnVector child1 = ColumnVector.fromInts(1, 4);
ColumnVector child2 = ColumnVector.fromInts(2, 5);
ColumnVector child3 = ColumnVector.fromInts(3, 6);
Expand All @@ -4059,11 +4060,12 @@ void testReplaceIllegalIndexColumnInStruct() {
new ColumnVector[]{replaceWith})) {
}
});
assertTrue(e.getMessage().contains("One or more invalid child indices passed to be replaced"));
}

@Test
void testReplaceSameIndexColumnInStruct() {
assertThrows(IllegalArgumentException.class, () -> {
Exception e = assertThrows(IllegalArgumentException.class, () -> {
try (ColumnVector child1 = ColumnVector.fromInts(1, 4);
ColumnVector child2 = ColumnVector.fromInts(2, 5);
ColumnVector child3 = ColumnVector.fromInts(3, 6);
Expand All @@ -4073,5 +4075,6 @@ void testReplaceSameIndexColumnInStruct() {
new ColumnVector[]{replaceWith, replaceWith})) {
}
});
assertTrue(e.getMessage().contains("Duplicate mapping found for replacing child index"));
}
}