Merge pull request xtensor-stack#196 from SylvainCorlay/update-xtensor

JohanMabille · web-flow · commit fa15a4b5ee07 · 2019-04-15T14:00:13.000-07:00
Update xtensor to 0.20.4
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install pytest numpy pybind11==2.2.1 xtensor==0.20.0 -c conda-forge
+  - conda install pytest numpy pybind11==2.2.1 xtensor==0.20.4 -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
diff --git a/.travis.yml b/.travis.yml
@@ -147,7 +147,7 @@ install:
       else
         conda install pybind11==${PYBIND11_VERSION} -c conda-forge
       fi
-    - conda install xtensor==0.20.0 -c conda-forge
+    - conda install xtensor==0.20.4 -c conda-forge
     - cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
     - make -j2 test_xtensor_python
     - make install
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python` | `xtensor` |  `pybind11`      |
 |------------------|-----------|------------------|
-| master           |  ^0.20.0  | ~2.2.1           |
+| master           |  ^0.20.4  | ~2.2.1           |
 | 0.22.x           |  ^0.19.0  | ~2.2.1           |
 | 0.21.x           |  ^0.18.0  | ~2.2.1           |
 | 0.20.x           |  ^0.17.0  | ~2.2.1           |
diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
@@ -320,10 +320,12 @@ namespace xt
      * @class pyarray
      * @brief Multidimensional container providing the xtensor container semantics to a numpy array.
      *
-     * pyarray is similar to the xarray container in that it has a dynamic dimensionality. Reshapes of
-     * a pyarray container are reflected in the underlying numpy array.
+     * pyarray is similar to the xarray container in that it has a dynamic dimensionality.
+     * Reshapes of a pyarray container are reflected in the underlying numpy array.
      *
      * @tparam T The type of the element stored in the pyarray.
+     * @tparam L Static layout of the pyarray
+     *
      * @sa pytensor
      */
     template <class T, layout_type L>
diff --git a/include/xtensor-python/pytensor.hpp b/include/xtensor-python/pytensor.hpp
@@ -131,7 +131,7 @@ namespace xt
      *
      * pytensor is similar to the xtensor container in that it has a static dimensionality.
      *
-     * Unlike with the pyarray container, pytensor cannot be reshaped with a different number of dimensions
+     * Unlike the pyarray container, pytensor cannot be reshaped with a different number of dimensions
      * and reshapes are not reflected on the Python side. However, pytensor has benefits compared to pyarray
      * in terms of performances. pytensor shapes are stack-allocated which makes iteration upon pytensor
      * faster than with pyarray.

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ namespace xt`
`131`	`131`	`*`
`132`	`132`	`* pytensor is similar to the xtensor container in that it has a static dimensionality.`
`133`	`133`	`*`
`134`		`- * Unlike with the pyarray container, pytensor cannot be reshaped with a different number of dimensions`
	`134`	`+ * Unlike the pyarray container, pytensor cannot be reshaped with a different number of dimensions`
`135`	`135`	`* and reshapes are not reflected on the Python side. However, pytensor has benefits compared to pyarray`
`136`	`136`	`* in terms of performances. pytensor shapes are stack-allocated which makes iteration upon pytensor`
`137`	`137`	`* faster than with pyarray.`