FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #196 from SylvainCorlay/update-xtensor · robertodr/xtensor-python@fa15a4b · GitHub

  1. robertodr
  2. xtensor-python

Repository navigation

Commit fa15a4b

Browse files
JohanMabille
authored
Merge pull request xtensor-stack#196 from SylvainCorlay/update-xtensor
Update xtensor to 0.20.4
2 parents a8b72e3 + 6c0c719 commit fa15a4b

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- conda update -q conda
2323
- conda info -a
2424
- conda install gtest cmake -c conda-forge
25-
- conda install pytest numpy pybind11==2.2.1 xtensor==0.20.0 -c conda-forge
25+
- conda install pytest numpy pybind11==2.2.1 xtensor==0.20.4 -c conda-forge
2626
- "set PYTHONHOME=%MINICONDA%"
2727
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
2828
- nmake test_xtensor_python

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ install:
147147
else
148148
conda install pybind11==${PYBIND11_VERSION} -c conda-forge
149149
fi
150-
- conda install xtensor==0.20.0 -c conda-forge
150+
- conda install xtensor==0.20.4 -c conda-forge
151151
- cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
152152
- make -j2 test_xtensor_python
153153
- make install

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ from the `docs` subdirectory.
195195

196196
| `xtensor-python` | `xtensor` | `pybind11` |
197197
|------------------|-----------|------------------|
198-
| master | ^0.20.0 | ~2.2.1 |
198+
| master | ^0.20.4 | ~2.2.1 |
199199
| 0.22.x | ^0.19.0 | ~2.2.1 |
200200
| 0.21.x | ^0.18.0 | ~2.2.1 |
201201
| 0.20.x | ^0.17.0 | ~2.2.1 |

‎include/xtensor-python/pyarray.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,12 @@ namespace xt
320320
* @class pyarray
321321
* @brief Multidimensional container providing the xtensor container semantics to a numpy array.
322322
*
323-
* pyarray is similar to the xarray container in that it has a dynamic dimensionality. Reshapes of
324-
* a pyarray container are reflected in the underlying numpy array.
323+
* pyarray is similar to the xarray container in that it has a dynamic dimensionality.
324+
* Reshapes of a pyarray container are reflected in the underlying numpy array.
325325
*
326326
* @tparam T The type of the element stored in the pyarray.
327+
* @tparam L Static layout of the pyarray
328+
*
327329
* @sa pytensor
328330
*/
329331
template <class T, layout_type L>

‎include/xtensor-python/pytensor.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ namespace xt
131131
*
132132
* pytensor is similar to the xtensor container in that it has a static dimensionality.
133133
*
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
135135
* and reshapes are not reflected on the Python side. However, pytensor has benefits compared to pyarray
136136
* in terms of performances. pytensor shapes are stack-allocated which makes iteration upon pytensor
137137
* faster than with pyarray.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL