Merge pull request #97 from SylvainCorlay/xbuffer-adaptor

Use xbuffer_adaptor

Author: SylvainCorlay

.appveyor.yml

@@ -23,7 +23,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor==0.10.0 pytest numpy pybind11==2.1.1 -c conda-forge
+  - conda install xtensor==0.10.2 pytest numpy pybind11==2.1.1 -c conda-forge
   - "set PYTHONHOME=%MINICONDA%"
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
   - nmake test_xtensor_python

.travis.yml

@@ -94,7 +94,7 @@ install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
-    - conda install xtensor==0.10.0 pytest numpy pybind11==2.1.1 -c conda-forge
+    - conda install xtensor==0.10.2 pytest numpy pybind11==2.1.1 -c conda-forge
     - cd test
     - conda env create -f ./test-environment.yml
     - source activate test-xtensor-python

CMakeLists.txt

@@ -33,8 +33,8 @@ message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
 
 set(XTENSOR_PYTHON_HEADERS
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pyarray.hpp
-    ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pybuffer_adaptor.hpp
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pycontainer.hpp
+    ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pystrides_adaptor.hpp
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pytensor.hpp
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/pyvectorize.hpp
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/xtensor_python_config.hpp

README.md

@@ -49,15 +49,15 @@ Both containers enable the numpy-style APIs of xtensor (see [the numpy to xtenso
 
 double sum_of_sines(xt::pyarray<double>& m)
 {
-    auto sines = xt::sin(m);  // sines does not actually hold any value, which are only computed upon access
+    auto sines = xt::sin(m);  // sines does not actually hold values.
     return std::accumulate(sines.begin(), sines.end(), 0.0);
 }
 
 PYBIND11_PLUGIN(xtensor_python_test)
 {
     pybind11::module m("xtensor_python_test", "Test module for xtensor python bindings");
 
-    m.def("sum_of_sines", sum_of_sines, "Computes the sum of the sines of the values of the input array");
+    m.def("sum_of_sines", sum_of_sines, "Sum the sines of the input values");
 
     return m.ptr();
 }
@@ -189,7 +189,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python`  | `xtensor`  |  `pybind11` |
 |-------------------|------------|-------------|
-| master            |  ^0.10.0   | ^2.1.0      |
+| master            |  ^0.10.2   | ^2.1.0      |
 | 0.11.x            |  ^0.10.0   | ^2.1.0      |
 | 0.10.x            |  ^0.9.0    | ^2.1.0      |
 | 0.9.x             |  ^0.8.1    | ^2.1.0      |

docs/source/basic_usage.rst

@@ -20,20 +20,18 @@ Example 1: Use an algorithm of the C++ library on a numpy array inplace
     #define FORCE_IMPORT_ARRAY                // numpy C api loading
     #include "xtensor-python/pyarray.hpp"     // Numpy bindings
 
-    double sum_of_sines(xt::pyarray<double> &m)
+    double sum_of_sines(xt::pyarray<double>& m)
     {
-        auto sines = xt::sin(m);
-        // sines does not actually hold any value, which are only computed upon access
-        return std::accumulate(sines.begin(), sines.end(), 0.0);
+        auto sines = xt::sin(m);  // sines does not actually hold values.
+        return std::accumulate(sines.cbegin(), sines.cend(), 0.0);
     }
 
     PYBIND11_PLUGIN(xtensor_python_test)
     {
         xt::import_numpy();
         pybind11::module m("xtensor_python_test", "Test module for xtensor python bindings");
 
-        m.def("sum_of_sines", sum_of_sines,
-            "Computes the sum of the sines of the values of the input array");
+        m.def("sum_of_sines", sum_of_sines, "Sum the sines of the input values");
 
         return m.ptr();
     }

include/xtensor-python/pyarray.hpp

@@ -12,11 +12,13 @@
 #include <cstddef>
 #include <vector>
 #include <algorithm>
+
 #include "xtensor/xsemantic.hpp"
 #include "xtensor/xiterator.hpp"
+#include "xtensor/xbuffer_adaptor.hpp"
 
 #include "pycontainer.hpp"
-#include "pybuffer_adaptor.hpp"
+#include "pystrides_adaptor.hpp"
 
 namespace xt
 {
@@ -103,11 +105,11 @@ namespace xt
     template <class T>
     struct xcontainer_inner_types<pyarray<T>>
     {
-        using container_type = pybuffer_adaptor<T>;
+        using container_type = xbuffer_adaptor<T>;
         using shape_type = std::vector<typename container_type::size_type>;
         using strides_type = shape_type;
         using backstrides_type = pyarray_backstrides<pyarray<T>>;
-        using inner_shape_type = pybuffer_adaptor<std::size_t>;
+        using inner_shape_type = xbuffer_adaptor<std::size_t>;
         using inner_strides_type = pystrides_adaptor<sizeof(T)>;
         using inner_backstrides_type = backstrides_type;
         using temporary_type = pyarray<T>;