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/n3xx/pyusrp_periphs.cpp | 63 +++++------------------ 1 file changed, 14 insertions(+), 49 deletions(-) (limited to 'mpm/python/pyusrp_periphs/n3xx') 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