Skip to content

Speed up bound checking in take #281

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

Merged
nevi-me merged 6 commits into from
May 11, 2021
Merged

Speed up bound checking in take #281

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
d993020
WIP improve take performance
Dandandan May 10, 2021
42643e9
WIP
Dandandan May 10, 2021
c3b34ff
Bound checking speed
Dandandan May 10, 2021
30c6dc9
Simplify
Dandandan May 10, 2021
6e54d39
fmt
Dandandan May 10, 2021
8d68cac
Improve formatting
Dandandan May 10, 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
19 changes: 18 additions & 1 deletion arrow/benches/take_kernels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use rand::Rng;

extern crate arrow;

use arrow::compute::take;
use arrow::compute::{take, TakeOptions};
use arrow::datatypes::*;
use arrow::util::test_util::seedable_rng;
use arrow::{array::*, util::bench_util::*};
Expand All @@ -46,6 +46,12 @@ fn bench_take(values: &dyn Array, indices: &UInt32Array) {
criterion::black_box(take(values, &indices, None).unwrap());
}

fn bench_take_bounds_check(values: &dyn Array, indices: &UInt32Array) {
criterion::black_box(
take(values, &indices, Some(TakeOptions { check_bounds: true })).unwrap(),
);
}

fn add_benchmark(c: &mut Criterion) {
let values = create_primitive_array::<Int32Type>(512, 0.0);
let indices = create_random_index(512, 0.0);
Expand All @@ -56,6 +62,17 @@ fn add_benchmark(c: &mut Criterion) {
b.iter(|| bench_take(&values, &indices))
});

let values = create_primitive_array::<Int32Type>(512, 0.0);
let indices = create_random_index(512, 0.0);
c.bench_function("take check bounds i32 512", |b| {
b.iter(|| bench_take_bounds_check(&values, &indices))
});
let values = create_primitive_array::<Int32Type>(1024, 0.0);
let indices = create_random_index(1024, 0.0);
c.bench_function("take check bounds i32 1024", |b| {
b.iter(|| bench_take_bounds_check(&values, &indices))
});

let indices = create_random_index(512, 0.5);
c.bench_function("take i32 nulls 512", |b| {
b.iter(|| bench_take(&values, &indices))
Expand Down
25 changes: 19 additions & 6 deletions arrow/src/compute/kernels/take.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,30 @@ where
let options = options.unwrap_or_default();
if options.check_bounds {
let len = values.len();
for i in 0..indices.len() {
if indices.is_valid(i) {
let ix = ToPrimitive::to_usize(&indices.value(i)).ok_or_else(|| {
if indices.null_count() > 0 {
indices.iter().flatten().try_for_each(|index| {
let ix = ToPrimitive::to_usize(&index).ok_or_else(|| {
ArrowError::ComputeError("Cast to usize failed".to_string())
})?;
if ix >= len {
return Err(ArrowError::ComputeError(
format!("Array index out of bounds, cannot get item at index {} from {} entries", ix, len))
);
format!("Array index out of bounds, cannot get item at index {} from {} entries", ix, len))
);
}
}
Ok(())
})?;
} else {
indices.values().iter().try_for_each(|index| {
let ix = ToPrimitive::to_usize(index).ok_or_else(|| {
ArrowError::ComputeError("Cast to usize failed".to_string())
})?;
if ix >= len {
return Err(ArrowError::ComputeError(
format!("Array index out of bounds, cannot get item at index {} from {} entries", ix, len))
);
}
Ok(())
})?
}
}
match values.data_type() {
Expand Down