diff options
Diffstat (limited to 'mpm/python')
| -rw-r--r-- | mpm/python/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | mpm/python/pyusrp_periphs/converters.hpp | 87 | ||||
| -rw-r--r-- | mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp | 36 | ||||
| -rw-r--r-- | mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp | 63 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/xports/xportmgr_liberio.py | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/xports/xportmgr_udp.py | 2 |
6 files changed, 32 insertions, 161 deletions
diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index 84cff3e54..c78dc60b1 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -19,8 +19,9 @@ target_include_directories(pyusrp_periphs PUBLIC ${CMAKE_SOURCE_DIR}/lib/ ${UHD_HOST_ROOT}/lib/usrp/common ${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver + ${UHD_HOST_ROOT}/lib/deps/pybind11/include ) -target_link_libraries(pyusrp_periphs ${Boost_PYTHON_LIBRARY} ${Boost_LIBRARIES} usrp-periphs) +target_link_libraries(pyusrp_periphs ${Boost_LIBRARIES} usrp-periphs) add_custom_command(TARGET pyusrp_periphs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libpyusrp_periphs.so ${CMAKE_CURRENT_BINARY_DIR}/usrp_mpm/libpyusrp_periphs.so) set(USRP_MPM_FILES "") 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 <boost/python.hpp> -#include <boost/python/stl_iterator.hpp> -#include <string> -#include <vector> - -namespace bp = boost::python; - -template <typename MapType> 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 <typename Container> 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 <typename Container> iterable_converter& from_python() - { - bp::converter::registry::push_back(&iterable_converter::convertible, - &iterable_converter::construct<Container>, - bp::type_id<Container>()); - return *this; - } - - static void* convertible(PyObject* object) - { - return PyObject_GetIter(object) ? object : NULL; - } - - template <typename Container> - 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<Container> storage_type; - void* storage = reinterpret_cast<storage_type*>(data)->storage.bytes; - - typedef bp::stl_input_iterator<typename Container::value_type> 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<std::vector<std::string>, - iterable_to_python_list<std::vector<std::string>>, - 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 <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); } 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 <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; -//! 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<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>); - inline ~scoped_gil_release() - { - PyEval_RestoreThread(_thread_state); - _thread_state = nullptr; - } - -private: - PyThreadState* _thread_state; -}; - -//#include "types.hpp" -#include "../converters.hpp" #include <mpm/ad937x/ad937x_ctrl.hpp> #include <mpm/dboards/magnesium_manager.hpp> #include <mpm/i2c/i2c_python.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_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); } diff --git a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py index d5c0d2e97..b035e64fe 100644 --- a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py +++ b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py @@ -83,7 +83,7 @@ class XportMgrLiberio(object): def commit_xport(self, sid, xport_info): " Commit liberio transport " chan = int(xport_info['dma_chan']) - xbar_iface = lib.xbar.xbar.make(self.xbar_dev) + xbar_iface = lib.xbar.xbar(self.xbar_dev) xbar_iface.set_route(sid.src_addr, self.xbar_port) self._dma_dispatcher.set_route(sid.reversed(), chan) self.log.trace("Liberio transport successfully committed!") diff --git a/mpm/python/usrp_mpm/xports/xportmgr_udp.py b/mpm/python/usrp_mpm/xports/xportmgr_udp.py index f8fcc6ede..17762bb76 100644 --- a/mpm/python/usrp_mpm/xports/xportmgr_udp.py +++ b/mpm/python/usrp_mpm/xports/xportmgr_udp.py @@ -325,7 +325,7 @@ class XportMgrUDP(object): xbar_port = self.iface_config[eth_iface]['xbar_port'] self.log.trace("Using Ethernet interface %s, crossbar port %d", eth_iface, xbar_port) - xbar_iface = lib.xbar.xbar.make(self.get_xbar_dev(eth_iface)) + xbar_iface = lib.xbar.xbar(self.get_xbar_dev(eth_iface)) xbar_iface.set_route(sid.src_addr, xbar_port) self._eth_dispatchers[eth_iface].set_route( sid.reversed(), sender_addr, sender_port) |