mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
python3-numpy: move recipe to python directory
This recipe had been moved out from python directory since 2016[1] in order to share patches between python2 and python3. But now there is no reason to keep it in its own directory as we only keep python3-nump. Move it back to python directory. [1] https://git.openembedded.org/openembedded-core/commit/?id=9bffe2f9fb4ce6c0b265f27e5b484fbe076c6349 (From OE-Core rev: e5702b8ebd16949c736b8c2f18bf35c0d64d80bd) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
@@ -0,0 +1,72 @@
|
||||
From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 10 Dec 2015 13:20:30 +0200
|
||||
Subject: [PATCH] Don't search /usr and so on for libraries by default to
|
||||
|
||||
avoid host contamination.
|
||||
|
||||
Upstream-Status: Inappropriate (As the code stands, this is a hack)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
numpy/distutils/system_info.py | 42 +++++-----------------------------
|
||||
1 file changed, 6 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||
index 82e864a..135246d 100644
|
||||
--- a/numpy/distutils/system_info.py
|
||||
+++ b/numpy/distutils/system_info.py
|
||||
@@ -323,44 +323,14 @@ if sys.platform == 'win32':
|
||||
add_system_root(os.path.join(conda_dir, 'Library'))
|
||||
|
||||
else:
|
||||
- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
|
||||
- '/opt/local/lib', '/sw/lib'], platform_bits)
|
||||
default_runtime_dirs = []
|
||||
- default_include_dirs = ['/usr/local/include',
|
||||
- '/opt/include',
|
||||
- # path of umfpack under macports
|
||||
- '/opt/local/include/ufsparse',
|
||||
- '/opt/local/include', '/sw/include',
|
||||
- '/usr/include/suitesparse']
|
||||
- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
|
||||
-
|
||||
- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
|
||||
- '/usr/lib'], platform_bits)
|
||||
- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include']
|
||||
-
|
||||
- if os.path.exists('/usr/lib/X11'):
|
||||
- globbed_x11_dir = glob('/usr/lib/*/libX11.so')
|
||||
- if globbed_x11_dir:
|
||||
- x11_so_dir = os.path.split(globbed_x11_dir[0])[0]
|
||||
- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11'])
|
||||
- default_x11_include_dirs.extend(['/usr/lib/X11/include',
|
||||
- '/usr/include/X11'])
|
||||
-
|
||||
- with open(os.devnull, 'w') as tmp:
|
||||
- try:
|
||||
- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
|
||||
- stderr=tmp)
|
||||
- except (OSError, DistutilsError):
|
||||
- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
|
||||
- # subclass) if an old setuptools bug is triggered (see gh-3160).
|
||||
- pass
|
||||
- else:
|
||||
- triplet = str(p.communicate()[0].decode().strip())
|
||||
- if p.returncode == 0:
|
||||
- # gcc supports the "-print-multiarch" option
|
||||
- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
|
||||
- default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
|
||||
|
||||
+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
|
||||
+ default_include_dirs = ['/deaddir/include']
|
||||
+ default_src_dirs = ['.', '/deaddir/src']
|
||||
+
|
||||
+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
|
||||
+ default_x11_include_dirs = ['/deaddir/include']
|
||||
|
||||
if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
|
||||
default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
From dbcf296f84e5cef6a3ff0f1c469a4508f1e0fb15 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 15 Nov 2020 15:32:39 -0800
|
||||
Subject: [PATCH] numpy/core: Define RISCV-32 support
|
||||
|
||||
Helps compile on riscv32
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
numpy/core/include/numpy/npy_cpu.h | 9 +++++++--
|
||||
numpy/core/include/numpy/npy_endian.h | 1 +
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
|
||||
index 4dbf9d84e..bc41a7eda 100644
|
||||
--- a/numpy/core/include/numpy/npy_cpu.h
|
||||
+++ b/numpy/core/include/numpy/npy_cpu.h
|
||||
@@ -18,6 +18,7 @@
|
||||
* NPY_CPU_ARCEL
|
||||
* NPY_CPU_ARCEB
|
||||
* NPY_CPU_RISCV64
|
||||
+ * NPY_CPU_RISCV32
|
||||
* NPY_CPU_WASM
|
||||
*/
|
||||
#ifndef _NPY_CPUARCH_H_
|
||||
@@ -100,8 +101,12 @@
|
||||
#define NPY_CPU_ARCEL
|
||||
#elif defined(__arc__) && defined(__BIG_ENDIAN__)
|
||||
#define NPY_CPU_ARCEB
|
||||
-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
|
||||
- #define NPY_CPU_RISCV64
|
||||
+#elif defined(__riscv)
|
||||
+ #if __riscv_xlen == 64
|
||||
+ #define NPY_CPU_RISCV64
|
||||
+ #elif __riscv_xlen == 32
|
||||
+ #define NPY_CPU_RISCV32
|
||||
+ #endif
|
||||
#elif defined(__EMSCRIPTEN__)
|
||||
/* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */
|
||||
#define NPY_CPU_WASM
|
||||
diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
|
||||
index aa367a002..d59484573 100644
|
||||
--- a/numpy/core/include/numpy/npy_endian.h
|
||||
+++ b/numpy/core/include/numpy/npy_endian.h
|
||||
@@ -49,6 +49,7 @@
|
||||
|| defined(NPY_CPU_PPC64LE) \
|
||||
|| defined(NPY_CPU_ARCEL) \
|
||||
|| defined(NPY_CPU_RISCV64) \
|
||||
+ || defined(NPY_CPU_RISCV32) \
|
||||
|| defined(NPY_CPU_WASM)
|
||||
#define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
|
||||
#elif defined(NPY_CPU_PPC) \
|
||||
--
|
||||
2.29.2
|
||||
|
||||
5
meta/recipes-devtools/python/python3-numpy/run-ptest
Normal file
5
meta/recipes-devtools/python/python3-numpy/run-ptest
Normal file
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import numpy
|
||||
numpy.test(label='full', verbose=2)
|
||||
|
||||
58
meta/recipes-devtools/python/python3-numpy_1.21.4.bb
Normal file
58
meta/recipes-devtools/python/python3-numpy_1.21.4.bb
Normal file
@@ -0,0 +1,58 @@
|
||||
SUMMARY = "A sophisticated Numeric Processing Package for Python"
|
||||
HOMEPAGE = "https://numpy.org/"
|
||||
DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python."
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596"
|
||||
|
||||
SRCNAME = "numpy"
|
||||
|
||||
SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
|
||||
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
|
||||
file://0001-numpy-core-Define-RISCV-32-support.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
SRC_URI[sha256sum] = "5d412381aa489b8be82ac5c6a9e99c3eb3f754245ad3f90ab5c339d92f25fb47"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
DEPENDS += "python3-cython-native"
|
||||
|
||||
inherit ptest setuptools3
|
||||
|
||||
S = "${WORKDIR}/numpy-${PV}"
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
|
||||
FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a"
|
||||
|
||||
# install what is needed for numpy.test()
|
||||
RDEPENDS:${PN} = "${PYTHON_PN}-unittest \
|
||||
${PYTHON_PN}-difflib \
|
||||
${PYTHON_PN}-pprint \
|
||||
${PYTHON_PN}-pickle \
|
||||
${PYTHON_PN}-shell \
|
||||
${PYTHON_PN}-doctest \
|
||||
${PYTHON_PN}-datetime \
|
||||
${PYTHON_PN}-distutils \
|
||||
${PYTHON_PN}-misc \
|
||||
${PYTHON_PN}-mmap \
|
||||
${PYTHON_PN}-netclient \
|
||||
${PYTHON_PN}-numbers \
|
||||
${PYTHON_PN}-pydoc \
|
||||
${PYTHON_PN}-pkgutil \
|
||||
${PYTHON_PN}-email \
|
||||
${PYTHON_PN}-compression \
|
||||
${PYTHON_PN}-ctypes \
|
||||
${PYTHON_PN}-threading \
|
||||
${PYTHON_PN}-multiprocessing \
|
||||
"
|
||||
RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \
|
||||
${PYTHON_PN}-hypothesis \
|
||||
${PYTHON_PN}-sortedcontainers \
|
||||
${PYTHON_PN}-resource \
|
||||
ldd \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user