hpc-maths · sbstndb · Apr 15, 2025 · Apr 15, 2025 · Apr 15, 2025 · Apr 15, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,6 +111,9 @@ endif()
 
 # Force HIGHFIVE_USE_INSTALL_DEPS option to be true
 option(HIGHFIVE_USE_INSTALL_DEPS "End applications by default use detected dependencies here" OFF)
+option(H5_USE_XTENSOR OFF)
+option(HIGHFIVE_USE_XTENSOR OFF)
+
 
 foreach(DEPENDENCY ${DEPENDENCIES_CONFIGURED})
   find_package(${DEPENDENCY} CONFIG REQUIRED)
@@ -129,12 +132,29 @@ if(SAMURAI_FIELD_CONTAINER MATCHES xtensor)
   message(STATUS "Using xtensor as field container")
   list(APPEND DEPENDENCIES_CONFIGURED xtensor)
   find_package(xtensor CONFIG REQUIRED)
+
+  #  if(DEFINED xtensor_VERSION_MINOR)
+       message(STATUS "xtensor version detected by find_package: ${xtensor_VERSION}")
+       message(STATUS "xtensor minor version: ${xtensor_VERSION_MINOR}")
+
+      # Add the definitions to the samurai target
+      target_compile_definitions(samurai INTERFACE
+          XTENSOR_VERSION_MAJOR=${xtensor_VERSION_MAJOR}
+          XTENSOR_VERSION_MINOR=${xtensor_VERSION_MINOR}
+          XTENSOR_VERSION_PATCH=${xtensor_VERSION_PATCH}
+      )
+
+      #  endif()
+
   target_link_system_libraries(
     samurai
     INTERFACE
     xtensor
   )
+
 endif()
+
+
 if(SAMURAI_FIELD_CONTAINER MATCHES eigen3)
   message(STATUS "Using Eigen3 as field container")
 endif()

diff --git a/benchmark/benchmark_search.cpp b/benchmark/benchmark_search.cpp
@@ -2,8 +2,10 @@
 #include <benchmark/benchmark.h>
 #include <experimental/random>
 
-#include <xtensor/xfixed.hpp>
-#include <xtensor/xrandom.hpp>
+// #include <xtensor/xfixed.hpp>
+// #include <xtensor/xrandom.hpp>
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/generators/xrandom.hpp>
 
 #include <samurai/algorithm.hpp>
 #include <samurai/cell_array.hpp>

diff --git a/demos/FiniteVolume/advection_1d.cpp b/demos/FiniteVolume/advection_1d.cpp
@@ -1,6 +1,11 @@
 // Copyright 2018-2025 the samurai's authors
 // SPDX-License-Identifier:  BSD-3-Clause
+
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include <samurai/algorithm.hpp>
 #include <samurai/bc.hpp>

diff --git a/demos/FiniteVolume/advection_2d.cpp b/demos/FiniteVolume/advection_2d.cpp
@@ -3,7 +3,11 @@
 
 #include <array>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include <samurai/algorithm.hpp>
 #include <samurai/bc.hpp>

diff --git a/demos/FiniteVolume/advection_2d_user_bc.cpp b/demos/FiniteVolume/advection_2d_user_bc.cpp
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier:  BSD-3-Clause
 #include <array>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 // -----------------------------
 

diff --git a/demos/tutorial/AMR_1D_Burgers/step_5/make_graduation.hpp b/demos/tutorial/AMR_1D_Burgers/step_5/make_graduation.hpp
@@ -5,7 +5,11 @@
 
 #include <array>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xmasked_view.hpp>
+#else
+#include <xtensor/views/xmasked_view.hpp>
+#endif
 
 #include <samurai/algorithm.hpp>
 #include <samurai/cell_flag.hpp>

diff --git a/demos/tutorial/graduation_case_1.cpp b/demos/tutorial/graduation_case_1.cpp
@@ -3,10 +3,17 @@
 
 #include <filesystem>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xmasked_view.hpp>
 #include <xtensor/xrandom.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xfixed/hpp>
+#include <xtensor/generators/xrandom.hpp>
+#include <xtensor/views/xmasked_view.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include <samurai/box.hpp>
 #include <samurai/cell_array.hpp>

diff --git a/demos/tutorial/graduation_case_2.cpp b/demos/tutorial/graduation_case_2.cpp
@@ -3,10 +3,17 @@
 
 #include <filesystem>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xmasked_view.hpp>
 #include <xtensor/xrandom.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/generators/xrandom.hpp>
+#include <xtensor/views/xmasked_view.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include <samurai/box.hpp>
 #include <samurai/cell_array.hpp>

diff --git a/demos/tutorial/graduation_case_3.cpp b/demos/tutorial/graduation_case_3.cpp
@@ -5,7 +5,11 @@
 
 #include <filesystem>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xmasked_view.hpp>
+#else
+#include <xtensor/views/xmasked_view.hpp>
+#endif
 
 #include <samurai/box.hpp>
 #include <samurai/cell_array.hpp>

diff --git a/include/samurai/algorithm.hpp b/include/samurai/algorithm.hpp
@@ -7,10 +7,13 @@
 #include <omp.h>
 #endif
 #include <type_traits>
-
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xview.hpp>
-
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 #include "cell.hpp"
 #include "mesh_holder.hpp"
 

diff --git a/include/samurai/algorithm/graduation.hpp b/include/samurai/algorithm/graduation.hpp
@@ -3,8 +3,13 @@
 
 #pragma once
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xmasked_view.hpp>
 #include <xtensor/xtensor.hpp>
+#else
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/views/xmasked_view.hpp>
+#endif
 
 #include "../array_of_interval_and_point.hpp"
 #include "../cell_flag.hpp"

diff --git a/include/samurai/algorithm/update.hpp b/include/samurai/algorithm/update.hpp
@@ -5,7 +5,11 @@
 
 #include <algorithm>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include "../algorithm.hpp"
 #include "../bc.hpp"
@@ -21,7 +25,11 @@ using namespace xt::placeholders;
 
 #ifdef SAMURAI_WITH_MPI
 #include <boost/mpi.hpp>
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xmasked_view.hpp>
+#else
+#include <xtensor/views/xmasked_view.hpp>
+#endif
 namespace mpi = boost::mpi;
 #endif
 

diff --git a/include/samurai/box.hpp b/include/samurai/box.hpp
@@ -3,8 +3,13 @@
 
 #pragma once
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xio.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/io/xio.hpp>
+#endif
 
 namespace samurai
 {

diff --git a/include/samurai/cell.hpp b/include/samurai/cell.hpp
@@ -5,10 +5,15 @@
 
 #include <array>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xio.hpp>
 #include <xtensor/xview.hpp>
-
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/io/xio.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 namespace samurai
 {
     template <typename LevelType, std::enable_if_t<std::is_integral<LevelType>::value, bool> = true>

diff --git a/include/samurai/field.hpp b/include/samurai/field.hpp
@@ -14,8 +14,13 @@ namespace fs = std::filesystem;
 
 #include <fmt/format.h>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xtensor.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include "algorithm.hpp"
 #include "bc.hpp"

diff --git a/include/samurai/field_expression.hpp b/include/samurai/field_expression.hpp
@@ -5,9 +5,13 @@
 
 #include <xtl/xtype_traits.hpp>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xexpression.hpp>
 #include <xtensor/xmath.hpp>
-
+#else
+#include <xtensor/core/xexpression.hpp>
+#include <xtensor/core/xmath.hpp>
+#endif
 #include "cell.hpp"
 #include "interval.hpp"
 #include "samurai_config.hpp"
@@ -26,7 +30,11 @@ namespace samurai
     };
 
     template <class... E>
+#if XTENSOR_VERSION_MINOR < 26
     struct field_comparable : xtl::conjunction<is_field_expression<E>...>
+#else
+    struct field_comparable : std::conjunction<is_field_expression<E>...>
+#endif
     {
     };
 

diff --git a/include/samurai/io/cgal.hpp b/include/samurai/io/cgal.hpp
@@ -13,7 +13,11 @@
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/optimal_bounding_box.h>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include "../box.hpp"
 #include "../cell_array.hpp"

diff --git a/include/samurai/io/hdf5.hpp b/include/samurai/io/hdf5.hpp
@@ -22,9 +22,16 @@ namespace fs = std::filesystem;
 #include <highfive/H5Easy.hpp>
 #include <highfive/H5PropertyList.hpp>
 #include <pugixml.hpp>
+
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xadapt.hpp>
 #include <xtensor/xarray.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xadapt.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include <fmt/core.h>
 

diff --git a/include/samurai/level_cell_list.hpp b/include/samurai/level_cell_list.hpp
@@ -7,8 +7,13 @@
 #include <map>
 #include <type_traits>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include "cell.hpp"
 #include "list_of_intervals.hpp"

diff --git a/include/samurai/mesh_interval.hpp b/include/samurai/mesh_interval.hpp
@@ -1,6 +1,12 @@
 #pragma once
+
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 using namespace xt::placeholders;
 

diff --git a/include/samurai/mr/mesh.hpp b/include/samurai/mr/mesh.hpp
@@ -5,8 +5,13 @@
 
 #include <fmt/format.h>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xtensor.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include "../box.hpp"
 #include "../mesh.hpp"

diff --git a/include/samurai/mr/mesh_with_overleaves.hpp b/include/samurai/mr/mesh_with_overleaves.hpp
@@ -5,7 +5,11 @@
 
 #include <fmt/format.h>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xtensor.hpp>
+#else
+#include <xtensor/containers/xtensor.hpp>
+#endif
 
 #include "../box.hpp"
 #include "../mesh.hpp"

diff --git a/include/samurai/mr/operators.hpp b/include/samurai/mr/operators.hpp
@@ -3,9 +3,15 @@
 
 #pragma once
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xmasked_view.hpp>
 #include <xtensor/xtensor.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/views/xmasked_view.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include "../cell_flag.hpp"
 #include "../field.hpp"

diff --git a/include/samurai/numeric/prediction.hpp b/include/samurai/numeric/prediction.hpp
@@ -6,8 +6,13 @@
 #include <array>
 #include <type_traits>
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xadapt.hpp>
 #include <xtensor/xview.hpp>
+#else
+#include <xtensor/containers/xadapt.hpp>
+#include <xtensor/views/xview.hpp>
+#endif
 
 #include "../operators_base.hpp"
 #include "../storage/utils.hpp"

diff --git a/include/samurai/operators_base.hpp b/include/samurai/operators_base.hpp
@@ -3,7 +3,11 @@
 
 #pragma once
 
+#if XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xfixed.hpp>
+#else
+#include <xtensor/containers/xfixed.hpp>
+#endif
 
 #include "field_expression.hpp"
 #include "utils.hpp"