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/e320/pyusrp_periphs.cpp | 36 +++++++++-------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'mpm/python/pyusrp_periphs/e320') 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); } -- cgit v1.2.3