mirror of
https://github.com/pybind/pybind11.git
synced 2024-12-01 09:27:12 +00:00
1d1f81b278
This commit includes modifications that are needed to get pybind11 to work with PyPy. The full test suite compiles and runs except for a last few functions that are commented out (due to problems in PyPy that were reported on the PyPy bugtracker). Two somewhat intrusive changes were needed to make it possible: two new tags ``py::buffer_protocol()`` and ``py::metaclass()`` must now be specified to the ``class_`` constructor if the class uses the buffer protocol and/or requires a metaclass (e.g. for static properties). Note that this is only for the PyPy version based on Python 2.7 for now. When the PyPy 3.x has caught up in terms of cpyext compliance, a PyPy 3.x patch will follow.
118 lines
4.1 KiB
C++
118 lines
4.1 KiB
C++
/*
|
|
tests/test_buffers.cpp -- supporting Pythons' buffer protocol
|
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
BSD-style license that can be found in the LICENSE file.
|
|
*/
|
|
|
|
#include "pybind11_tests.h"
|
|
#include "constructor_stats.h"
|
|
|
|
class Matrix {
|
|
public:
|
|
Matrix(size_t rows, size_t cols) : m_rows(rows), m_cols(cols) {
|
|
print_created(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
|
|
m_data = new float[rows*cols];
|
|
memset(m_data, 0, sizeof(float) * rows * cols);
|
|
}
|
|
|
|
Matrix(const Matrix &s) : m_rows(s.m_rows), m_cols(s.m_cols) {
|
|
print_copy_created(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
|
|
m_data = new float[m_rows * m_cols];
|
|
memcpy(m_data, s.m_data, sizeof(float) * m_rows * m_cols);
|
|
}
|
|
|
|
Matrix(Matrix &&s) : m_rows(s.m_rows), m_cols(s.m_cols), m_data(s.m_data) {
|
|
print_move_created(this);
|
|
s.m_rows = 0;
|
|
s.m_cols = 0;
|
|
s.m_data = nullptr;
|
|
}
|
|
|
|
~Matrix() {
|
|
print_destroyed(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
|
|
delete[] m_data;
|
|
}
|
|
|
|
Matrix &operator=(const Matrix &s) {
|
|
print_copy_assigned(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
|
|
delete[] m_data;
|
|
m_rows = s.m_rows;
|
|
m_cols = s.m_cols;
|
|
m_data = new float[m_rows * m_cols];
|
|
memcpy(m_data, s.m_data, sizeof(float) * m_rows * m_cols);
|
|
return *this;
|
|
}
|
|
|
|
Matrix &operator=(Matrix &&s) {
|
|
print_move_assigned(this, std::to_string(m_rows) + "x" + std::to_string(m_cols) + " matrix");
|
|
if (&s != this) {
|
|
delete[] m_data;
|
|
m_rows = s.m_rows; m_cols = s.m_cols; m_data = s.m_data;
|
|
s.m_rows = 0; s.m_cols = 0; s.m_data = nullptr;
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
float operator()(size_t i, size_t j) const {
|
|
return m_data[i*m_cols + j];
|
|
}
|
|
|
|
float &operator()(size_t i, size_t j) {
|
|
return m_data[i*m_cols + j];
|
|
}
|
|
|
|
float *data() { return m_data; }
|
|
|
|
size_t rows() const { return m_rows; }
|
|
size_t cols() const { return m_cols; }
|
|
private:
|
|
size_t m_rows;
|
|
size_t m_cols;
|
|
float *m_data;
|
|
};
|
|
|
|
test_initializer buffers([](py::module &m) {
|
|
py::class_<Matrix> mtx(m, "Matrix", py::buffer_protocol());
|
|
|
|
mtx.def(py::init<size_t, size_t>())
|
|
/// Construct from a buffer
|
|
.def("__init__", [](Matrix &v, py::buffer b) {
|
|
py::buffer_info info = b.request();
|
|
if (info.format != py::format_descriptor<float>::format() || info.ndim != 2)
|
|
throw std::runtime_error("Incompatible buffer format!");
|
|
new (&v) Matrix(info.shape[0], info.shape[1]);
|
|
memcpy(v.data(), info.ptr, sizeof(float) * v.rows() * v.cols());
|
|
})
|
|
|
|
.def("rows", &Matrix::rows)
|
|
.def("cols", &Matrix::cols)
|
|
|
|
/// Bare bones interface
|
|
.def("__getitem__", [](const Matrix &m, std::pair<size_t, size_t> i) {
|
|
if (i.first >= m.rows() || i.second >= m.cols())
|
|
throw py::index_error();
|
|
return m(i.first, i.second);
|
|
})
|
|
.def("__setitem__", [](Matrix &m, std::pair<size_t, size_t> i, float v) {
|
|
if (i.first >= m.rows() || i.second >= m.cols())
|
|
throw py::index_error();
|
|
m(i.first, i.second) = v;
|
|
})
|
|
/// Provide buffer access
|
|
.def_buffer([](Matrix &m) -> py::buffer_info {
|
|
return py::buffer_info(
|
|
m.data(), /* Pointer to buffer */
|
|
sizeof(float), /* Size of one scalar */
|
|
py::format_descriptor<float>::format(), /* Python struct-style format descriptor */
|
|
2, /* Number of dimensions */
|
|
{ m.rows(), m.cols() }, /* Buffer dimensions */
|
|
{ sizeof(float) * m.rows(), /* Strides (in bytes) for each index */
|
|
sizeof(float) }
|
|
);
|
|
})
|
|
;
|
|
});
|