Linux build fixed

Author: JohanMabille

benchmark/CMakeLists.txt

@@ -61,9 +61,10 @@ set(XTENSOR_PYTHON_BENCHMARK
 )
 
 set(XTENSOR_PYTHON_BENCHMARK_TARGET benchmark_xtensor_python)
-add_library(${XTENSOR_PYTHON_BENCHMARK_TARGET} EXCLUDE_FROM_ALL
+add_library(${XTENSOR_PYTHON_BENCHMARK_TARGET} MODULE EXCLUDE_FROM_ALL
     ${XTENSOR_PYTHON_BENCHMARK} ${XTENSOR_PYTHON_HEADERS})
 
+set_target_properties(${XTENSOR_PYTHON_BENCHMARK_TARGET} PROPERTIES PREFIX "")
 set_target_properties(${XTENSOR_PYTHON_BENCHMARK_TARGET} PROPERTIES SUFFIX "${PYTHON_MODULE_EXTENSION}")
 
 if(APPLE)

benchmark/benchmark_pyarray.py

@@ -1,4 +1,4 @@
-from xtensor_python_benchmark import sum_array
+from benchmark_xtensor_python import sum_array
 import numpy as np
 
 u = np.ones(1000000, dtype=float)

benchmark/benchmark_pybind_array.py

@@ -1,4 +1,4 @@
-from xtensor_python_benchmark import pybind_sum_array
+from benchmark_xtensor_python import pybind_sum_array
 import numpy as np
 
 u = np.ones(1000000, dtype=float)

benchmark/benchmark_pytensor.py

@@ -1,4 +1,4 @@
-from xtensor_python_benchmark import sum_tensor
+from benchmark_xtensor_python import sum_tensor
 import numpy as np
 
 u = np.ones(1000000, dtype=float)

benchmark/main.cpp

@@ -11,15 +11,15 @@
 
 namespace py = pybind11;
 
-PYBIND11_PLUGIN(xtensor_python_benchmark)
+PYBIND11_PLUGIN(benchmark_xtensor_python)
 {
     if(_import_array() < 0)
     {
         PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
         return nullptr;
     }
 
-    py::module m("xtensor_python_benchmark", "Benchmark module for xtensor python bindings");
+    py::module m("benchmark_xtensor_python", "Benchmark module for xtensor python bindings");
 
     m.def("sum_array", [](xt::pyarray<double> const& x) {
             double sum = 0;

include/xtensor-python/pytensor.hpp

@@ -89,8 +89,8 @@ namespace xt
 
         pytensor() = default;
 
-        pytensor(pybind11::handle h, borrowed_t);
-        pytensor(pybind11::handle h, stolen_t);
+        pytensor(pybind11::handle h, pybind11::object::borrowed_t);
+        pytensor(pybind11::handle h, pybind11::object::stolen_t);
         pytensor(const pybind11::object &o);
 
         pytensor(const shape_type& shape, const strides_type& strides);
@@ -137,22 +137,22 @@ namespace xt
      ***************************/
 
     template <class T, std::size_t N>
-    inline pytensor<T, N>::pytensor(pybind11::handle h, borrowed_t)
-        : base_type(h, borrowed)
+    inline pytensor<T, N>::pytensor(pybind11::handle h, pybind11::object::borrowed_t)
+        : base_type(h, pybind11::object::borrowed)
     {
         init_from_python();
     }
 
     template <class T, std::size_t N>
-    inline pytensor<T, N>::pytensor(pybind11::handle h, stolen_t)
-        : base_type(h, stolen)
+    inline pytensor<T, N>::pytensor(pybind11::handle h, pybind11::object::stolen_t)
+        : base_type(h, pybind11::object::stolen)
     {
         init_from_python();
     }
 
     template <class T, std::size_t N>
     inline pytensor<T, N>::pytensor(const pybind11::object& o)
-        : base_type(base_type::raw_array_t(o.ptr()), stolen)
+        : base_type(base_type::raw_array_t(o.ptr()), pybind11::object::stolen)
     {
         if(!this->m_ptr)
             throw pybind11::error_already_set();