gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-23 19:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

numpy: bump to version 2.2.1

Browse Source 
Dropped:
  003-without-vendored-meson.patch
  004-workaround-for-multiple-top-level-packages-discovered.patch

This time, we really need to use meson to build numpy.
And to make things more complicated, the 'vendored' meson package (that
comes with numpy) must be used. This is because they have some special
logic in there that's specific to numpy.

With this change, we also need to keep a special/internal
'openwrt-cross.txt.in' file, because cross-compiling numpy also requires
that a 'longdouble_format' property be added.
More details about this:
   https://github.com/numpy/numpy/issues/23972
   https://github.com/numpy/numpy/blob/maintenance/2.2.x/doc/source/building/cross_compilation.rst

Removing quirk fix for x86_64 with detecting 'avx512f'.
This should work with the new meson stuff.

And finally, added a test.sh script.
This should make sure that this package works fine during upgrades.

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
(cherry picked from commit 7b4ee2dabf)
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
Alexandru Ardelean
2024-12-24 14:28:02 +02:00
committed by Alexandru Ardelean
parent c3a98403cb
commit 056b7a42c7
6 changed files with 84 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lang/python/numpy/Makefile
View File

@@ -6,11 +6,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=numpy
PKG_VERSION:=2.1.0
PKG_VERSION:=2.2.1
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=7dc90da0081f7e1da49ec4e398ede6a8e9cc4f5ebe5f9e06b443ed889ee9aaa2
PKG_HASH:=45681fd7128c8ad1c379f0ca0776a8b0c6583d2f69889ddac01559dfe4390918
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
@@ -27,9 +27,43 @@ PKG_BUILD_DEPENDS:=python-cython/host pyproject-metadata/host
PYTHON3_PKG_BUILD_VARS:= \
$(if $(CONFIG_NUMPY_OPENBLAS_SUPPORT),,NPY_BLAS_ORDER= NPY_LAPACK_ORDER= )
MESON_USE_STAGING_PYTHON:=1
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
include $(INCLUDE_DIR)/meson.mk
MESON_ARGS+= \
-Ddisable-optimization=true \
-Dcpu-baseline=min
# Override 'Meson', to use numpy's vendored meson
define Meson
$(call Python3/Run,,$(PKG_BUILD_DIR)/vendored-meson/meson/meson.py $(1),$(2))
endef
define Meson/CreateCrossFile
$(STAGING_DIR_HOST)/bin/sed \
-e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \
-e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \
-e "s|@LD@|$(foreach FLAG,$(TARGET_LINKER),'$(FLAG)',)|" \
-e "s|@AR@|$(TARGET_AR)|" \
-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
-e "s|@NM@|$(TARGET_NM)|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
-e "s|@PYTHON@|$(PYTHON_BIN)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
-e "s|@ARCH@|$(MESON_ARCH)|" \
-e "s|@CPU@|$(MESON_CPU)|" \
-e "s|@ENDIAN@|$(if $(CONFIG_BIG_ENDIAN),big,little)|" \
< files/openwrt-cross.txt.in \
> $(1)
echo "longdouble_format = '$(if $(CONFIG_BIG_ENDIAN),IEEE_DOUBLE_BE,IEEE_DOUBLE_LE)'" >> $(1)
endef
define Package/python3-numpy
SUBMENU:=Python
@@ -54,12 +88,6 @@ config NUMPY_OPENBLAS_SUPPORT
endmenu
endef
ifeq ($(ARCH),x86_64)
# FIXME: temporary fix for x86_64 with GCC 13 + musl;
# numpy does not detect this compiler extension, so we just enable it
TARGET_CFLAGS += -mavx512f
endif
define Build/Prepare/numpy-sitecfg
echo "[DEFAULT]" > $(PKG_BUILD_DIR)/site.cfg
echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(PKG_BUILD_DIR)/site.cfg