Merge pull request #88 from JohanMabille/upgrade_xtensor

Upgraded to xtensor 0.18.0
xtensor-stack · Oct 16, 2018 · 5460e11 · 5460e11
2 parents 232aaed + 04b7730
commit 5460e11
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,7 +21,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install xtensor=0.17.3 -c quantstack
+  - conda install xtensor=0.18.0 -c quantstack
   - conda install gtest cmake -c conda-forge
   - conda install m2w64-openblas -c msys2
   # Patch OpenBLASConfig.cmake

diff --git a/.travis.yml b/.travis.yml
@@ -145,7 +145,7 @@ install:
     - conda info -a
     - conda install gtest cmake -c conda-forge
     # Install xtensor and BLAS
-    - conda install xtensor=0.17.3 -c quantstack
+    - conda install xtensor=0.18.0 -c quantstack
     - if [[ "$BLAS" == "OpenBLAS" ]]; then
         conda install openblas -c conda-forge;
       elif [[ "$BLAS" == "mkl" ]]; then

diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ http://xtensor-blas.readthedocs.io/
 
 | `xtensor-blas`  | `xtensor` |
 |-----------------|-----------|
-| master          |  ^0.17.0  |
+| master          |  ^0.18.0  |
 | 0.13.*          |  ^0.17.0  |
 | 0.12.0          |  ^0.17.0  |
 | 0.11.1          |  ^0.16.0  |

diff --git a/test/test_linalg.cpp b/test/test_linalg.cpp
@@ -388,7 +388,7 @@ namespace xt
         auto nearaf = xt::linalg::dot(qf, rf);
         EXPECT_TRUE(allclose(nearaf, a));
         EXPECT_EQ(std::get<1>(resr), rf);
-        EXPECT_EQ(std::get<0>(resr).size(), 1);
+        EXPECT_EQ(std::get<0>(resr).size(), 0);
         EXPECT_EQ(std::get<0>(resr).dimension(), 2);
 
         // the stuff below tests fine on Fedora 25, but apparently not on Ubuntu?