From 9c884b070d5637873031cff358d7be9eee9b4d37 Mon Sep 17 00:00:00 2001
From: Kris Thielemans <k.thielemans@ucl.ac.uk>
Date: Sun, 9 Nov 2025 21:39:51 +0000
Subject: [PATCH 1/2] cope with xtensor include files move

---
 tooling/internal/cpp/include/detail/ndarray/impl.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tooling/internal/cpp/include/detail/ndarray/impl.h b/tooling/internal/cpp/include/detail/ndarray/impl.h
index 53a966be..f195af2c 100644
--- a/tooling/internal/cpp/include/detail/ndarray/impl.h
+++ b/tooling/internal/cpp/include/detail/ndarray/impl.h
@@ -2,10 +2,17 @@
 
 #include <utility>
 
+#if XTENSOR_VERSION_MAJOR==0 && XTENSOR_VERSION_MINOR < 26
 #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/io/xio.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#endif
 
 namespace yardl {
 

From 0e7ec1196fafe15d408f83e315c58308d0999f79 Mon Sep 17 00:00:00 2001
From: Kris Thielemans <k.thielemans@ucl.ac.uk>
Date: Mon, 10 Nov 2025 01:48:28 +0000
Subject: [PATCH 2/2] include xtensor.hpp for version info

---
 tooling/internal/cpp/include/detail/ndarray/impl.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tooling/internal/cpp/include/detail/ndarray/impl.h b/tooling/internal/cpp/include/detail/ndarray/impl.h
index f195af2c..1c501a6c 100644
--- a/tooling/internal/cpp/include/detail/ndarray/impl.h
+++ b/tooling/internal/cpp/include/detail/ndarray/impl.h
@@ -2,7 +2,12 @@
 
 #include <utility>
 
-#if XTENSOR_VERSION_MAJOR==0 && XTENSOR_VERSION_MINOR < 26
+#ifndef XTENSOR_VERSION_MAJOR
+// need to include this for version info
+#  include <xtensor/xtensor.hpp>
+#endif
+
+#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xarray.hpp>
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xio.hpp>