Skip to content

Adjustments for xtensor 0.11 #107

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
SylvainCorlay merged 1 commit into from
Sep 4, 2017
Merged

Adjustments for xtensor 0.11 #107

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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ from the `docs` subdirectory.
| `xtensor-python` | `xtensor` | `pybind11` |
|-------------------|------------|-------------|
| master | ^0.10.9 | ^2.1.0 |
| 0.12.x | ^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 |
| 0.12.x | ^0.10.2 | 2.1.\* |
| 0.11.x | ^0.10.0 | 2.1.\* |
| 0.10.x | ^0.9.0 | 2.1.\* |
| 0.9.x | ^0.8.1 | 2.1.\* |

These dependencies are automatically resolved when using the conda package manager.

Expand Down
3 changes: 2 additions & 1 deletion include/xtensor-python/pyarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ namespace xt
using inner_strides_type = pystrides_adaptor<sizeof(T)>;
using inner_backstrides_type = backstrides_type;
using temporary_type = pyarray<T>;
static constexpr layout_type layout = layout_type::dynamic;
};

/**
Expand Down Expand Up @@ -386,7 +387,7 @@ namespace xt
*/
template <class T>
inline pyarray<T>::pyarray(const self_type& rhs)
: base_type()
: base_type(), semantic_base(rhs)
{
auto tmp = pybind11::reinterpret_steal<pybind11::object>(
PyArray_NewLikeArray(rhs.python_array(), NPY_KEEPORDER, nullptr, 1));
Expand Down
1 change: 0 additions & 1 deletion include/xtensor-python/pycontainer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <functional>
#include <numeric>

#include "pybind11/common.h"
#include "pybind11/complex.h"
#include "pybind11/pybind11.h"

Expand Down
1 change: 1 addition & 0 deletions include/xtensor-python/pytensor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ namespace xt
using inner_strides_type = strides_type;
using inner_backstrides_type = backstrides_type;
using temporary_type = pytensor<T, N>;
static constexpr layout_type layout = layout_type::dynamic;
};

/**
Expand Down