10000 Update xtensor to 0.20.4 by SylvainCorlay · Pull Request #196 · xtensor-stack/xtensor-python · GitHub
[go: up one dir, main page]
Skip to content

Update xtensor to 0.20.4 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2019
Merged

Update xtensor to 0.20.4 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
6 changes: 4 additions & 2 deletions include/xtensor-python/pyarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion include/xtensor-python/pytensor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0