pyarray now inherits from pycontainer

Author: JohanMabille

benchmark/CMakeLists.txt

@@ -62,14 +62,16 @@ set(XTENSOR_PYTHON_BENCHMARK
 
 set(XTENSOR_PYTHON_BENCHMARK_TARGET benchmark_xtensor_python)
 add_library(${XTENSOR_PYTHON_BENCHMARK_TARGET} MODULE EXCLUDE_FROM_ALL
-    ${XTENSOR_PYTHON_BENCHMARK} ${XTENSOR_PYTHON_HEADERS})
+            ${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)
+if (APPLE)
     target_link_libraries(${XTENSOR_PYTHON_BENCHMARK_TARGET} PRIVATE "-undefined dynamic_lookup")
-else()
+elseif (MSVC)
+    target_link_libraries(${XTENSOR_PYTHON_BENCHMARK_TARGET} ${PYTHON_LIBRARIES})
+else ()
     target_link_libraries(${XTENSOR_PYTHON_BENCHMARK_TARGET} "-shared")
 endif()
 

benchmark/main.cpp

@@ -1,6 +1,6 @@
 #include "pybind11/pybind11.h"
 #include "pybind11/numpy.h"
-//#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include "numpy/arrayobject.h"
 #include "xtensor/xtensor.hpp"
 #include "xtensor/xarray.hpp"

benchmark/setup.py

@@ -34,7 +34,7 @@ def __str__(self):
 
 ext_modules = [
     Extension(
-        'xtensor_python_benchmark',
+        'benchmark_xtensor_python',
         ['main.cpp'],
         include_dirs=[
             # Path to pybind11 headers
@@ -99,7 +99,7 @@ def build_extensions(self):
         build_ext.build_extensions(self)
 
 setup(
-    name='xtensor_python_benchmark',
+    name='benchmark_xtensor_python',
     version=__version__,
     author='Sylvain Corlay',
     author_email='sylvain.corlay@gmail.com',