From 164d76dcfdefe888d0e152d33827187d3d47b57e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 7 Feb 2019 15:34:17 +0100 Subject: mpm: python: Move from Boost.Python to PyBind11 --- mpm/python/pyusrp_periphs/converters.hpp | 87 ----------------------- mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp | 36 ++++------ mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp | 63 ++++------------ 3 files changed, 28 insertions(+), 158 deletions(-) delete mode 100644 mpm/python/pyusrp_periphs/converters.hpp (limited to 'mpm/python/pyusrp_periphs') diff --git a/mpm/python/pyusrp_periphs/converters.hpp b/mpm/python/pyusrp_periphs/converters.hpp deleted file mode 100644 index 849e8b90e..000000000 --- a/mpm/python/pyusrp_periphs/converters.hpp +++ /dev/null @@ -1,87 +0,0 @@ -// -// Copyright 2017 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#pragma once - -#include -#include -#include -#include - -namespace bp = boost::python; - -template struct map_to_python_dict -{ - static PyObject* convert(MapType const& input_map) - { - bp::dict py_dict; - for (const auto& element : input_map) { - py_dict[element.first] = element.second; - } - return bp::incref(py_dict.ptr()); - } -}; - -template struct iterable_to_python_list -{ - static PyObject* convert(Container const& input) - { - bp::list py_list; - for (const auto& element : input) { - py_list.append(element); - } - return bp::incref(py_list.ptr()); - } -}; - -// Converter for std::vector / std::list arguments from python iterables -struct iterable_converter -{ - template iterable_converter& from_python() - { - bp::converter::registry::push_back(&iterable_converter::convertible, - &iterable_converter::construct, - bp::type_id()); - return *this; - } - - static void* convertible(PyObject* object) - { - return PyObject_GetIter(object) ? object : NULL; - } - - template - static void construct( - PyObject* object, bp::converter::rvalue_from_python_stage1_data* data) - { - // Object is a borrowed reference, so create a handle indicting it is - // borrowed for proper reference counting. - bp::handle<> handle(bp::borrowed(object)); - - // Obtain a handle to the memory block that the converter has allocated - // for the C++ type. - typedef bp::converter::rvalue_from_python_storage storage_type; - void* storage = reinterpret_cast(data)->storage.bytes; - - typedef bp::stl_input_iterator iterator; - - // Allocate the C++ type into the converter's memory block, and assign - // its handle to the converter's convertible variable. The C++ - // container is populated by passing the begin and end iterators of - // the python object to the container's constructor. - new (storage) Container(iterator(bp::object(handle)), // begin - iterator()); // end - data->convertible = storage; - } -}; - -void export_converter() -{ - // LIBMPM_BOOST_PREAMBLE("helper") - bp::to_python_converter, - iterable_to_python_list>, - false>(); -} diff --git a/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp index 97ccfc864..74a3647db 100644 --- a/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp @@ -1,38 +1,30 @@ // // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // -// include hackery to only include boost python and define the macro here -#include +#include +namespace py = pybind11; #define LIBMPM_PYTHON -#define LIBMPM_BOOST_PREAMBLE(module) \ - /* Register submodule types */ \ - namespace bp = boost::python; \ - bp::object py_module( \ - bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ - bp::scope().attr(module) = py_module; \ - bp::scope io_scope = py_module; -#include "../converters.hpp" +// Allow boost::shared_ptr to be a holder class of an object (PyBind11 +// supports std::shared_ptr and std::unique_ptr out of the box) +#include +PYBIND11_DECLARE_HOLDER_TYPE(T, boost::shared_ptr); + #include #include #include #include #include -#include - -namespace bp = boost::python; -BOOST_PYTHON_MODULE(libpyusrp_periphs) +PYBIND11_MODULE(libpyusrp_periphs, m) { - bp::object package = bp::scope(); - package.attr("__path__") = "libpyusrp_periphs"; - export_converter(); - export_types(); - export_spi(); - export_xbar(); - export_catalina(); - export_neon(); + export_types(m); + export_spi(m); + export_xbar(m); + export_catalina(m); + export_neon(m); } diff --git a/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp index 85851677f..d4c430f72 100644 --- a/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp @@ -1,67 +1,32 @@ // // Copyright 2017 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // -// include hackery to only include boost python and define the macro here -#include +#include +namespace py = pybind11; #define LIBMPM_PYTHON -#define LIBMPM_BOOST_PREAMBLE(module) \ - /* Register submodule types */ \ - namespace bp = boost::python; \ - bp::object py_module( \ - bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ - bp::scope().attr(module) = py_module; \ - bp::scope io_scope = py_module; -//! RAII-style GIL release method -// -// To release the GIL using this method, simply instantiate this class in the -// scope that needs to release the GIL. -// -// Note that using this class assumes that threads have already been -// initialized. See also https://docs.python.org/3.5/c-api/init.html for more -// documentation on Python initialization and threads. -class scoped_gil_release -{ -public: - inline scoped_gil_release() - { - _thread_state = PyEval_SaveThread(); - } +// Allow boost::shared_ptr to be a holder class of an object (PyBind11 +// supports std::shared_ptr and std::unique_ptr out of the box) +#include +PYBIND11_DECLARE_HOLDER_TYPE(T, boost::shared_ptr); - inline ~scoped_gil_release() - { - PyEval_RestoreThread(_thread_state); - _thread_state = nullptr; - } - -private: - PyThreadState* _thread_state; -}; - -//#include "types.hpp" -#include "../converters.hpp" #include #include #include #include #include #include -#include - -namespace bp = boost::python; -BOOST_PYTHON_MODULE(libpyusrp_periphs) +PYBIND11_MODULE(libpyusrp_periphs, m) { - bp::object package = bp::scope(); - package.attr("__path__") = "libpyusrp_periphs"; - export_converter(); - export_types(); - export_spi(); - export_i2c(); - export_mykonos(); - export_xbar(); - export_magnesium(); + export_types(m); + export_spi(m); + export_i2c(m); + export_mykonos(m); + export_xbar(m); + export_magnesium(m); } -- cgit v1.2.3