blob: aa381d243d888aa54a349333f1f59a77552a353b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
https://bugs.gentoo.org/910739
https://github.com/numpy/numpy/issues/24239
https://github.com/numpy/numpy/pull/24240
https://github.com/numpy/numpy/commit/d9c0c96582373de0990908c89ed75ae16279e8e5
From d9c0c96582373de0990908c89ed75ae16279e8e5 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 23 Jul 2023 21:31:08 +0100
Subject: [PATCH] BUG: Fix C types in scalartypes
https://github.com/numpy/numpy/pull/23746 introduced a fast path for scalar
int conversions, but the map between Python types and C types was subtly
wrong.
This fixes tests on at least ppc32 (big-endian).
Many thanks to Sebastian Berg for debugging this with me and pointing out
what needed to be fixed.
Closes #24239.
Fixes: 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -283,34 +283,34 @@ genint_type_str(PyObject *self)
void *val = scalar_value(self, descr);
switch (descr->type_num) {
case NPY_BYTE:
- item = PyLong_FromLong(*(int8_t *)val);
+ item = PyLong_FromLong(*(npy_byte *)val);
break;
case NPY_UBYTE:
- item = PyLong_FromUnsignedLong(*(uint8_t *)val);
+ item = PyLong_FromUnsignedLong(*(npy_ubyte *)val);
break;
case NPY_SHORT:
- item = PyLong_FromLong(*(int16_t *)val);
+ item = PyLong_FromLong(*(npy_short *)val);
break;
case NPY_USHORT:
- item = PyLong_FromUnsignedLong(*(uint16_t *)val);
+ item = PyLong_FromUnsignedLong(*(npy_ushort *)val);
break;
case NPY_INT:
- item = PyLong_FromLong(*(int32_t *)val);
+ item = PyLong_FromLong(*(npy_int *)val);
break;
case NPY_UINT:
- item = PyLong_FromUnsignedLong(*(uint32_t *)val);
+ item = PyLong_FromUnsignedLong(*(npy_uint *)val);
break;
case NPY_LONG:
- item = PyLong_FromLong(*(int64_t *)val);
+ item = PyLong_FromLong(*(npy_long *)val);
break;
case NPY_ULONG:
- item = PyLong_FromUnsignedLong(*(uint64_t *)val);
+ item = PyLong_FromUnsignedLong(*(npy_ulong *)val);
break;
case NPY_LONGLONG:
- item = PyLong_FromLongLong(*(long long *)val);
+ item = PyLong_FromLongLong(*(npy_longlong *)val);
break;
case NPY_ULONGLONG:
- item = PyLong_FromUnsignedLongLong(*(unsigned long long *)val);
+ item = PyLong_FromUnsignedLongLong(*(npy_ulonglong *)val);
break;
default:
item = gentype_generic_method(self, NULL, NULL, "item");
|
GitWeb
