fix: update benchmarks (#2848)

sbstndb · web-flow · commit 2be98b4b32ca · 2025-04-25T10:08:36.000+02:00
# Checklist

- [x] The title and commit message(s) are descriptive.
- [x] Small commits made to fix your PR have been squashed to avoid
history pollution.
- [x] Tests have been added for new features or bug fixes.
- [x] API of new functions and classes are documented.

# Description

	-	Update include paths for the benchmarks
- Comment one benchmark that do not longer compiles. Do not forget to
repair it in the future.
diff --git a/benchmark/benchmark_adapter.cpp b/benchmark/benchmark_adapter.cpp
@@ -8,11 +8,11 @@
 
 #include <benchmark/benchmark.h>
 
-// #include "xtensor/xshape.hpp"
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xstorage.hpp"
-#include "xtensor/xutils.hpp"
+// #include "xtensor/core/core/xshape.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/containers/xstorage.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/utils/xutils.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_assign.cpp b/benchmark/benchmark_assign.cpp
@@ -11,9 +11,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_builder.cpp b/benchmark/benchmark_builder.cpp
@@ -8,9 +8,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_container.cpp b/benchmark/benchmark_container.cpp
@@ -12,8 +12,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_creation.cpp b/benchmark/benchmark_creation.cpp
@@ -8,10 +8,10 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xfixed.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/generators/xbuilder.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_increment_stepper.cpp b/benchmark/benchmark_increment_stepper.cpp
@@ -8,8 +8,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xrandom.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/generators/xrandom.hpp"
 
 #define SHAPE 30, 30
 #define RANGE 3, 100
diff --git a/benchmark/benchmark_lambda_expressions.cpp b/benchmark/benchmark_lambda_expressions.cpp
@@ -8,11 +8,11 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/generators/xbuilder.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_math.cpp b/benchmark/benchmark_math.cpp
@@ -13,9 +13,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
 
 // For how many sizes should math functions be tested?
 #define MATH_RANGE 64, 64
diff --git a/benchmark/benchmark_random.cpp b/benchmark/benchmark_random.cpp
@@ -11,10 +11,10 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xrandom.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/generators/xrandom.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_reducer.cpp b/benchmark/benchmark_reducer.cpp
@@ -8,8 +8,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xreducer.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/reducers/xreducer.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_view_access.cpp b/benchmark/benchmark_view_access.cpp
@@ -8,14 +8,14 @@
 
 #include <benchmark/benchmark.h>
 
-// #include "xtensor/xshape.hpp"
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xrandom.hpp"
-#include "xtensor/xstorage.hpp"
-#include "xtensor/xutils.hpp"
-#include "xtensor/xview.hpp"
+// #include "xtensor/core/core/xshape.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/containers/xstorage.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/generators/xrandom.hpp"
+#include "xtensor/utils/xutils.hpp"
+#include "xtensor/views/xview.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_view_adapt.cpp b/benchmark/benchmark_view_adapt.cpp
@@ -11,12 +11,12 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xfixed.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xrandom.hpp"
-#include "xtensor/xtensor.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/generators/xrandom.hpp"
+#include "xtensor/views/xview.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_view_assignment.cpp b/benchmark/benchmark_view_assignment.cpp
@@ -8,11 +8,11 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xfixed.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xrandom.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/generators/xrandom.hpp"
 
 namespace xt
 {
@@ -61,23 +61,24 @@ namespace xt
         }
     }
 
-    inline void assign_create_strided_view(benchmark::State& state)
-    {
-        xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
-        for (auto _ : state)
-        {
-            for (std::size_t i = 0; i < tens.shape()[0]; ++i)
-            {
-                for (std::size_t j = 0; j < tens.shape()[1]; ++j)
-                {
-                    auto v = xt::strided_view(tens, {i, j, all(), all()});
-                    xt::xtensor<double, 2> vas = v;
-                    benchmark::ClobberMemory();
-                }
-            }
-        }
-    }
-
+    /**
+     *     inline void assign_create_strided_view(benchmark::State& state)
+     *     {
+     *         xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
+     *         for (auto _ : state)
+     *         {
+     *             for (std::size_t i = 0; i < tens.shape()[0]; ++i)
+     *             {
+     *                 for (std::size_t j = 0; j < tens.shape()[1]; ++j)
+     *                 {
+     *                     auto v = xt::strided_view(tens, {i, j, all(), all()});
+     *                     xt::xtensor<double, 2> vas = v;
+     *                     benchmark::ClobberMemory();
+     *                 }
+     *             }
+     *         }
+     *     }
+     */
     inline void assign_create_manual_view(benchmark::State& state)
     {
         xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
@@ -151,7 +152,7 @@ namespace xt
     BENCHMARK(create_strided_view_outofplace);
     BENCHMARK(create_strided_view_inplace);
     BENCHMARK(assign_create_manual_noview);
-    BENCHMARK(assign_create_strided_view);
+    //    BENCHMARK(assign_create_strided_view);
     BENCHMARK(assign_create_view);
     BENCHMARK(assign_create_manual_view);
     BENCHMARK(data_offset);
diff --git a/benchmark/benchmark_views.cpp b/benchmark/benchmark_views.cpp
@@ -12,13 +12,13 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xmanipulation.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xstrided_view.hpp"
-#include "xtensor/xstrides.hpp"
-#include "xtensor/xtensor.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/core/xstrides.hpp"
+#include "xtensor/misc/xmanipulation.hpp"
+#include "xtensor/views/xstrided_view.hpp"
+#include "xtensor/views/xview.hpp"
 
 namespace xt
 {
diff --git a/benchmark/benchmark_xshape.cpp b/benchmark/benchmark_xshape.cpp
@@ -12,8 +12,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xshape.hpp"
-#include "xtensor/xstorage.hpp"
+#include "xtensor/containers/xstorage.hpp"
+#include "xtensor/core/xshape.hpp"
 
 namespace xt
 {
diff --git a/benchmark/main.cpp b/benchmark/main.cpp
@@ -10,8 +10,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #ifdef XTENSOR_USE_XSIMD
 #ifdef __GNUC__

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`
`13`	`13`	`#include <benchmark/benchmark.h>`
`14`	`14`
`15`		`-#include "xtensor/xarray.hpp"`
`16`		`-#include "xtensor/xtensor.hpp"`
	`15`	`+#include "xtensor/containers/xarray.hpp"`
	`16`	`+#include "xtensor/containers/xtensor.hpp"`
`17`	`17`
`18`	`18`	`namespace xt`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`#include <benchmark/benchmark.h>`
`10`	`10`
`11`		`-#include "xtensor/xarray.hpp"`
`12`		`-#include "xtensor/xreducer.hpp"`
	`11`	`+#include "xtensor/containers/xarray.hpp"`
	`12`	`+#include "xtensor/reducers/xreducer.hpp"`
`13`	`13`
`14`	`14`	`namespace xt`
`15`	`15`	`{`