Skip to content

Upgrade to xtensor 0.17.0 #159

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
Aug 1, 2018
Merged

Upgrade to xtensor 0.17.0 #159

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 @@ -24,7 +24,7 @@ install:
- conda info -a
- conda install gtest cmake -c conda-forge
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
- conda install xtensor==0.16.0 -c QuantStack
- conda install xtensor==0.17.0 -c QuantStack
- "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 @@ -97,7 +97,7 @@ install:
- conda info -a
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
- conda install cmake gtest -c conda-forge
- conda install xtensor==0.16.0 -c QuantStack
- conda install xtensor==0.17.0 -c QuantStack
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
- make -j2 test_xtensor_python
- make install
Expand Down
2 changes: 1 addition & 1 deletion include/xtensor-python/pyarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ namespace xt
{
using storage_type = xbuffer_adaptor<T*>;
using shape_type = std::vector<typename storage_type::size_type>;
using strides_type = shape_type;
using strides_type = std::vector<typename storage_type::difference_type>;
using backstrides_type = pyarray_backstrides<pyarray<T, L>>;
using inner_shape_type = xbuffer_adaptor<std::size_t*>;
using inner_strides_type = pystrides_adaptor<sizeof(T)>;
Expand Down
2 changes: 1 addition & 1 deletion test/test_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace xt
using vector_type = uvector<int>;
using size_type = typename C::value_type;
using shape_type = C;
using strides_type = C;
using strides_type = get_strides_t<shape_type>;

using assigner_type = std::vector<std::vector<vector_type>>;

Expand Down