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

Jump to bottom

ENH: Add support for windows on arm targets #19513

Merged
merged 7 commits into from Jul 27, 2021
Merged

ENH: Add support for windows on arm targets #19513

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f23957d
add support for windows on arm targets
niyas-sait Jul 18, 2021
d72b973
Philox: Use _umulh intrinsic for ARM64 target
niyas-sait Jul 19, 2021
6eed796
CPU Detection: Refactor to avoid separate pre-processor definition fo…
niyas-sait Jul 21, 2021
75d85f1
adapt test_dragon4 to avoid using pow (**) to workaround issue in win…
niyas-sait Jul 22, 2021
9471c02
Update numpy/core/include/numpy/npy_cpu.h
niyas-sait Jul 25, 2021
6ce34c3
add release note for numpy windows/arm64 support
niyas-sait Jul 27, 2021
3ab6a59
Update 19513.new_feature.rst
charris Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions numpy/core/include/numpy/npy_cpu.h
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@
#define NPY_CPU_HPPA
#elif defined(__alpha__)
#define NPY_CPU_ALPHA
#elif defined(__arm__) || defined(__aarch64__)
#elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64)
niyas-sait marked this conversation as resolved.
Show resolved Hide resolved
#if defined(__ARMEB__) || defined(__AARCH64EB__)
#if defined(__ARM_32BIT_STATE)
#define NPY_CPU_ARMEB_AARCH32
Expand All @@ -72,10 +72,10 @@
#else
#define NPY_CPU_ARMEB
#endif
#elif defined(__ARMEL__) || defined(__AARCH64EL__)
#elif defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
#if defined(__ARM_32BIT_STATE)
#define NPY_CPU_ARMEL_AARCH32
#elif defined(__ARM_64BIT_STATE)
#elif defined(__ARM_64BIT_STATE) || defined(_M_ARM64)
#define NPY_CPU_ARMEL_AARCH64
#else
#define NPY_CPU_ARMEL
Expand Down
3 changes: 2 additions & 1 deletion numpy/core/tests/test_scalarprint.py
View file
Open in desktop
Expand Up @@ -154,7 +154,8 @@ def test_dragon4(self):
"0.00000000000000000000000000000000000000000000140129846432"
"4817070923729583289916131280261941876515771757068283889791"
"08268586060148663818836212158203125")
assert_equal(fpos64(0.5**(1022 + 52), unique=False, precision=1074),

assert_equal(fpos64(5e-324, unique=False, precision=1074),
"0.00000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000000"
Expand Down
8 changes: 7 additions & 1 deletion numpy/random/src/philox/philox.h
View file
Open in desktop
Expand Up @@ -33,10 +33,16 @@ static NPY_INLINE uint64_t mulhilo64(uint64_t a, uint64_t b, uint64_t *hip) {
return (uint64_t)product;
}
#else
#ifdef _WIN32
#if defined(_WIN32)
#include <intrin.h>
#if defined(_WIN64) && defined(_M_AMD64)
#pragma intrinsic(_umul128)
niyas-sait marked this conversation as resolved.
Show resolved Hide resolved
#elif defined(_WIN64) && defined(_M_ARM64)
#pragma intrinsic(__umulh)
static NPY_INLINE uint64_t _umul128(uint64_t a, uint64_t b, uint64_t *high) {
*high = __umulh(a, b);
return a * b;
}
#else
#pragma intrinsic(__emulu)
static NPY_INLINE uint64_t _umul128(uint64_t a, uint64_t b, uint64_t *high) {
Expand Down