Commit 900b208
committed
Upgraded to xtensor 0.14.0
1 parent ebcb157 commit 900b208
6 files changed
Lines changed: 9 additions & 4 deletions
File tree
- include/xtensor-python
- test
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,7 +23,7 @@ install: | |||
| 23 | 23 | - conda update -q conda | |
| 24 | 24 | - conda info -a | |
| 25 | 25 | - conda install gtest cmake -c conda-forge | |
| 26 | - - conda install xtensor==0.13.1 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 26 | + - conda install xtensor==0.14.0 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 27 | 27 | - "set PYTHONHOME=%MINICONDA%" | |
| 28 | 28 | - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe . | |
| 29 | 29 | - nmake test_xtensor_python | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -95,7 +95,7 @@ install: | |||
| 95 | 95 | - conda update -q conda | |
| 96 | 96 | # Useful for debugging any issues with conda | |
| 97 | 97 | - conda info -a | |
| 98 | - - conda install xtensor==0.13.1 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 98 | + - conda install xtensor==0.14.0 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 99 | 99 | - conda install cmake gtest -c conda-forge | |
| 100 | 100 | - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda . | |
| 101 | 101 | - make -j2 test_xtensor_python | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -191,7 +191,7 @@ from the `docs` subdirectory. | |||
| 191 | 191 | ||
| 192 | 192 | | `xtensor-python` | `xtensor` | `pybind11` | | |
| 193 | 193 | |------------------|-----------|------------------| | |
| 194 | - | master | ^0.13.1 | ~2.1.0 or ~2.2.1 | | ||
| 194 | + | master | ^0.14.0 | ~2.1.0 or ~2.2.1 | | ||
| 195 | 195 | | 0.15.x | ^0.13.1 | ~2.1.0 or ~2.2.1 | | |
| 196 | 196 | | 0.14.x | ^0.12.0 | ~2.1.0 or ~2.2.1 | | |
| 197 | 197 | | 0.13.x | ^0.11.0 | ~2.1.0 or ~2.2.1 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,7 +25,10 @@ | |||
| 25 | 25 | #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION | |
| 26 | 26 | ||
| 27 | 27 | #include "numpy/arrayobject.h" | |
| 28 | + // Required because pyconfig.hpp defines copysign to _copysign | ||
| 29 | + #undef copysign | ||
| 28 | 30 | ||
| 31 | + #include <cmath> | ||
| 29 | 32 | #include "xtensor/xcontainer.hpp" | |
| 30 | 33 | ||
| 31 | 34 | #include "xtl/xsequence.hpp" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,6 +6,8 @@ | |||
| 6 | 6 | * The full license is in the file LICENSE, distributed with this software. * | |
| 7 | 7 | ****************************************************************************/ | |
| 8 | 8 | ||
| 9 | + // Required to avoid the error "std does not have memeber copysign" | ||
| 10 | + #include <cmath> | ||
| 9 | 11 | #include <Python.h> | |
| 10 | 12 | ||
| 11 | 13 | #include "pybind11/numpy.h" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,7 @@ | |||
| 10 | 10 | #define TEST_COMMON_HPP | |
| 11 | 11 | ||
| 12 | 12 | #include "xtensor/xlayout.hpp" | |
| 13 | - #include "xtensor/xstridedview.hpp" | ||
| 13 | + #include "xtensor/xstrided_view.hpp" | ||
| 14 | 14 | ||
| 15 | 15 | #include "xtl/xsequence.hpp" | |
| 16 | 16 | ||
0 commit comments