From 67dbd3ba144944fbf4b466be1b5fa0569b774e6f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Feb 2025 19:25:33 +0000 Subject: gentoo auto-resync : 25:02:2025 - 19:25:33 --- dev-libs/ncnn/Manifest | 3 ++- dev-libs/ncnn/files/ncnn-20241226-avx512.patch | 16 ++++++++++++++++ dev-libs/ncnn/ncnn-20241226.ebuild | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 dev-libs/ncnn/files/ncnn-20241226-avx512.patch (limited to 'dev-libs/ncnn') diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest index cab412437a4d..ba49063d460d 100644 --- a/dev-libs/ncnn/Manifest +++ b/dev-libs/ncnn/Manifest @@ -1,5 +1,6 @@ +AUX ncnn-20241226-avx512.patch 600 BLAKE2B 7bfc703cc78714777c923a669be9e3fa2de3c88f47f8d2bf6e2aed38df1af4c50bfefabfd901842469a406e09dad30f1ea2654a3fdb61a780664a9da60c3c6b8 SHA512 a33aba74b746070b2cc8bcfac7b54d73851af333e70cf84c5e83a8c77ea1300f5dd4a02887eac1b298028e74feace754f7a554515b25584038277de57cfc26de DIST ncnn-20240820.tar.gz 12963701 BLAKE2B cf92ac70fb0256ae4b78f03d5a670622071f6f0e9b4ad1ee6a18238852f66b3d6b0456d33b2cf2eb691c351b1e8c7b0a8427fb20342029c79f33626f09d9bba5 SHA512 cbef59021231df7409c73a270f147e72daefa1230ccc072aec7225078097ec8e99d4dd82e8aaa93665361c4c24b3812e05f08da5c9a82a575ef2aad70c0828fe DIST ncnn-20241226.tar.gz 13151099 BLAKE2B 58c180dc17c9c9c91ee665ffa9343fcbb0c2ec507acdf69e1204b46569942dfbeef78ec62c107421f18334035fd6386f9f462468831ad3bb958eb5792955e8d3 SHA512 0a285589451334eac3fcb9135c17f8938d6110fc6950f1b9061bc98450132b88a205ed0318ca5d810d537406c96b397384936d2268f79fb4c8a1c3fd049ebc41 EBUILD ncnn-20240820.ebuild 1675 BLAKE2B 2f09540ae8e11ac2f30955dac11c6468a1947570cb2aeb803da20c749c8cef417122bcdf6632b5b13ef29975a309398513d5cf7dfd90fe8c2f9392cdb9992db6 SHA512 d941b262abd36fa0e0966adbcee2c5c0637844bf473100a4b4c58b24eaa868e149fa49d2d2483decaae1dbfc466debf25a0cc9a37a349d44e0152d7b5bafb16c -EBUILD ncnn-20241226.ebuild 1676 BLAKE2B 6359fdc01ce3d10d260430762819cfffecbf2d5a927bd73f527ab696462e8433cf429ba995ce279d69a0c9f6f4582b3df1f08cc3c46887b5c0cd4685ce5d1980 SHA512 1fb199a946c864e1b0606faec3dd5f87b1910300febfae3b733bf806f6c99538e9981c0eea2cc9e452bcdf9f9cdcfb851356ffdf945092f44beeb3007f29c5e2 +EBUILD ncnn-20241226.ebuild 1722 BLAKE2B b2a400229f30e7ef3fde4a54b4c70c5920d6f3ed30b0cfc2f05dbdd3c6a7e030dd9f5c0093a6f15d8e81d2eeb144a7b7aada5f308ea23cffd35fcd6e8c9040ab SHA512 80969897b413b9f6b622efe29700ca3956b6f2a19ea25ea2f9d8ab9ca27fc3aa58819dbbeb428bf47902c2970d1c6b3968ad96c904c7b04c8ee69379431c896e MISC metadata.xml 430 BLAKE2B 2623eadab618d93544c297f5c5bbb29575a769e0d4660aa619c66db2ad1909349f2753a426789d6c280a13a452b3434d5ffa2e781aee59b4487a71b023792327 SHA512 0693c619982557394bbabab2ceee6ba06445bcc208bb9e751392a371ca3efbf56b39685fb2d20d4e3da443c5bf7a482ed4581a7349734ad44c1e58dfb6dc241e diff --git a/dev-libs/ncnn/files/ncnn-20241226-avx512.patch b/dev-libs/ncnn/files/ncnn-20241226-avx512.patch new file mode 100644 index 000000000000..c4dcf8adb500 --- /dev/null +++ b/dev-libs/ncnn/files/ncnn-20241226-avx512.patch @@ -0,0 +1,16 @@ +Quick fix for build with -march that enables avx512f. + +This is not where ncnn would include this though, it seems to have +tendency to put headers not where they're used by in every files +before including this. +--- a/src/layer/x86/gemm_int8.h ++++ b/src/layer/x86/gemm_int8.h +@@ -13,4 +13,8 @@ + // specific language governing permissions and limitations under the License. + ++#if __AVX512F__ ++#include "avx512_mathfun.h" ++#endif ++ + #if NCNN_RUNTIME_CPU && NCNN_AVX512VNNI && __AVX512F__ && !__AVX512VNNI__ + void pack_A_tile_int8_avx512vnni(const Mat& A, Mat& AT, int i, int max_ii, int k, int max_kk); diff --git a/dev-libs/ncnn/ncnn-20241226.ebuild b/dev-libs/ncnn/ncnn-20241226.ebuild index 7c8a0a3dd6bc..44bde69b5d13 100644 --- a/dev-libs/ncnn/ncnn-20241226.ebuild +++ b/dev-libs/ncnn/ncnn-20241226.ebuild @@ -41,6 +41,10 @@ BDEPEND=" DOCS=( README.md docs/. ) +PATCHES=( + "${FILESDIR}"/${P}-avx512.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -- cgit v1.2.3