updated dependencies

wjakob · Nov 9, 2017 · 3e5257e · 3e5257e
1 parent e939192
commit 3e5257e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/ext/pybind11 b/ext/pybind11
diff --git a/ext/tinyformat b/ext/tinyformat
diff --git a/include/layer/vector.h b/include/layer/vector.h
@@ -51,6 +51,9 @@ template <typename Scalar, int _Dimension> struct TVector : public Eigen::Matrix
     /// Create a new 4D vector (type error if \c Dimension != 4)
     TVector(Scalar x, Scalar y, Scalar z, Scalar w) : Base(x, y, z, w) { }
 
+    /// Dummy constructor
+    TVector(ssize_t rows, ssize_t cols) { assert(rows * cols == Dimension); (void) rows; (void) cols; }
+
     /// Construct a vector from a dense Eigen expression template
     template <typename Derived> TVector(const Eigen::DenseBase<Derived>& p)
         : Base(p) { }

diff --git a/src/py_filesystem.cpp b/src/py_filesystem.cpp
@@ -70,7 +70,7 @@ void python_export_filesystem(py::module &m) {
             return oss.str();
         });
 
-    py::class_<MemoryMappedFile>(fs_module, "MemoryMappedFile")
+    py::class_<MemoryMappedFile>(fs_module, "MemoryMappedFile", py::buffer_protocol())
         .def(py::init<fs::path, size_t>())
         .def(py::init<fs::path, bool>())
         .def(py::init<fs::path>())

diff --git a/src/py_layer.cpp b/src/py_layer.cpp
@@ -62,7 +62,7 @@ void python_export_layer(py::module &m) {
         .def_property_readonly("transmissionBottomTop", [](const LayerMode &m) -> MatrixX { return m.transmissionBottomTop; }, D(LayerMode, transmissionBottomTop));
 
     py::class_<Layer>(m, "Layer", D(Layer))
-        .def(py::init<const VectorX &, const VectorX &, int>(), py::arg("nodes"), py::arg("weights"), py::arg("nFourierOrders") = 1)
+        .def(py::init<const VectorX &, const VectorX &, size_t>(), py::arg("nodes"), py::arg("weights"), py::arg("nFourierOrders") = 1)
         .def(py::init<const Layer&>())
         .def("reverse", &Layer::reverse, D(Layer, reverse))
         .def("clear", &Layer::clear, D(Layer, clear))

diff --git a/src/python.cpp b/src/python.cpp
@@ -18,8 +18,8 @@ PYTHON_DECLARE(layer);
 PYTHON_DECLARE(fresnel);
 PYTHON_DECLARE(quad);
 
-PYBIND11_PLUGIN(layerlab) {
-    py::module m("layerlab", "Layer lab Python plugin");
+PYBIND11_MODULE(layerlab, m) {
+    m.doc() = "Layer lab Python plugin";
 
     PYTHON_IMPORT(math);
     PYTHON_IMPORT(spline);
@@ -28,6 +28,4 @@ PYBIND11_PLUGIN(layerlab) {
     PYTHON_IMPORT(layer);
     PYTHON_IMPORT(fresnel);
     PYTHON_IMPORT(quad);
-
-    return m.ptr();
 }