Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "arrow/util/bitmap_ops.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/endian.h"
#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/string.h"
Expand Down Expand Up @@ -466,6 +467,31 @@ inline Status NumPyConverter::PrepareInputData(std::shared_ptr<Buffer>* data) {
*data = std::make_shared<NumPyBuffer>(reinterpret_cast<PyObject*>(arr_));
}

if (dtype_->type_num == NPY_DATETIME || dtype_->type_num == NPY_TIMEDELTA) {
auto metadata =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(dtype_));
const int64_t multiplier = metadata->meta.num;
if (multiplier != 1) {
ARROW_ASSIGN_OR_RAISE(auto scaled,
AllocateBuffer(sizeof(int64_t) * length_, pool_));
auto in_values = reinterpret_cast<const int64_t*>((*data)->data());
auto out_values = reinterpret_cast<int64_t*>(scaled->mutable_data());
for (int64_t i = 0; i < length_; ++i) {
if (null_bitmap_ && !bit_util::GetBit(null_bitmap_->data(), i)) {
out_values[i] = 0;
} else if (cast_options_.allow_time_overflow) {
out_values[i] =
static_cast<uint64_t>(in_values[i]) * static_cast<uint64_t>(multiplier);
} else if (::arrow::internal::MultiplyWithOverflow(in_values[i], multiplier,
&out_values[i])) {
return Status::Invalid("NumPy temporal value ", in_values[i],
" would overflow when scaling by ", multiplier);
}
}
*data = std::move(scaled);
}
}

return Status::OK();
}

Expand Down
57 changes: 57 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -2623,6 +2623,63 @@ def test_array_from_numpy_datetime(dtype, type):
assert arr.equals(expected)


@pytest.mark.numpy
@pytest.mark.parametrize(("dtype", "type"), [
("datetime64[D]", None),
("datetime64[D]", pa.date32()),
("datetime64[D]", pa.date64()),
("datetime64[s]", None),
("datetime64[ms]", None),
("datetime64[us]", None),
("datetime64[ns]", None),
("datetime64[s]", pa.timestamp("ms")),
("datetime64[ms]", pa.timestamp("s")),
("timedelta64[s]", None),
("timedelta64[ms]", None),
("timedelta64[us]", None),
("timedelta64[ns]", None),
("timedelta64[s]", pa.duration("ms")),
])
@pytest.mark.parametrize("stride", [1, 2, -1])
@pytest.mark.parametrize("masked", [False, True])
def test_array_from_numpy_temporal_unit_multiplier(
dtype: str, type: pa.DataType | None, stride: int, masked: bool
) -> None:
values = np.array([0, 100, -100, None, 12300],
dtype=dtype.replace("[", "[10"))[::stride]
values.setflags(write=False)
mask = np.isnat(values) | (values.view("int64") == 100) if masked else None
expected = pa.array(values.astype(dtype), type=type, mask=mask)

result = pa.array(values, type=type, mask=mask)

assert result.equals(expected)


@pytest.mark.numpy
@pytest.mark.parametrize("kind", ["datetime64", "timedelta64"])
@pytest.mark.parametrize("limit", ["min", "max"])
def test_array_from_numpy_temporal_unit_multiplier_overflow(
kind: str, limit: str
) -> None:
value: int = getattr(np.iinfo("int64"), limit) // 10 + (limit == "max")
values = np.array([value, None], dtype=f"{kind}[10s]")
with pytest.raises(pa.ArrowInvalid, match="overflow"):
pa.array(values)

wrapped_value: int = (value * 10 + 2**63) % 2**64 - 2**63
expected = pa.array([wrapped_value, None], type=pa.from_numpy_dtype(f"{kind}[s]"))
assert pa.array(values, safe=False).equals(expected)
assert pa.array(values, mask=np.array([True, True])).null_count == 2


@pytest.mark.numpy
@pytest.mark.parametrize("dtype", ["datetime64[10s]", "timedelta64[10s]"])
def test_array_from_numpy_temporal_unit_multiplier_empty(dtype: str) -> None:
result = pa.array(np.array([], dtype=dtype))
assert result.equals(pa.array([], type=pa.from_numpy_dtype(dtype)))


@pytest.mark.numpy
def test_array_from_different_numpy_datetime_units_raises():
data = [
Expand Down
Loading