python-numpy: introduce ARCH_SUPPORTS hidden variable

PATCH New Gwenhael Goavec-Merou 4 participants 12 messages Oct 7, 2015 – Oct 9, 2015

lore

Share & tools

lore

Gwenhael Goavec-Merou

author

2015-10-07 07:43 UTC #0 lore raw

PATCH v6 1/3 python-numpy: introduce ARCH_SUPPORTS hidden variable

From: Gwenhael Goavec-Merou <[email protected]>

Some packages selects python-numpy. This package has a some CPU specific code. To simplify and avoid duplicate dependencies this patch introduce an hidden ARCH_SUPPORTS variable.

Signed-off-by Gwenhael Goavec-Merou <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Changes v4 -> v5:
* Re-add hidden variable.

---
 package/python-numpy/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

package/python-numpy/Config.in +6 -2

index f8170f8..f25102a 100644
@@ -1,9 +1,13 @@
-config BR2_PACKAGE_PYTHON_NUMPY
-	bool "python-numpy"
+config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+	bool
 	# Numpy has some CPU specific code
 	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
 		|| BR2_sh || BR2_x86_64
+
+config BR2_PACKAGE_PYTHON_NUMPY
+	bool "python-numpy"
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	help
 	  NumPy is the fundamental package for scientific computing
 	  with Python.

Signature · 1 line

2.4.9

Gwenhael Goavec-Merou

author

2015-10-07 07:43 UTC #1 lore raw

PATCH v6 2/3 opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends

From: Gwenhael Goavec-Merou <[email protected]>

Opencv3 select python-numpy. To reduce CPU arch dependencies, an hidden variable has been added to python-numpy package. This patch propagate this modification.

Signed-off-by Gwenhael Goavec-Merou <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 package/opencv3/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

package/opencv3/Config.in +1 -3

index 9492603..2f51580 100644
@@ -165,9 +165,7 @@ config BR2_PACKAGE_OPENCV3_LIB_PHOTO
 config BR2_PACKAGE_OPENCV3_LIB_PYTHON
 	bool "python"
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
-		|| BR2_sh || BR2_x86_64 # python-numpy
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	select BR2_PACKAGE_PYTHON_NUMPY
 	help
 	  Include opencv_python module into the OpenCV build.

Signature · 1 line

2.4.9

Samuel Martin

2015-10-07 08:36 UTC #2 lore raw

PATCH v6 2/3 opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends

Quoted 8 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Opencv3 select python-numpy. To reduce CPU arch dependencies, an hidden variable has been added to python-numpy package. This patch propagate this modification.
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Reviewed-by Samuel Martin <[email protected]>

Thomas Petazzoni

Applied

2015-10-09 21:00 UTC #3 lore raw

PATCH v6 2/3 opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends

In reply to Gwenhael Goavec-Merou

Dear Gwenhael Goavec-Merou,

Quoted 11 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Opencv3 select python-numpy. To reduce CPU arch dependencies, an hidden variable has been added to python-numpy package. This patch propagate this modification.
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
 package/opencv3/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Gwenhael Goavec-Merou

author

2015-10-07 07:43 UTC #4 lore raw

PATCH v6 3/3 gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy

In reply to Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>

Some gnuradio python blocks needs python-numpy present.

Without python-numpy, gnuradio-python based apps fails, on runtime, with traceback like:

Traceback (most recent call last):
File "./top_block.py", line 18, in <module>
from gnuradio import analog
File "/usr/lib/python2.7/site-packages/gnuradio/analog/__init__.py", line 35, in <module>
from am_demod import *
File "/usr/lib/python2.7/site-packages/gnuradio/analog/am_demod.py", line 22, in <module>
from gnuradio import gr
File "/usr/lib/python2.7/site-packages/gnuradio/gr/__init__.py", line 44, in <module>
from top_block import *
File "/usr/lib/python2.7/site-packages/gnuradio/gr/top_block.py", line 30, in <module>
from hier_block2 import hier_block2
File "/usr/lib/python2.7/site-packages/gnuradio/gr/hier_block2.py", line 26, in <module>
import pmt
File "/usr/lib/python2.7/site-packages/pmt/__init__.py", line 58, in <module>
from pmt_to_python import pmt_to_python as to_python
File "/usr/lib/python2.7/site-packages/pmt/pmt_to_python.py", line 22, in <module>
import numpy
ImportError: No module named numpy

Signed-off-by Gwenhael Goavec-Merou <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Changes v5 -> v6:
* add space between # and runtime
Changes v4 -> v5:
* Re-add BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
Changes v3 -> v4:
* add #runtime comment to BR2_PACKAGE_PYTHON_NUMPY select;
* suppress python-numpy in GNURADIO_DEPENDENCIES variable (not needed for buildtime)
Changes v2 -> v3:
* Since commit 826a2bc18bc0be0b08f2926c9fa1819fe909557c no special attentions is needed to select python-numpy. So BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS is no more needed
Changes v1 -> v2:
* Add dependy to BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS;
* gnuradio-python select numpy;
* gnuradio-utils select again gnuradio-python;
* fix commit message

---
 package/gnuradio/Config.in | 3 +++
 1 file changed, 3 insertions(+)

package/gnuradio/Config.in +3 -0

index e264a21..f188d87 100644
@@ -45,13 +45,16 @@ config BR2_PACKAGE_GNURADIO_FEC
 
 config BR2_PACKAGE_GNURADIO_PYTHON
 	bool "python support"
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	select BR2_PACKAGE_BOOST_PYTHON
 	select BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_NUMPY # runtime
 	help
 	  Enable python component
 
 config BR2_PACKAGE_GNURADIO_UTILS
 	bool "gr-utils support"
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	select BR2_PACKAGE_GNURADIO_PYTHON
 	help
 	  Misc python utilities

Signature · 1 line

2.4.9

Samuel Martin

2015-10-07 08:38 UTC #5 lore raw

PATCH v6 3/3 gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy

Quoted 25 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Some gnuradio python blocks needs python-numpy present.
Without python-numpy, gnuradio-python based apps fails, on runtime, with traceback like:
Traceback (most recent call last):
File "./top_block.py", line 18, in <module>
from gnuradio import analog
File "/usr/lib/python2.7/site-packages/gnuradio/analog/__init__.py", line 35, in <module>
from am_demod import *
File "/usr/lib/python2.7/site-packages/gnuradio/analog/am_demod.py", line 22, in <module>
from gnuradio import gr
File "/usr/lib/python2.7/site-packages/gnuradio/gr/__init__.py", line 44, in <module>
from top_block import *
File "/usr/lib/python2.7/site-packages/gnuradio/gr/top_block.py", line 30, in <module>
from hier_block2 import hier_block2
File "/usr/lib/python2.7/site-packages/gnuradio/gr/hier_block2.py", line 26, in <module>
import pmt
File "/usr/lib/python2.7/site-packages/pmt/__init__.py", line 58, in <module>
from pmt_to_python import pmt_to_python as to_python
File "/usr/lib/python2.7/site-packages/pmt/pmt_to_python.py", line 22, in <module>
import numpy
ImportError: No module named numpy

Quoted 2 lines

Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Reviewed-by Samuel Martin <[email protected]>

Signature · 1 line

Samuel

Thomas Petazzoni

Applied

2015-10-09 21:00 UTC #6 lore raw

PATCH v6 3/3 gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy

In reply to Gwenhael Goavec-Merou

Dear Gwenhael Goavec-Merou,

Quoted 45 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Some gnuradio python blocks needs python-numpy present.
Without python-numpy, gnuradio-python based apps fails, on runtime, with traceback like:
Traceback (most recent call last):
File "./top_block.py", line 18, in <module>
from gnuradio import analog
File "/usr/lib/python2.7/site-packages/gnuradio/analog/__init__.py", line 35, in <module>
from am_demod import *
File "/usr/lib/python2.7/site-packages/gnuradio/analog/am_demod.py", line 22, in <module>
from gnuradio import gr
File "/usr/lib/python2.7/site-packages/gnuradio/gr/__init__.py", line 44, in <module>
from top_block import *
File "/usr/lib/python2.7/site-packages/gnuradio/gr/top_block.py", line 30, in <module>
from hier_block2 import hier_block2
File "/usr/lib/python2.7/site-packages/gnuradio/gr/hier_block2.py", line 26, in <module>
import pmt
File "/usr/lib/python2.7/site-packages/pmt/__init__.py", line 58, in <module>
from pmt_to_python import pmt_to_python as to_python
File "/usr/lib/python2.7/site-packages/pmt/pmt_to_python.py", line 22, in <module>
import numpy
ImportError: No module named numpy
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
Changes v5 -> v6:
* add space between # and runtime
Changes v4 -> v5:
* Re-add BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
Changes v3 -> v4:
* add #runtime comment to BR2_PACKAGE_PYTHON_NUMPY select;
* suppress python-numpy in GNURADIO_DEPENDENCIES variable (not needed for buildtime)
Changes v2 -> v3:
* Since commit 826a2bc18bc0be0b08f2926c9fa1819fe909557c no special attentions is needed to select python-numpy. So BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS is no more needed
Changes v1 -> v2:
* Add dependy to BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS;
* gnuradio-python select numpy;
* gnuradio-utils select again gnuradio-python;
* fix commit message

Quoted 3 lines

---
 package/gnuradio/Config.in | 3 +++
 1 file changed, 3 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

2015-10-09 21:31 UTC #7 lore raw

PATCH v6 3/3 gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy

In reply to Gwenhael Goavec-Merou

Hello,

Quoted 5 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Some gnuradio python blocks needs python-numpy present.
Without python-numpy, gnuradio-python based apps fails, on runtime, with traceback like:

Gwenhael, Samuel, did you really test this patch? It causes some clearly visible warnings when running "make menuconfig" :

package/python/Config.in:5:error: recursive dependency detected!
package/python/Config.in:5: symbol BR2_PACKAGE_PYTHON is selected by BR2_PACKAGE_GNURADIO_PYTHON
package/gnuradio/Config.in:46: symbol BR2_PACKAGE_GNURADIO_PYTHON is selected by BR2_PACKAGE_GNURADIO_UTILS
package/gnuradio/Config.in:55: symbol BR2_PACKAGE_GNURADIO_UTILS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
package/python-numpy/Config.in:1: symbol BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON

I had to fix that up through a separate following commit
http://git.buildroot.net/buildroot/commit/?id=ef531c6ded27b62462c74b964fad8f5c337da3a2,
but I would have preferred the patch to not contain such an obvious issue.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Samuel Martin

2015-10-07 08:37 UTC #8 lore raw

PATCH v6 1/3 python-numpy: introduce ARCH_SUPPORTS hidden variable

In reply to Gwenhael Goavec-Merou

Quoted 8 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Some packages selects python-numpy. This package has a some CPU specific code. To simplify and avoid duplicate dependencies this patch introduce an hidden ARCH_SUPPORTS variable.
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Reviewed-by Samuel Martin <[email protected]>

Signature · 1 line

Samuel

Vicente Olivert Riera

2015-10-07 11:59 UTC #9 lore raw

PATCH v6 1/3 python-numpy: introduce ARCH_SUPPORTS hidden variable

In reply to Gwenhael Goavec-Merou

Dear Gwenhael Goavec-Merou,

please mark your previous series as superseded:

http://patchwork.ozlabs.org/patch/526678/
http://patchwork.ozlabs.org/patch/526680/
http://patchwork.ozlabs.org/patch/526679/

Thanks,

Vincent.

Quoted 36 lines · Gwenhael Goavec-Merou

From: Gwenhael Goavec-Merou <[email protected]>
Some packages selects python-numpy. This package has a some CPU specific code. To simplify and avoid duplicate dependencies this patch introduce an hidden ARCH_SUPPORTS variable.
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
Changes v4 -> v5:
* Re-add hidden variable.
---
 package/python-numpy/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
package/python-numpy/Config.in +6 -2
index f8170f8..f25102a 100644
@@ -1,9 +1,13 @@
-config BR2_PACKAGE_PYTHON_NUMPY
-	bool "python-numpy"
+config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+	bool
 	# Numpy has some CPU specific code
 	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
 		|| BR2_sh || BR2_x86_64
+
+config BR2_PACKAGE_PYTHON_NUMPY
+	bool "python-numpy"
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	help
 	  NumPy is the fundamental package for scientific computing
 	  with Python.

gwenhael.goavec

author

2015-10-07 12:25 UTC #10 lore raw

PATCH v6 1/3 python-numpy: introduce ARCH_SUPPORTS hidden variable

Dear Vicente Olivert Riera

Done.

Thanks,
Gwen

Quoted 49 lines · On Wed, 7 Oct 2015 12:59:33 +0100 <[email protected]> wrote:

Dear Gwenhael Goavec-Merou,
please mark your previous series as superseded:
http://patchwork.ozlabs.org/patch/526678/
http://patchwork.ozlabs.org/patch/526680/
http://patchwork.ozlabs.org/patch/526679/
Thanks,
Vincent.
Quoted 36 lines · Gwenhael Goavec-Merou
From: Gwenhael Goavec-Merou <[email protected]>
Some packages selects python-numpy. This package has a some CPU specific code. To simplify and avoid duplicate dependencies this patch introduce an hidden ARCH_SUPPORTS variable.
Signed-off-by: Gwenhael Goavec-Merou <[email protected]> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> --- Changes v4 -> v5:
* Re-add hidden variable.
---
 package/python-numpy/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
(quoted diff) +0 -0
b/package/python-numpy/Config.in index f8170f8..f25102a 100644
package/python-numpy/Config.in +6 -2
@@ -1,9 +1,13 @@
-config BR2_PACKAGE_PYTHON_NUMPY
-	bool "python-numpy"
+config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+	bool
 	# Numpy has some CPU specific code
 	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386
 \ || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
 		|| BR2_sh || BR2_x86_64
+
+config BR2_PACKAGE_PYTHON_NUMPY
+	bool "python-numpy"
+	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	help
 	  NumPy is the fundamental package for scientific computing
 	  with Python.

Thomas Petazzoni

2015-10-09 20:55 UTC #11 lore raw

PATCH v6 1/3 python-numpy: introduce ARCH_SUPPORTS hidden variable

In reply to Gwenhael Goavec-Merou

Gwenhael,

package/python-numpy/Config.in line 6

Quoted 13 lines · Gwenhael Goavec-Merou

package/python-numpy/Config.in +2 -2

index f8170f8..f25102a 100644
@@ -1,9 +1,13 @@
-config BR2_PACKAGE_PYTHON_NUMPY
-	bool "python-numpy"
+config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+	bool
 	# Numpy has some CPU specific code
 	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
 		|| BR2_sh || BR2_x86_64

With this code, the BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS option is always false: there is nothing that makes it equal to 'y', so I don't see how you could test these patches.

So I've fixed that by replacing:

	depends on BR2_aarch64 ...

by:

default y if BR2_aarch64 ...

And applied.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com