2015-07-05 18:05:44 +00:00
|
|
|
/*
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
example/example-buffers.cpp -- supporting Pythons' buffer protocol
|
2015-07-05 18:05:44 +00:00
|
|
|
|
2016-04-17 18:21:41 +00:00
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
2015-07-05 18:05:44 +00:00
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "example.h"
|
|
|
|
|
|
|
|
class Matrix {
|
|
|
|
public:
|
|
|
|
Matrix(size_t rows, size_t cols) : m_rows(rows), m_cols(cols) {
|
|
|
|
std::cout << "Value constructor: Creating a " << rows << "x" << cols << " matrix " << std::endl;
|
|
|
|
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) {
|
|
|
|
std::cout << "Copy constructor: Creating a " << m_rows << "x" << m_cols << " matrix " << std::endl;
|
|
|
|
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) {
|
|
|
|
std::cout << "Move constructor: Creating a " << m_rows << "x" << m_cols << " matrix " << std::endl;
|
|
|
|
s.m_rows = 0;
|
|
|
|
s.m_cols = 0;
|
|
|
|
s.m_data = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
~Matrix() {
|
|
|
|
std::cout << "Freeing a " << m_rows << "x" << m_cols << " matrix " << std::endl;
|
|
|
|
delete[] m_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
Matrix &operator=(const Matrix &s) {
|
|
|
|
std::cout << "Assignment operator : Creating a " << s.m_rows << "x" << s.m_cols << " matrix " << std::endl;
|
|
|
|
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) {
|
|
|
|
std::cout << "Move assignment operator : Creating a " << s.m_rows << "x" << s.m_cols << " matrix " << std::endl;
|
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
void init_ex_buffers(py::module &m) {
|
2015-07-05 18:05:44 +00:00
|
|
|
py::class_<Matrix> mtx(m, "Matrix");
|
|
|
|
|
|
|
|
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();
|
2016-05-04 20:22:48 +00:00
|
|
|
if (info.format != py::format_descriptor<float>::value || info.ndim != 2)
|
2015-07-05 18:05:44 +00:00
|
|
|
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(
|
2016-05-04 20:22:48 +00:00
|
|
|
m.data(), /* Pointer to buffer */
|
|
|
|
sizeof(float), /* Size of one scalar */
|
|
|
|
py::format_descriptor<float>::value, /* 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 */
|
2015-07-05 18:05:44 +00:00
|
|
|
sizeof(float) }
|
|
|
|
);
|
|
|
|
});
|
|
|
|
}
|