diff mbox series

[v2,3/3] support/testing: add test for python-pybind

Message ID 20220104123901.23929-3-guillaume.bressaix@gmail.com
State Accepted
Headers show
Series [v2,1/3] package/python-pybind: fix upgrade to 2.6.1 | expand

Commit Message

Guillaume Bres Jan. 4, 2022, 12:39 p.m. UTC 
From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com>

python-pybind is a header only library, most of the time used as a host-package,
to customize the host/usr/python interpreter capacity (at build time) with C++ based features.

Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com>
---
This test case enhances the /host/usr/python interpreter with a C++ macro.

The test delivers a C++ macro contained in its br-external/example.cpp.
We compile it against the host context.
We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained
in the host-python system path (import is easy).
The macro is an integer adder, written in C++ that we can now call in host-python.

The test infrastructure should actually be declared "host-generic-package"
instead of "generic-package", to be consistent with Buildroot infrastructure.
But I am not able to get this to actually do anything, if I declare this package
as a host-generic and "Config.in.host" instead of "Config.in". To me, this is
not too important

* TestPythonPybind allows testing for both Py2 and Py3 like it is done
in many other packages

* TestPythonPybind does not inherit from TestPythonPackageBase as usually done
  (1) because I need the br2-external feature to ship the example.cpp containing the custom macro
  (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context

* Although TestPythonPybind does have a TestPythonBase.config base at the same time,
as it is most convenient to have a valid python context

* TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases,
because we do not involve the emulator

* TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3
* TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3

---
 DEVELOPERS                                    |  3 ++
 .../br2-external/python-pybind/Config.in      |  1 +
 .../br2-external/python-pybind/external.desc  |  1 +
 .../br2-external/python-pybind/external.mk    |  1 +
 .../package/python-pybind-example/Config.in   |  5 ++
 .../package/python-pybind-example/example.cpp | 16 +++++++
 .../python-pybind-example.mk                  | 47 ++++++++++++++++++
 .../tests/package/sample_python_pybind.py     |  4 ++
 .../tests/package/test_python_pybind.py       | 48 +++++++++++++++++++
 9 files changed, 126 insertions(+)
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
 create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
 create mode 100644 support/testing/tests/package/sample_python_pybind.py
 create mode 100644 support/testing/tests/package/test_python_pybind.py

Comments

Arnout Vandecappelle Jan. 7, 2022, 9:57 p.m. UTC | #1 
On 04/01/2022 13:39, guillaume.bressaix@gmail.com wrote:
> From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com>
> 
> python-pybind is a header only library, most of the time used as a host-package,
> to customize the host/usr/python interpreter capacity (at build time) with C++ based features.
> 
> Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com>

  I applied to master with many changes:

      - Retain python3 only.
      - python-pybind is a target package, not host.
      - Select python-pybind instead of depend.
      - Simplify python-pybind-example package.
      - Check in python-pybind-example build if pybind11.get_include()
        produces output.
      - Don't use python3 -m pybind11 --includes: it includes the main python
        includes, which are for the host, not for the target.
      - Use TestPythonPackageBase instead of open-coding something imported
        with host python.

  However, I hadn't noticed that the original author of this test was Adam. In 
the future, please make sure that you don't claim authorship on a patch that is 
actually from someone else!

  Regards,
  Arnout

> ---
> This test case enhances the /host/usr/python interpreter with a C++ macro.
> 
> The test delivers a C++ macro contained in its br-external/example.cpp.
> We compile it against the host context.
> We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained
> in the host-python system path (import is easy).
> The macro is an integer adder, written in C++ that we can now call in host-python.
> 
> The test infrastructure should actually be declared "host-generic-package"
> instead of "generic-package", to be consistent with Buildroot infrastructure.
> But I am not able to get this to actually do anything, if I declare this package
> as a host-generic and "Config.in.host" instead of "Config.in". To me, this is
> not too important
> 
> * TestPythonPybind allows testing for both Py2 and Py3 like it is done
> in many other packages
> 
> * TestPythonPybind does not inherit from TestPythonPackageBase as usually done
>    (1) because I need the br2-external feature to ship the example.cpp containing the custom macro
>    (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context
> 
> * Although TestPythonPybind does have a TestPythonBase.config base at the same time,
> as it is most convenient to have a valid python context
> 
> * TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases,
> because we do not involve the emulator
> 
> * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3
> * TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3
> 
> ---
>   DEVELOPERS                                    |  3 ++
>   .../br2-external/python-pybind/Config.in      |  1 +
>   .../br2-external/python-pybind/external.desc  |  1 +
>   .../br2-external/python-pybind/external.mk    |  1 +
>   .../package/python-pybind-example/Config.in   |  5 ++
>   .../package/python-pybind-example/example.cpp | 16 +++++++
>   .../python-pybind-example.mk                  | 47 ++++++++++++++++++
>   .../tests/package/sample_python_pybind.py     |  4 ++
>   .../tests/package/test_python_pybind.py       | 48 +++++++++++++++++++
>   9 files changed, 126 insertions(+)
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
>   create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
>   create mode 100644 support/testing/tests/package/sample_python_pybind.py
>   create mode 100644 support/testing/tests/package/test_python_pybind.py
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 21e4f2a84c..130ac3db73 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1120,6 +1120,9 @@ F:	package/liquid-dsp/
>   F:	package/pixiewps/
>   F:	package/python-pybind/
>   F:	package/reaver/
> +F:	support/testing/tests/package/br2-external/python-pybind
> +F:	support/testing/tests/package/sample_python_pybind.py
> +F:	support/testing/tests/package/test_python_pybind.py
>   
>   N:	Guo Ren <ren_guo@c-sky.com>
>   F:	arch/Config.in.csky
> diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in
> new file mode 100644
> index 0000000000..70c77157b3
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in
> @@ -0,0 +1 @@
> +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in"
> diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc
> new file mode 100644
> index 0000000000..eef5e0f5a0
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc
> @@ -0,0 +1 @@
> +name: PYTHON_PYBIND
> diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk
> new file mode 100644
> index 0000000000..3501f3135e
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk
> @@ -0,0 +1 @@
> +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk))
> diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> new file mode 100644
> index 0000000000..773d021a53
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> @@ -0,0 +1,5 @@
> +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE
> +	bool "python-pybind-example"
> +	depends on BR2_PACKAGE_PYTHON_PYBIND
> +	help
> +	  This test creates a cpp macro later used on target in python
> diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> new file mode 100644
> index 0000000000..f2eea8e48d
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> @@ -0,0 +1,16 @@
> +#include <pybind11/pybind11.h>
> +namespace py = pybind11;
> +
> +int add (int i, int j) {
> +    return i + j;
> +}
> +
> +PYBIND11_MODULE (example, m) {
> +    // optional module description
> +    m.doc() = "pybind11 example plugin";
> +    // test a module method
> +    m.def("add", &add, "example::add adds two integer numbers");
> +    // test a module attribute
> +    py::object hello = py::cast("Hello World");
> +    m.attr("says") = hello;
> +}
> diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
> new file mode 100644
> index 0000000000..85dd09d93f
> --- /dev/null
> +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
> @@ -0,0 +1,47 @@
> +################################################################################
> +#
> +# python-pybind-example
> +#
> +################################################################################
> +
> +# this builds a C++ macro "add(a,b)"
> +# that we expose to host-python with a custom install
> +# and that the python test script will later use
> +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind
> +
> +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS)
> +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared
> +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC
> +
> +ifeq ($(BR2_PACKAGE_PYTHON3),y)
> +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR)
> +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3
> +else
> +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR)
> +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2
> +endif
> +
> +# retrieve pybind11 include paths
> +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \
> +	$(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes)
> +
> +# .so to be installed must have exact suffix
> +# otherwise import() in python will not work
> +HOST_LIB_BINARY_SUFFIX = \
> +	$(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix)
> +
> +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS
> +	$(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D)
> +	cd $(@D); \
> +			$(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \
> +				example.cpp -o example$(HOST_LIB_BINARY_SUFFIX)
> +endef
> +
> +# installs into host/python sys.path
> +# so the new macro is naturally known
> +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS
> +	$(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \
> +		$(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX)
> +endef
> +
> +$(eval $(generic-package))
> diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py
> new file mode 100644
> index 0000000000..605c0bab15
> --- /dev/null
> +++ b/support/testing/tests/package/sample_python_pybind.py
> @@ -0,0 +1,4 @@
> +#!/usr/bin/env python
> +import example
> +print(example.add(1, 2))
> +print(example.says)
> diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py
> new file mode 100644
> index 0000000000..7a68d6512a
> --- /dev/null
> +++ b/support/testing/tests/package/test_python_pybind.py
> @@ -0,0 +1,48 @@
> +import os
> +import infra
> +import subprocess
> +from tests.package.test_python import TestPythonPackageBase
> +
> +class TestPythonPybind (infra.basetest.BRTest):
> +	config = TestPythonPackageBase.config # python minimal requirements
> +	sample_script = "tests/package/sample_python_pybind.py"
> +	# ship examples macro & installs it to host
> +	br2_external = [infra.filepath("tests/package/br2-external/python-pybind")]
> +
> +class TestPythonPy2Pybind (TestPythonPybind):
> +	__test__ = True
> +	config = TestPythonPybind.config + \
> +		"""
> +		BR2_PACKAGE_PYTHON=y
> +		BR2_PACKAGE_PYTHON_PYBIND=y
> +		BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
> +		"""
> +
> +	def test_run(self):
> +		host_interpreter = os.path.join(self.builddir,"host","usr","bin","python")
> +		# test new c++->py macro exposed to host interpreter
> +		cmd = [host_interpreter, infra.filepath(self.sample_script)]
> +		output = subprocess.check_output(cmd)
> +		result = int(output.splitlines()[0])
> +		attribute = output.splitlines()[1].decode("utf-8")
> +		self.assertEqual(result,3) # 2+1 using '+' macro from cpp
> +		self.assertEqual(attribute,"Hello World") # macro special attribute
> +
> +class TestPythonPy3Pybind (TestPythonPybind):
> +	__test__ = True
> +	config = TestPythonPybind.config + \
> +		"""
> +		BR2_PACKAGE_PYTHON3=y
> +		BR2_PACKAGE_PYTHON_PYBIND=y
> +		BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
> +		"""
> +
> +	def test_run(self):
> +		host_interpreter = os.path.join(self.builddir,"host","usr","bin","python")
> +		# test new c++->py macro exposed to host interpreter
> +		cmd = [host_interpreter, infra.filepath(self.sample_script)]
> +		output = subprocess.check_output(cmd)
> +		result = int(output.splitlines()[0])
> +		attribute = output.splitlines()[1].decode("utf-8")
> +		self.assertEqual(result,3) # 2+1 using '+' macro from cpp
> +		self.assertEqual(attribute,"Hello World") # macro special attribute
>
Guillaume Bres Jan. 8, 2022, 10:26 a.m. UTC | #2 
Hello Arnout,

>In the future, please make sure that you don't claim authorship on a patch
that is actually from someone else!

well I don't understand how the first submitted test/example relates to a
real use case or demonstrates something viable.
For me pybind is a compile time feature to enhance the compiler capacity.
So I was really confused as to what was submitted 2 years ago could
actually demonstrate anything.
Hence the different and kind of tweaked approach that I proposed.

I think we will refer to these notes as the holy bible as of now
https://git.busybox.net/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e

> Generated with scanpypi and converted to host.
that seems a useful tool to use

> I bumped [python-pybind] to 2.9.0 instead and applied to master, thanks.
thanks I did not know it was out there

Guillaume W. Bres
Software engineer
<guillaume.bressaix@gmail.com>


Le ven. 7 janv. 2022 à 22:57, Arnout Vandecappelle <arnout@mind.be> a
écrit :

>
>
> On 04/01/2022 13:39, guillaume.bressaix@gmail.com wrote:
> > From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com>
> >
> > python-pybind is a header only library, most of the time used as a
> host-package,
> > to customize the host/usr/python interpreter capacity (at build time)
> with C++ based features.
> >
> > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com>
>
>   I applied to master with many changes:
>
>       - Retain python3 only.
>       - python-pybind is a target package, not host.
>       - Select python-pybind instead of depend.
>       - Simplify python-pybind-example package.
>       - Check in python-pybind-example build if pybind11.get_include()
>         produces output.
>       - Don't use python3 -m pybind11 --includes: it includes the main
> python
>         includes, which are for the host, not for the target.
>       - Use TestPythonPackageBase instead of open-coding something imported
>         with host python.
>
>   However, I hadn't noticed that the original author of this test was
> Adam. In
> the future, please make sure that you don't claim authorship on a patch
> that is
> actually from someone else!
>
>   Regards,
>   Arnout
>
> > ---
> > This test case enhances the /host/usr/python interpreter with a C++
> macro.
> >
> > The test delivers a C++ macro contained in its br-external/example.cpp.
> > We compile it against the host context.
> > We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively
> contained
> > in the host-python system path (import is easy).
> > The macro is an integer adder, written in C++ that we can now call in
> host-python.
> >
> > The test infrastructure should actually be declared
> "host-generic-package"
> > instead of "generic-package", to be consistent with Buildroot
> infrastructure.
> > But I am not able to get this to actually do anything, if I declare this
> package
> > as a host-generic and "Config.in.host" instead of "Config.in". To me,
> this is
> > not too important
> >
> > * TestPythonPybind allows testing for both Py2 and Py3 like it is done
> > in many other packages
> >
> > * TestPythonPybind does not inherit from TestPythonPackageBase as
> usually done
> >    (1) because I need the br2-external feature to ship the example.cpp
> containing the custom macro
> >    (2) because TestPythonPackageBase always involves the emulator, which
> we do not want in our context
> >
> > * Although TestPythonPybind does have a TestPythonBase.config base at
> the same time,
> > as it is most convenient to have a valid python context
> >
> > * TestPythonPybind uses subprocess, as similarly done in 'core' on
> 'infra' test cases,
> > because we do not involve the emulator
> >
> > * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3
> > * TestPythonPybind tests a custom module attribute, written in C++, used
> in Python 2/3
> >
> > ---
> >   DEVELOPERS                                    |  3 ++
> >   .../br2-external/python-pybind/Config.in      |  1 +
> >   .../br2-external/python-pybind/external.desc  |  1 +
> >   .../br2-external/python-pybind/external.mk    |  1 +
> >   .../package/python-pybind-example/Config.in   |  5 ++
> >   .../package/python-pybind-example/example.cpp | 16 +++++++
> >   .../python-pybind-example.mk                  | 47 ++++++++++++++++++
> >   .../tests/package/sample_python_pybind.py     |  4 ++
> >   .../tests/package/test_python_pybind.py       | 48 +++++++++++++++++++
> >   9 files changed, 126 insertions(+)
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/Config.in
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/external.desc
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/external.mk
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> >   create mode 100644
> support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/
> python-pybind-example.mk
> >   create mode 100644
> support/testing/tests/package/sample_python_pybind.py
> >   create mode 100644 support/testing/tests/package/test_python_pybind.py
> >
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index 21e4f2a84c..130ac3db73 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -1120,6 +1120,9 @@ F:      package/liquid-dsp/
> >   F:  package/pixiewps/
> >   F:  package/python-pybind/
> >   F:  package/reaver/
> > +F:   support/testing/tests/package/br2-external/python-pybind
> > +F:   support/testing/tests/package/sample_python_pybind.py
> > +F:   support/testing/tests/package/test_python_pybind.py
> >
> >   N:  Guo Ren <ren_guo@c-sky.com>
> >   F:  arch/Config.in.csky
> > diff --git
> a/support/testing/tests/package/br2-external/python-pybind/Config.in
> b/support/testing/tests/package/br2-external/python-pybind/Config.in
> > new file mode 100644
> > index 0000000000..70c77157b3
> > --- /dev/null
> > +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in
> > @@ -0,0 +1 @@
> > +source
> "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in"
> > diff --git
> a/support/testing/tests/package/br2-external/python-pybind/external.desc
> b/support/testing/tests/package/br2-external/python-pybind/external.desc
> > new file mode 100644
> > index 0000000000..eef5e0f5a0
> > --- /dev/null
> > +++
> b/support/testing/tests/package/br2-external/python-pybind/external.desc
> > @@ -0,0 +1 @@
> > +name: PYTHON_PYBIND
> > diff --git a/support/testing/tests/package/br2-external/python-pybind/
> external.mk b/support/testing/tests/package/br2-external/python-pybind/
> external.mk
> > new file mode 100644
> > index 0000000000..3501f3135e
> > --- /dev/null
> > +++ b/support/testing/tests/package/br2-external/python-pybind/
> external.mk
> > @@ -0,0 +1 @@
> > +include $(sort $(wildcard
> $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk))
> > diff --git
> a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> > new file mode 100644
> > index 0000000000..773d021a53
> > --- /dev/null
> > +++
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
> > @@ -0,0 +1,5 @@
> > +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE
> > +     bool "python-pybind-example"
> > +     depends on BR2_PACKAGE_PYTHON_PYBIND
> > +     help
> > +       This test creates a cpp macro later used on target in python
> > diff --git
> a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> > new file mode 100644
> > index 0000000000..f2eea8e48d
> > --- /dev/null
> > +++
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
> > @@ -0,0 +1,16 @@
> > +#include <pybind11/pybind11.h>
> > +namespace py = pybind11;
> > +
> > +int add (int i, int j) {
> > +    return i + j;
> > +}
> > +
> > +PYBIND11_MODULE (example, m) {
> > +    // optional module description
> > +    m.doc() = "pybind11 example plugin";
> > +    // test a module method
> > +    m.def("add", &add, "example::add adds two integer numbers");
> > +    // test a module attribute
> > +    py::object hello = py::cast("Hello World");
> > +    m.attr("says") = hello;
> > +}
> > diff --git
> a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/
> python-pybind-example.mk
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/
> python-pybind-example.mk
> > new file mode 100644
> > index 0000000000..85dd09d93f
> > --- /dev/null
> > +++
> b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/
> python-pybind-example.mk
> > @@ -0,0 +1,47 @@
> >
> +################################################################################
> > +#
> > +# python-pybind-example
> > +#
> >
> +################################################################################
> > +
> > +# this builds a C++ macro "add(a,b)"
> > +# that we expose to host-python with a custom install
> > +# and that the python test script will later use
> > +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind
> > +
> > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS)
> > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared
> > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC
> > +
> > +ifeq ($(BR2_PACKAGE_PYTHON3),y)
> > +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR)
> > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3
> > +else
> > +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR)
> > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2
> > +endif
> > +
> > +# retrieve pybind11 include paths
> > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \
> > +     $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes)
> > +
> > +# .so to be installed must have exact suffix
> > +# otherwise import() in python will not work
> > +HOST_LIB_BINARY_SUFFIX = \
> > +     $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix)
> > +
> > +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS
> > +     $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D)
> > +     cd $(@D); \
> > +                     $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \
> > +                             example.cpp -o
> example$(HOST_LIB_BINARY_SUFFIX)
> > +endef
> > +
> > +# installs into host/python sys.path
> > +# so the new macro is naturally known
> > +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS
> > +     $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \
> > +
>  $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX)
> > +endef
> > +
> > +$(eval $(generic-package))
> > diff --git a/support/testing/tests/package/sample_python_pybind.py
> b/support/testing/tests/package/sample_python_pybind.py
> > new file mode 100644
> > index 0000000000..605c0bab15
> > --- /dev/null
> > +++ b/support/testing/tests/package/sample_python_pybind.py
> > @@ -0,0 +1,4 @@
> > +#!/usr/bin/env python
> > +import example
> > +print(example.add(1, 2))
> > +print(example.says)
> > diff --git a/support/testing/tests/package/test_python_pybind.py
> b/support/testing/tests/package/test_python_pybind.py
> > new file mode 100644
> > index 0000000000..7a68d6512a
> > --- /dev/null
> > +++ b/support/testing/tests/package/test_python_pybind.py
> > @@ -0,0 +1,48 @@
> > +import os
> > +import infra
> > +import subprocess
> > +from tests.package.test_python import TestPythonPackageBase
> > +
> > +class TestPythonPybind (infra.basetest.BRTest):
> > +     config = TestPythonPackageBase.config # python minimal requirements
> > +     sample_script = "tests/package/sample_python_pybind.py"
> > +     # ship examples macro & installs it to host
> > +     br2_external =
> [infra.filepath("tests/package/br2-external/python-pybind")]
> > +
> > +class TestPythonPy2Pybind (TestPythonPybind):
> > +     __test__ = True
> > +     config = TestPythonPybind.config + \
> > +             """
> > +             BR2_PACKAGE_PYTHON=y
> > +             BR2_PACKAGE_PYTHON_PYBIND=y
> > +             BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
> > +             """
> > +
> > +     def test_run(self):
> > +             host_interpreter =
> os.path.join(self.builddir,"host","usr","bin","python")
> > +             # test new c++->py macro exposed to host interpreter
> > +             cmd = [host_interpreter,
> infra.filepath(self.sample_script)]
> > +             output = subprocess.check_output(cmd)
> > +             result = int(output.splitlines()[0])
> > +             attribute = output.splitlines()[1].decode("utf-8")
> > +             self.assertEqual(result,3) # 2+1 using '+' macro from cpp
> > +             self.assertEqual(attribute,"Hello World") # macro special
> attribute
> > +
> > +class TestPythonPy3Pybind (TestPythonPybind):
> > +     __test__ = True
> > +     config = TestPythonPybind.config + \
> > +             """
> > +             BR2_PACKAGE_PYTHON3=y
> > +             BR2_PACKAGE_PYTHON_PYBIND=y
> > +             BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
> > +             """
> > +
> > +     def test_run(self):
> > +             host_interpreter =
> os.path.join(self.builddir,"host","usr","bin","python")
> > +             # test new c++->py macro exposed to host interpreter
> > +             cmd = [host_interpreter,
> infra.filepath(self.sample_script)]
> > +             output = subprocess.check_output(cmd)
> > +             result = int(output.splitlines()[0])
> > +             attribute = output.splitlines()[1].decode("utf-8")
> > +             self.assertEqual(result,3) # 2+1 using '+' macro from cpp
> > +             self.assertEqual(attribute,"Hello World") # macro special
> attribute
> >
>
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index 21e4f2a84c..130ac3db73 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1120,6 +1120,9 @@  F:	package/liquid-dsp/
 F:	package/pixiewps/
 F:	package/python-pybind/
 F:	package/reaver/
+F:	support/testing/tests/package/br2-external/python-pybind
+F:	support/testing/tests/package/sample_python_pybind.py
+F:	support/testing/tests/package/test_python_pybind.py
 
 N:	Guo Ren <ren_guo@c-sky.com>
 F:	arch/Config.in.csky
diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in
new file mode 100644
index 0000000000..70c77157b3
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/Config.in
@@ -0,0 +1 @@ 
+source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in"
diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc
new file mode 100644
index 0000000000..eef5e0f5a0
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/external.desc
@@ -0,0 +1 @@ 
+name: PYTHON_PYBIND
diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk
new file mode 100644
index 0000000000..3501f3135e
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/external.mk
@@ -0,0 +1 @@ 
+include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk))
diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
new file mode 100644
index 0000000000..773d021a53
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in
@@ -0,0 +1,5 @@ 
+config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE
+	bool "python-pybind-example"
+	depends on BR2_PACKAGE_PYTHON_PYBIND
+	help
+	  This test creates a cpp macro later used on target in python
diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
new file mode 100644
index 0000000000..f2eea8e48d
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp
@@ -0,0 +1,16 @@ 
+#include <pybind11/pybind11.h>
+namespace py = pybind11;
+
+int add (int i, int j) {
+    return i + j;
+}
+
+PYBIND11_MODULE (example, m) {
+    // optional module description
+    m.doc() = "pybind11 example plugin";
+    // test a module method
+    m.def("add", &add, "example::add adds two integer numbers");
+    // test a module attribute
+    py::object hello = py::cast("Hello World");
+    m.attr("says") = hello;
+}
diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
new file mode 100644
index 0000000000..85dd09d93f
--- /dev/null
+++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
@@ -0,0 +1,47 @@ 
+################################################################################
+#
+# python-pybind-example
+#
+################################################################################
+
+# this builds a C++ macro "add(a,b)"
+# that we expose to host-python with a custom install
+# and that the python test script will later use
+PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind
+
+PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS)
+PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared
+PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC
+
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR)
+PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3
+else
+PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR)
+PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2
+endif
+
+# retrieve pybind11 include paths
+PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \
+	$(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes)
+
+# .so to be installed must have exact suffix
+# otherwise import() in python will not work
+HOST_LIB_BINARY_SUFFIX = \
+	$(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix)
+
+define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS
+	$(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D)
+	cd $(@D); \
+			$(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \
+				example.cpp -o example$(HOST_LIB_BINARY_SUFFIX)
+endef
+
+# installs into host/python sys.path
+# so the new macro is naturally known
+define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \
+		$(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX)
+endef
+
+$(eval $(generic-package))
diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py
new file mode 100644
index 0000000000..605c0bab15
--- /dev/null
+++ b/support/testing/tests/package/sample_python_pybind.py
@@ -0,0 +1,4 @@ 
+#!/usr/bin/env python
+import example
+print(example.add(1, 2))
+print(example.says)
diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py
new file mode 100644
index 0000000000..7a68d6512a
--- /dev/null
+++ b/support/testing/tests/package/test_python_pybind.py
@@ -0,0 +1,48 @@ 
+import os
+import infra
+import subprocess
+from tests.package.test_python import TestPythonPackageBase
+
+class TestPythonPybind (infra.basetest.BRTest):
+	config = TestPythonPackageBase.config # python minimal requirements
+	sample_script = "tests/package/sample_python_pybind.py"
+	# ship examples macro & installs it to host
+	br2_external = [infra.filepath("tests/package/br2-external/python-pybind")]
+
+class TestPythonPy2Pybind (TestPythonPybind):
+	__test__ = True
+	config = TestPythonPybind.config + \
+		"""
+		BR2_PACKAGE_PYTHON=y
+		BR2_PACKAGE_PYTHON_PYBIND=y
+		BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
+		"""
+
+	def test_run(self):
+		host_interpreter = os.path.join(self.builddir,"host","usr","bin","python")
+		# test new c++->py macro exposed to host interpreter
+		cmd = [host_interpreter, infra.filepath(self.sample_script)]
+		output = subprocess.check_output(cmd)
+		result = int(output.splitlines()[0])
+		attribute = output.splitlines()[1].decode("utf-8")
+		self.assertEqual(result,3) # 2+1 using '+' macro from cpp
+		self.assertEqual(attribute,"Hello World") # macro special attribute
+
+class TestPythonPy3Pybind (TestPythonPybind):
+	__test__ = True
+	config = TestPythonPybind.config + \
+		"""
+		BR2_PACKAGE_PYTHON3=y
+		BR2_PACKAGE_PYTHON_PYBIND=y
+		BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y
+		"""
+
+	def test_run(self):
+		host_interpreter = os.path.join(self.builddir,"host","usr","bin","python")
+		# test new c++->py macro exposed to host interpreter
+		cmd = [host_interpreter, infra.filepath(self.sample_script)]
+		output = subprocess.check_output(cmd)
+		result = int(output.splitlines()[0])
+		attribute = output.splitlines()[1].decode("utf-8")
+		self.assertEqual(result,3) # 2+1 using '+' macro from cpp
+		self.assertEqual(attribute,"Hello World") # macro special attribute