aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/python/pyusrp_periphs/e320
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-02-07 15:34:17 +0100
committerBrent Stapleton <brent.stapleton@ettus.com>2019-04-02 10:39:57 -0700
commit164d76dcfdefe888d0e152d33827187d3d47b57e (patch)
tree26a8de83ea27f938d3ab55ff37a6ee1ce911c783 /mpm/python/pyusrp_periphs/e320
parentfa659bbe1938875ef27eba2cbb60a43443a65f99 (diff)
downloaduhd-164d76dcfdefe888d0e152d33827187d3d47b57e.tar.gz
uhd-164d76dcfdefe888d0e152d33827187d3d47b57e.tar.bz2
uhd-164d76dcfdefe888d0e152d33827187d3d47b57e.zip
mpm: python: Move from Boost.Python to PyBind11
Diffstat (limited to 'mpm/python/pyusrp_periphs/e320')
-rw-r--r--mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp36
1 files changed, 14 insertions, 22 deletions
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 <boost/python.hpp>
+#include <pybind11/pybind11.h>
+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<T> to be a holder class of an object (PyBind11
+// supports std::shared_ptr and std::unique_ptr out of the box)
+#include <boost/shared_ptr.hpp>
+PYBIND11_DECLARE_HOLDER_TYPE(T, boost::shared_ptr<T>);
+
#include <mpm/ad9361/ad9361_ctrl.hpp>
#include <mpm/dboards/neon_manager.hpp>
#include <mpm/spi/spi_python.hpp>
#include <mpm/types/types_python.hpp>
#include <mpm/xbar_iface.hpp>
-#include <boost/noncopyable.hpp>
-
-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);
}