Skip to content

GH-55443: [PYTHON] Numpy nat bitmap perf #55444

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

Open
jules-ch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-55443: [PYTHON] Numpy nat bitmap perf #55444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@ inline int64_t ValuesToBitmap(PyArrayObject* arr, uint8_t* bitmap) {
typedef internal::npy_traits<TYPE> traits;
typedef typename traits::value_type T;

int64_t null_count = 0;

Ndarray1DIndexer<T> values(arr);
for (int i = 0; i < values.size(); ++i) {
if (traits::isnull(values[i])) {
++null_count;
} else {
bit_util::SetBit(bitmap, i);
}
}

const int64_t n = values.size();
int64_t null_count = 0;
for (int64_t i = 0; i < n; ++i) null_count += traits::isnull(values[i]);
if (null_count == 0) {
bit_util::SetBitsTo(bitmap, 0, n, true);
return 0;
}
// Set the validity bitmap for each valid element
int64_t k = 0;
GenerateBitsUnrolled(bitmap, 0, n, [&] { return !traits::isnull(values[k++]); });
return null_count;
}

Expand Down Expand Up @@ -162,14 +162,14 @@ int64_t MaskToBitmap(PyArrayObject* mask, int64_t length, uint8_t* bitmap) {
if (!PyArray_Check(mask)) return -1;

Ndarray1DIndexer<uint8_t> mask_values(mask);
for (int i = 0; i < length; ++i) {
if (mask_values[i]) {
++null_count;
bit_util::ClearBit(bitmap, i);
} else {
bit_util::SetBit(bitmap, i);
}
}
for (int64_t i = 0; i < length; ++i) null_count += mask_values[i] != 0;
if (null_count == 0) {
bit_util::SetBitsTo(bitmap, 0, length, true);
return 0;
}
// Set the validity bitmap for each valid element
int64_t k = 0;
GenerateBitsUnrolled(bitmap, 0, length, [&] { return mask_values[k++] == 0; });
return null_count;
}

Expand Down
Loading