BUG, SIMD: Fix quicksort build error when Highway/SVE is enabled #25397
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update Highway against the latest commit to SVE compile errors
c316be5 to
796e075
Compare
|
These build errors was reported by google/highway#1888 and fixed by google/highway#1891 |
|
ping @charris |
|
Thanks Sayed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update Highway against the latest origin commit to fix SVE build errors that appears after #25247:
Build errors triggered by cirrus-ci
FAILED: numpy/_core/libhighway_qsort.dispatch.h_SVE.a.p/src_npysort_highway_qsort.dispatch.cpp.o ccache c++ -Inumpy/_core/libhighway_qsort.dispatch.h_SVE.a.p -Inumpy/_core -I../numpy/_core -Inumpy/_core/include -I../numpy/_core/include -I../numpy/_core/src/common -I../numpy/_core/src/multiarray -I../numpy/_core/src/npymath -I../numpy/_core/src/umath -I../numpy/_core/src/highway -I/usr/include/python3.10 -I/usr/include/aarch64-linux-gnu/python3.10 -I/tmp/cirrus-ci-build/build/meson_cpu -fdiagnostics-color=always -Wall -Winvalid-pch -std=c++17 -O2 -g -fPIC -DNPY_INTERNAL_BUILD -DHAVE_NPY_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D__STDC_VERSION__=0 -fno-exceptions -fno-rtti -O3 -DNPY_HAVE_NEON_VFPV4 -DNPY_HAVE_NEON_FP16 -DNPY_HAVE_NEON -DNPY_HAVE_ASIMD -DNPY_HAVE_ASIMDHP -DNPY_HAVE_SVE -march=armv8.2-a+sve+fp16 -DNPY_MTARGETS_CURRENT=SVE -MD -MQ numpy/_core/libhighway_qsort.dispatch.h_SVE.a.p/src_npysort_highway_qsort.dispatch.cpp.o -MF numpy/_core/libhighway_qsort.dispatch.h_SVE.a.p/src_npysort_highway_qsort.dispatch.cpp.o.d -o numpy/_core/libhighway_qsort.dispatch.h_SVE.a.p/src_npysort_highway_qsort.dispatch.cpp.o -c ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp In file included from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h: In substitution of ‘template<class V> using DFromV = typename hwy::N_SVE::DFromV_t<typename hwy::RemoveConstT<T>::type>::type [with V = __SVBfloat16_t]’: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:771:27: required from here ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:59:7: error: no type named ‘type’ in ‘struct hwy::N_SVE::DFromV_t<__SVBfloat16_t>’ 59 | using DFromV = typename DFromV_t<RemoveConst<V>>::type; | ^~~~~~ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h: In function ‘hwy::N_SVE::VBF16 hwy::N_SVE::Neg(hwy::N_SVE::VBF16)’: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:771:29: error: uninitialized ‘const d’ [-fpermissive] 771 | const DFromV<decltype(v)> d; | ^ In file included from ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:21, from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/shared-inl.h: In substitution of ‘template<class D> using RebindToUnsigned = hwy::N_SVE::Rebind<typename hwy::detail::Relations<typename D::T>::Unsigned, D> [with D = const int]’: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:772:37: required from here ../numpy/_core/src/highway/hwy/ops/shared-inl.h:465:7: error: ‘const int’ is not a class, struct, or union type 465 | using RebindToUnsigned = Rebind<MakeUnsigned<TFromD<D>>, D>; | ^~~~~~~~~~~~~~~~ In file included from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:772:39: error: uninitialized ‘const du’ [-fpermissive] 772 | const RebindToUnsigned<decltype(d)> du; | ^~ In file included from ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:21, from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/shared-inl.h: In substitution of ‘template<class D> using TFromD = typename D::T [with D = const int]’: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:773:33: required from here ../numpy/_core/src/highway/hwy/ops/shared-inl.h:426:7: error: ‘const int’ is not a class, struct, or union type 426 | using TFromD = typename D::T; | ^~~~~~ In file included from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:774:32: error: no matching function for call to ‘BitCast(const int&, hwy::N_SVE::VBF16&)’ 774 | return BitCast(d, Xor(BitCast(du, v), Set(du, SignMask<TU>()))); | ~~~~~~~^~~~~~~ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:441:19: note: candidate: ‘template<class D, class FromV> hwy::N_SVE::VFromD<D> hwy::N_SVE::BitCast(D, FromV)’ 441 | HWY_API VFromD<D> BitCast(D d, FromV v) { | ^~~~~~~ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:441:19: note: template argument deduction/substitution failed: In file included from ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:21, from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/shared-inl.h: In substitution of ‘template<class D> using TFromD = typename D::T [with D = int]’: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:376:34: required by substitution of ‘template<class D> using VFromD = decltype (hwy::N_SVE::Set(D(), hwy::N_SVE::TFromD<D>())) [with D = int]’ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:441:19: required by substitution of ‘template<class D, class FromV> hwy::N_SVE::VFromD<D> hwy::N_SVE::BitCast(D, FromV) [with D = int; FromV = __SVBfloat16_t]’ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:774:32: required from here ../numpy/_core/src/highway/hwy/ops/shared-inl.h:426:7: error: ‘int’ is not a class, struct, or union type 426 | using TFromD = typename D::T; | ^~~~~~ In file included from ../numpy/_core/src/highway/hwy/highway.h:418, from ../numpy/_core/src/highway/hwy/contrib/algo/copy-inl.h:28, from ../numpy/_core/src/highway/hwy/contrib/sort/vqsort-inl.h:95, from ../numpy/_core/src/npysort/highway_qsort.dispatch.cpp:3: ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:774:58: error: ‘TU’ was not declared in this scope 774 | return BitCast(d, Xor(BitCast(du, v), Set(du, SignMask<TU>()))); | ^~ ../numpy/_core/src/highway/hwy/ops/arm_sve-inl.h:774:61: error: no matching function for call to ‘SignMask<<expression error> >()’ 774 | return BitCast(d, Xor(BitCast(du, v), Set(du, SignMask<TU>())));