Fix test, use xtensor master

Author: davidbrochart

.azure-pipelines/unix-build.yml

@@ -25,6 +25,18 @@ steps:
     displayName: Configure xtensor-io
     workingDirectory: $(Build.BinariesDirectory)
 
+  - script: |
+      source activate xtensor-io
+      mkdir dev_tmp
+      cd dev_tmp
+      curl -LJO https://github.com/xtensor-stack/xtensor/archive/master.tar.gz
+      mkdir xtensor
+      tar zxf xtensor-master.tar.gz -C xtensor --strip-components 1
+      rm -rf $CONDA_PREFIX/include/xtensor
+      mv xtensor/include/xtensor $CONDA_PREFIX/include/
+    displayName: Install xtensor master
+    workingDirectory: $(Build.SourcesDirectory)
+
   - script: |
       source activate xtensor-io
       make -j2 test_xtensor_io_lib

test/test_xchunk_store_manager.cpp

@@ -44,7 +44,7 @@ namespace xt
         in_file.open(path);
         xt::xarray<double> data;
         data = xt::load_bin<double>(in_file);
-        EXPECT_TRUE(xt::all(equal(data, ref)));
+        EXPECT_EQ(data, ref);
         in_file.close();
     }
 
@@ -143,22 +143,21 @@ namespace xt
         std::string chunk_dir2 = "files5";
         fs::create_directory(chunk_dir2);
         auto a2 = chunked_file_array<double, xio_disk_handler<xio_binary_config>>(shape, chunk_shape, chunk_dir2);
-        auto a3 = arange(4 * 4);
-        a3.reshape({4, 4});
+        auto a3 = arange(4 * 4).reshape({4, 4});
         noalias(a2) = a3;
         a2.chunks().flush();
         // check that a2 has correct chunks
-        check_file_equal(chunk_dir2 + "/0.0", xt::xarray<double>({{0, 1}, {4, 5}}));
-        check_file_equal(chunk_dir2 + "/1.0", xt::xarray<double>({{8, 9}, {12, 13}}));
-        check_file_equal(chunk_dir2 + "/0.1", xt::xarray<double>({{2, 3}, {6, 7}}));
-        check_file_equal(chunk_dir2 + "/1.1", xt::xarray<double>({{10, 11}, {14, 15}}));
+        check_file_equal(chunk_dir2 + "/0.0", xt::xarray<double>({0, 1, 4, 5}));
+        check_file_equal(chunk_dir2 + "/1.0", xt::xarray<double>({8, 9, 12, 13}));
+        check_file_equal(chunk_dir2 + "/0.1", xt::xarray<double>({2, 3, 6, 7}));
+        check_file_equal(chunk_dir2 + "/1.1", xt::xarray<double>({10, 11, 14, 15}));
 
-        a1 = a2;
+        noalias(a1) = a2;
         a1.chunks().flush();
         // check that a1 has correct chunks
-        check_file_equal(chunk_dir1 + "/0.0", xt::xarray<double>({{0, 1}, {4, 5}}));
-        check_file_equal(chunk_dir1 + "/1.0", xt::xarray<double>({{8, 9}, {12, 13}}));
-        check_file_equal(chunk_dir1 + "/0.1", xt::xarray<double>({{2, 3}, {6, 7}}));
-        check_file_equal(chunk_dir1 + "/1.1", xt::xarray<double>({{10, 11}, {14, 15}}));
+        check_file_equal(chunk_dir1 + "/0.0", xt::xarray<double>({0, 1, 4, 5}));
+        check_file_equal(chunk_dir1 + "/1.0", xt::xarray<double>({8, 9, 12, 13}));
+        check_file_equal(chunk_dir1 + "/0.1", xt::xarray<double>({2, 3, 6, 7}));
+        check_file_equal(chunk_dir1 + "/1.1", xt::xarray<double>({10, 11, 14, 15}));
     }
 }