Upgraded to xtensor 0.26.0

JohanMabille · JohanMabille · commit 936abb3afc69 · 2026-06-19T11:58:55.000+02:00
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -16,6 +16,6 @@ dependencies:
   - nlohmann_json
   - google-cloud-cpp >=3.0,<4
   - aws-sdk-cpp
-  - xtensor=0.25.0
+  - xtensor=0.26.0
   - cpp-filesystem
 
diff --git a/include/xtensor-io/xaudio.hpp b/include/xtensor-io/xaudio.hpp
@@ -15,9 +15,9 @@
 
 #include <sndfile.hh>
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xtensor.hpp>
-#include <xtensor/xeval.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/core/xeval.hpp>
 
 #include "xtensor_io_config.hpp"
 
diff --git a/include/xtensor-io/xchunk_store_manager.hpp b/include/xtensor-io/xchunk_store_manager.hpp
@@ -8,8 +8,8 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xchunked_array.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/chunk/xchunked_array.hpp"
 #include "xfile_array.hpp"
 
 namespace xt
diff --git a/include/xtensor-io/xfile_array.hpp b/include/xtensor-io/xfile_array.hpp
@@ -7,8 +7,8 @@
 
 #include <xtl/xtype_traits.hpp>
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xnoalias.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xnoalias.hpp>
 
 namespace xt
 {
diff --git a/include/xtensor-io/xgdal.hpp b/include/xtensor-io/xgdal.hpp
@@ -14,7 +14,7 @@
 #include <functional>
 #include <map>
 
-#include <xtensor/xtensor.hpp>
+#include <xtensor/containers/xtensor.hpp>
 #include "xtensor-io.hpp"
 
 // We rely exclusively on the stable C interface to GDAL.
diff --git a/include/xtensor-io/xhighfive.hpp b/include/xtensor-io/xhighfive.hpp
@@ -18,8 +18,8 @@
 #include <highfive/H5File.hpp>
 #include <highfive/H5Easy.hpp>
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xtensor.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/containers/xtensor.hpp>
 
 #include "xtensor-io.hpp"
 
diff --git a/include/xtensor-io/ximage.hpp b/include/xtensor-io/ximage.hpp
@@ -15,9 +15,9 @@
 #include <string>
 #include <memory>
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xmath.hpp>
-#include <xtensor/xeval.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xeval.hpp>
+#include <xtensor/core/xmath.hpp>
 
 #include "xtensor_io_config.hpp"
 
diff --git a/include/xtensor-io/xio_aws_handler.hpp b/include/xtensor-io/xio_aws_handler.hpp
@@ -1,8 +1,8 @@
 #ifndef XTENSOR_IO_AWS_HANDLER_HPP
 #define XTENSOR_IO_AWS_HANDLER_HPP
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xexpression.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xexpression.hpp>
 #include <aws/core/Aws.h>
 #include <aws/s3/S3Client.h>
 #include <aws/s3/model/GetObjectRequest.h>
diff --git a/include/xtensor-io/xio_binary.hpp b/include/xtensor-io/xio_binary.hpp
@@ -12,7 +12,7 @@
 
 #include <fstream>
 
-#include "xtensor/xadapt.hpp"
+#include "xtensor/containers/xadapt.hpp"
 #include "xtensor-io.hpp"
 #include "xfile_array.hpp"
 #include "xio_stream_wrapper.hpp"
diff --git a/include/xtensor-io/xio_blosc.hpp b/include/xtensor-io/xio_blosc.hpp
@@ -12,7 +12,7 @@
 
 #include <fstream>
 
-#include "xtensor/xadapt.hpp"
+#include "xtensor/containers/xadapt.hpp"
 #include "xtensor-io.hpp"
 #include "xfile_array.hpp"
 #include "blosc.h"
diff --git a/include/xtensor-io/xio_disk_handler.hpp b/include/xtensor-io/xio_disk_handler.hpp
@@ -2,8 +2,8 @@
 #define XTENSOR_IO_DISK_HANDLER_HPP
 
 #include <ghc/filesystem.hpp>
-#include <xtensor/xarray.hpp>
-#include <xtensor/xexpression.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xexpression.hpp>
 #include "xio_stream_wrapper.hpp"
 #include "xfile_array.hpp"
 
diff --git a/include/xtensor-io/xio_gcs_handler.hpp b/include/xtensor-io/xio_gcs_handler.hpp
@@ -1,8 +1,8 @@
 #ifndef XTENSOR_IO_GCS_HANDLER_HPP
 #define XTENSOR_IO_GCS_HANDLER_HPP
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xexpression.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xexpression.hpp>
 #include <google/cloud/storage/client.h>
 #include <google/cloud/credentials.h>
 #include "xfile_array.hpp"
diff --git a/include/xtensor-io/xio_gdal_handler.hpp b/include/xtensor-io/xio_gdal_handler.hpp
@@ -1,8 +1,8 @@
 #ifndef XTENSOR_IO_GDAL_HANDLER_HPP
 #define XTENSOR_IO_GDAL_HANDLER_HPP
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xexpression.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xexpression.hpp>
 #include "xfile_array.hpp"
 #include "xio_vsilfile_wrapper.hpp"
 
diff --git a/include/xtensor-io/xio_gzip.hpp b/include/xtensor-io/xio_gzip.hpp
@@ -14,7 +14,7 @@
 
 #include "zlib.h"
 
-#include "xtensor/xadapt.hpp"
+#include "xtensor/containers/xadapt.hpp"
 #include "xtensor-io.hpp"
 #include "xfile_array.hpp"
 #include "xio_stream_wrapper.hpp"
diff --git a/include/xtensor-io/xio_zlib.hpp b/include/xtensor-io/xio_zlib.hpp
@@ -14,7 +14,7 @@
 
 #include "zlib.h"
 
-#include "xtensor/xadapt.hpp"
+#include "xtensor/containers/xadapt.hpp"
 #include "xtensor-io.hpp"
 #include "xfile_array.hpp"
 #include "xio_stream_wrapper.hpp"
diff --git a/include/xtensor-io/xnpz.hpp b/include/xtensor-io/xnpz.hpp
@@ -27,7 +27,7 @@
 
 #include "thirdparty/zstr/zstr.hpp"
 
-#include <xtensor/xnpy.hpp>
+#include <xtensor/io/xnpy.hpp>
 
 #include "xtensor_io_config.hpp"
 
diff --git a/test/test_xaudio.cpp b/test/test_xaudio.cpp
@@ -9,7 +9,7 @@
 
 #include "gtest/gtest.h"
 #include "xtensor-io/xaudio.hpp"
-#include "xtensor/xio.hpp"
+#include "xtensor/io/xio.hpp"
 
 namespace xt
 {
diff --git a/test/test_xchunk_store_manager.cpp b/test/test_xchunk_store_manager.cpp
@@ -9,7 +9,7 @@
 
 #include "gtest/gtest.h"
 
-#include <xtensor/xbroadcast.hpp>
+#include <xtensor/views/xbroadcast.hpp>
 #include "xtensor-io/xchunk_store_manager.hpp"
 #include "xtensor-io/xfile_array.hpp"
 #include <xtensor-io/xio_binary.hpp>
diff --git a/test/test_xfile_array.cpp b/test/test_xfile_array.cpp
@@ -9,9 +9,9 @@
 
 #include "gtest/gtest.h"
 
-#include <xtensor/xbroadcast.hpp>
+#include <xtensor/views/xbroadcast.hpp>
 #include "xtensor-io/xfile_array.hpp"
-#include <xtensor-io/xio_binary.hpp>
+#include "xtensor-io/xio_binary.hpp"
 #include "xtensor-io/xio_disk_handler.hpp"
 
 namespace xt
diff --git a/test/test_xgdal.cpp b/test/test_xgdal.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "xtensor-io/xgdal.hpp"
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xoperation.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/core/xoperation.hpp"
 
 #include <gdal_frmts.h>
 
diff --git a/test/test_xhighfive.cpp b/test/test_xhighfive.cpp
@@ -12,7 +12,7 @@
 #include <exception>
 
 #include "gtest/gtest.h"
-#include "xtensor/xrandom.hpp"
+#include "xtensor/generators/xrandom.hpp"
 #include "xtensor-io/xhighfive.hpp"
 
 namespace xt
diff --git a/test/test_ximage.cpp b/test/test_ximage.cpp
@@ -8,9 +8,9 @@
 ****************************************************************************/
 
 #include "gtest/gtest.h"
-#include "xtensor/xoperation.hpp"
-#include "xtensor/xview.hpp"
-#include "xtensor/xio.hpp"
+#include "xtensor/core/xoperation.hpp"
+#include "xtensor/views/xview.hpp"
+#include "xtensor/io/xio.hpp"
 
 #include "xtensor-io/ximage.hpp"
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`
`8`	`8`	`#include <xtl/xtype_traits.hpp>`
`9`	`9`
`10`		`-#include <xtensor/xarray.hpp>`
`11`		`-#include <xtensor/xnoalias.hpp>`
	`10`	`+#include <xtensor/containers/xarray.hpp>`
	`11`	`+#include <xtensor/core/xnoalias.hpp>`
`12`	`12`
`13`	`13`	`namespace xt`
`14`	`14`	`{`