All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable
@ 2015-10-06 10:06 Gwenhael Goavec-Merou
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends Gwenhael Goavec-Merou
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-10-06 10:06 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

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 <gwenhael.goavec-merou@trabucayre.com>
---
Changes v4 -> v5:
 * Re-add hidden variable.
---
 package/python-numpy/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in
index f8170f8..f25102a 100644
--- a/package/python-numpy/Config.in
+++ b/package/python-numpy/Config.in
@@ -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.
-- 
2.4.9

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends
  2015-10-06 10:06 [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Gwenhael Goavec-Merou
@ 2015-10-06 10:06 ` Gwenhael Goavec-Merou
  2015-10-06 21:42   ` Arnout Vandecappelle
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy Gwenhael Goavec-Merou
  2015-10-06 21:42 ` [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Arnout Vandecappelle
  2 siblings, 1 reply; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-10-06 10:06 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

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 <gwenhael.goavec-merou@trabucayre.com>
---
 package/opencv3/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 9492603..2f51580 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -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.
-- 
2.4.9

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy
  2015-10-06 10:06 [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Gwenhael Goavec-Merou
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends Gwenhael Goavec-Merou
@ 2015-10-06 10:06 ` Gwenhael Goavec-Merou
  2015-10-06 21:44   ` Arnout Vandecappelle
  2015-10-06 21:42 ` [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Arnout Vandecappelle
  2 siblings, 1 reply; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-10-06 10:06 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

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 <gwenhael.goavec-merou@trabucayre.com>
---
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(+)

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index e264a21..f188d87 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -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
-- 
2.4.9

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable
  2015-10-06 10:06 [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Gwenhael Goavec-Merou
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends Gwenhael Goavec-Merou
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy Gwenhael Goavec-Merou
@ 2015-10-06 21:42 ` Arnout Vandecappelle
  2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-10-06 21:42 UTC (permalink / raw)
  To: buildroot

On 06-10-15 11:06, Gwenhael Goavec-Merou wrote:
> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> 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 <gwenhael.goavec-merou@trabucayre.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> ---
> Changes v4 -> v5:
>  * Re-add hidden variable.
> ---
>  package/python-numpy/Config.in | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in
> index f8170f8..f25102a 100644
> --- a/package/python-numpy/Config.in
> +++ b/package/python-numpy/Config.in
> @@ -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.
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends Gwenhael Goavec-Merou
@ 2015-10-06 21:42   ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-10-06 21:42 UTC (permalink / raw)
  To: buildroot

On 06-10-15 11:06, Gwenhael Goavec-Merou wrote:
> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> 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 <gwenhael.goavec-merou@trabucayre.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> ---
>  package/opencv3/Config.in | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
> index 9492603..2f51580 100644
> --- a/package/opencv3/Config.in
> +++ b/package/opencv3/Config.in
> @@ -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.
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy
  2015-10-06 10:06 ` [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy Gwenhael Goavec-Merou
@ 2015-10-06 21:44   ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-10-06 21:44 UTC (permalink / raw)
  To: buildroot

On 06-10-15 11:06, Gwenhael Goavec-Merou wrote:
> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> 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 <gwenhael.goavec-merou@trabucayre.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 But see below

> ---
> 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(+)
> 
> diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
> index e264a21..f188d87 100644
> --- a/package/gnuradio/Config.in
> +++ b/package/gnuradio/Config.in
> @@ -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

 We usually put a space between # runtime

 Regards,
 Arnout

>  	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
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-10-06 21:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-06 10:06 [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Gwenhael Goavec-Merou
2015-10-06 10:06 ` [Buildroot] [PATCH v5 2/3] opencv3: use BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS instead of replicate python-numpy depends Gwenhael Goavec-Merou
2015-10-06 21:42   ` Arnout Vandecappelle
2015-10-06 10:06 ` [Buildroot] [PATCH v5 3/3] gnuradio: gnuradio-python gnuradio-utils: add missing dependency to python-numpy Gwenhael Goavec-Merou
2015-10-06 21:44   ` Arnout Vandecappelle
2015-10-06 21:42 ` [Buildroot] [PATCH v5 1/3] python-numpy: introduce ARCH_SUPPORTS hidden variable Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.