diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-09-17 16:53:05 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-09-17 16:53:05 +0000 |
| commit | 27edaa0c23fe927bdc5c84bc01f37358fd34b44d (patch) | |
| tree | f578210d560e9ba1d3a344870beca29e06c66650 /dev-python/numpy | |
| parent | 890b4527a2b4a35e821f750ad70f9fbfbe7d2239 (diff) | |
| download | baldeagleos-repo-27edaa0c23fe927bdc5c84bc01f37358fd34b44d.tar.gz baldeagleos-repo-27edaa0c23fe927bdc5c84bc01f37358fd34b44d.tar.xz baldeagleos-repo-27edaa0c23fe927bdc5c84bc01f37358fd34b44d.zip | |
Adding metadata
Diffstat (limited to 'dev-python/numpy')
| -rw-r--r-- | dev-python/numpy/files/numpy-2.3.3-avx512f-only.patch | 25 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-2.3.3.ebuild | 13 |
2 files changed, 33 insertions, 5 deletions
diff --git a/dev-python/numpy/files/numpy-2.3.3-avx512f-only.patch b/dev-python/numpy/files/numpy-2.3.3-avx512f-only.patch new file mode 100644 index 000000000000..41205229202a --- /dev/null +++ b/dev-python/numpy/files/numpy-2.3.3-avx512f-only.patch @@ -0,0 +1,25 @@ +From f3c224a321b86647cff902d69a5463823c2fdcbd Mon Sep 17 00:00:00 2001 +From: Raghuveer <devulapalli.raghuveer@gmail.com> +Date: Fri, 5 Sep 2025 20:56:52 -0700 +Subject: [PATCH] Remove #error and fallback to AVX2 when compiled with just + -mavx512f + +--- + src/x86simdsort-static-incl.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/x86simdsort-static-incl.h b/src/x86simdsort-static-incl.h +--- a/numpy/_core/src/npysort/x86-simd-sort/src/x86simdsort-static-incl.h ++++ b/numpy/_core/src/npysort/x86-simd-sort/src/x86simdsort-static-incl.h +@@ -197,10 +197,7 @@ void x86simdsortStatic::partial_qsort<_Float16>( + } + #endif + +-#elif defined(__AVX512F__) +-#error "x86simdsort requires AVX512DQ and AVX512VL to be enabled in addition to AVX512F to use AVX512" +- +-#elif defined(__AVX2__) && !defined(__AVX512F__) ++#elif defined(__AVX2__) + /* 32-bit and 64-bit dtypes vector definitions on AVX2 */ + #include "avx2-32bit-half.hpp" + #include "avx2-32bit-qsort.hpp" diff --git a/dev-python/numpy/numpy-2.3.3.ebuild b/dev-python/numpy/numpy-2.3.3.ebuild index 59ba10bc6dbe..622ba5cae985 100644 --- a/dev-python/numpy/numpy-2.3.3.ebuild +++ b/dev-python/numpy/numpy-2.3.3.ebuild @@ -23,7 +23,7 @@ SLOT="0/2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" # +lapack because the internal fallbacks are pretty slow. Building without blas # is barely supported anyway, see bug #914358. -IUSE="big-endian +cpudetection +lapack" +IUSE="big-endian +cpudetection index64 +lapack" # upstream-flag[:gentoo-flag] ARM_FLAGS=( neon{,-fp16} vfpv4 asimd{,hp,dp,fhm} sve ) @@ -41,8 +41,8 @@ IUSE+=" RDEPEND=" lapack? ( - >=virtual/cblas-3.8 - >=virtual/lapack-3.8 + >=virtual/cblas-3.8[index64(-)?] + >=virtual/lapack-3.8[index64(-)?] ) " BDEPEND=" @@ -75,6 +75,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3.2-no-detect.patch # https://github.com/numpy/numpy/pull/29579 "${FILESDIR}"/${PN}-2.3.2-arm-asimddp.patch + # https://github.com/intel/x86-simd-sort/pull/212 + "${FILESDIR}"/${P}-avx512f-only.patch ) has_all_x86() { @@ -214,8 +216,9 @@ python_configure_all() { DISTUTILS_ARGS=( -Dallow-noblas=$(usex !lapack true false) - -Dblas=$(usev lapack cblas) - -Dlapack=$(usev lapack lapack) + -Duse-ilp64=$(usex index64 true false) + -Dblas=$(usev lapack $(usex index64 cblas64 cblas)) + -Dlapack=$(usev lapack $(usex index64 lapack64 lapack)) -Dcpu-baseline="${cpu_baseline[*]}" -Dcpu-baseline-detect=disabled # '-XOP -FMA4' is upstream default, since these are deprecated |