Skip to content

Commit

Permalink
Merge pull request #147 from JohanMabille/upgrade
Browse files Browse the repository at this point in the history
Upgraded to xtensor 0.21.1
  • Loading branch information
JohanMabille committed Dec 10, 2019
2 parents 3351826 + 3aa1677 commit 51a5705
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ install:
- conda info -a
- conda install cmake -c conda-forge
# Install xtensor and BLAS
- conda install xtensor=0.20.6 -c conda-forge
- conda install xtensor=0.21.1 -c conda-forge
- if [[ "$BLAS" == "OpenBLAS" ]]; then
conda install openblas "blas * openblas" -c conda-forge;
elif [[ "$BLAS" == "mkl" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ http://xtensor-blas.readthedocs.io/

| `xtensor-blas` | `xtensor` |
|-----------------|-----------|
| master | ^0.20.4 |
| master | ^0.21.1 |
| 0.16.1 | ^0.20.4 |
| 0.16.0 | ^0.20.0 |
| 0.15.2 | ^0.19.0 |
Expand Down
1 change: 1 addition & 0 deletions include/xtensor-blas/xlinalg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "xtensor/xcomplex.hpp"
#include "xtensor/xeval.hpp"
#include "xtensor/xio.hpp"
#include "xtensor/xmanipulation.hpp"
#include "xtensor/xstrided_view.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/xutils.hpp"
Expand Down

0 comments on commit 51a5705

Please sign in to comment.