Fix xtensor includes for compat with xtensor >= 0.26

cpp/sandbox/sandbox.cc

@@ -4,8 +4,6 @@
 #include <filesystem>
 #include <iostream>
 
-#include <xtensor/xio.hpp>
-
 #include "generated/binary/protocols.h"
 #include "generated/hdf5/protocols.h"
 #include "generated/ndjson/protocols.h"

cpp/test/external/ndarray_impl.h

@@ -3,7 +3,17 @@
 #include <array>
 #include <cstddef>
 
+#if __has_include(<xtensor/core/xtensor_config.hpp>)
+#include <xtensor/core/xtensor_config.hpp>
+#else
+#include <xtensor/xtensor_config.hpp>
+#endif
+
+#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR <= 25
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include "hoNDArray.h"
 

docs/cpp/arrays.md

@@ -34,7 +34,7 @@ For example, an override header may look like the following:
 /** Include multi-dimensional array implementation(s) **/
 #include <external-ndarray-implementation>
 #include <custom-dynamic-array>
-#include <xtensor/xfixed.hpp>
+#include <xtensor/containers/xfixed.hpp>
 
 
 namespace yardl {

environment.yml

@@ -29,4 +29,4 @@ dependencies:
   - rich=14.1.0
   - shellcheck=0.10.0 # local
   - valgrind=3.25.1 # local arch=x86_64
-  - xtensor=0.25.0
+  - xtensor=0.27.1

tooling/internal/cpp/include/detail/ndarray/impl.h

@@ -2,10 +2,23 @@
 
 #include <utility>
 
+#if __has_include(<xtensor/core/xtensor_config.hpp>)
+#include <xtensor/core/xtensor_config.hpp>
+#else
+#include <xtensor/xtensor_config.hpp>
+#endif
+
+#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR <= 25
 #include <xtensor/xarray.hpp>
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xio.hpp>
 #include <xtensor/xtensor.hpp>
+#else
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/io/xio.hpp>
+#endif
 
 namespace yardl {