Skip to content

Commit 2be98b4

Browse files
sbstndbsbstndb
authored
fix: update benchmarks (#2848)
# 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.
1 parent 6705ba7 commit 2be98b4

16 files changed

+82
-81
lines changed

‎benchmark/benchmark_adapter.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
// #include "xtensor/xshape.hpp"
12-
#include "xtensor/xadapt.hpp"
13-
#include "xtensor/xnoalias.hpp"
14-
#include "xtensor/xstorage.hpp"
15-
#include "xtensor/xutils.hpp"
11+
// #include "xtensor/core/core/xshape.hpp"
12+
#include "xtensor/containers/xadapt.hpp"
13+
#include "xtensor/containers/xstorage.hpp"
14+
#include "xtensor/core/xnoalias.hpp"
15+
#include "xtensor/utils/xutils.hpp"
1616

1717
namespace xt
1818
{

‎benchmark/benchmark_assign.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#include <benchmark/benchmark.h>
1313

14-
#include "xtensor/xarray.hpp"
15-
#include "xtensor/xnoalias.hpp"
16-
#include "xtensor/xtensor.hpp"
14+
#include "xtensor/containers/xarray.hpp"
15+
#include "xtensor/containers/xtensor.hpp"
16+
#include "xtensor/core/xnoalias.hpp"
1717

1818
namespace xt
1919
{

‎benchmark/benchmark_builder.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xnoalias.hpp"
13-
#include "xtensor/xtensor.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/containers/xtensor.hpp"
13+
#include "xtensor/core/xnoalias.hpp"
1414

1515
namespace xt
1616
{

‎benchmark/benchmark_container.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include <benchmark/benchmark.h>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xtensor.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xtensor.hpp"
1717

1818
namespace xt
1919
{

‎benchmark/benchmark_creation.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xbuilder.hpp"
13-
#include "xtensor/xfixed.hpp"
14-
#include "xtensor/xtensor.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/containers/xfixed.hpp"
13+
#include "xtensor/containers/xtensor.hpp"
14+
#include "xtensor/generators/xbuilder.hpp"
1515

1616
namespace xt
1717
{

‎benchmark/benchmark_increment_stepper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xrandom.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/generators/xrandom.hpp"
1313

1414
#define SHAPE 30, 30
1515
#define RANGE 3, 100

‎benchmark/benchmark_lambda_expressions.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xbuilder.hpp"
13-
#include "xtensor/xmath.hpp"
14-
#include "xtensor/xnoalias.hpp"
15-
#include "xtensor/xtensor.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/containers/xtensor.hpp"
13+
#include "xtensor/core/xmath.hpp"
14+
#include "xtensor/core/xnoalias.hpp"
15+
#include "xtensor/generators/xbuilder.hpp"
1616

1717
namespace xt
1818
{

‎benchmark/benchmark_math.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
#include <benchmark/benchmark.h>
1515

16-
#include "xtensor/xarray.hpp"
17-
#include "xtensor/xnoalias.hpp"
18-
#include "xtensor/xtensor.hpp"
16+
#include "xtensor/containers/xarray.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/core/xnoalias.hpp"
1919

2020
// For how many sizes should math functions be tested?
2121
#define MATH_RANGE 64, 64

‎benchmark/benchmark_random.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
#include <benchmark/benchmark.h>
1313

14-
#include "xtensor/xarray.hpp"
15-
#include "xtensor/xnoalias.hpp"
16-
#include "xtensor/xrandom.hpp"
17-
#include "xtensor/xtensor.hpp"
14+
#include "xtensor/containers/xarray.hpp"
15+
#include "xtensor/containers/xtensor.hpp"
16+
#include "xtensor/core/xnoalias.hpp"
17+
#include "xtensor/generators/xrandom.hpp"
1818

1919
namespace xt
2020
{

‎benchmark/benchmark_reducer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xreducer.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/reducers/xreducer.hpp"
1313

1414
namespace xt
1515
{

‎benchmark/benchmark_view_access.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
// #include "xtensor/xshape.hpp"
12-
#include "xtensor/xadapt.hpp"
13-
#include "xtensor/xbuilder.hpp"
14-
#include "xtensor/xnoalias.hpp"
15-
#include "xtensor/xrandom.hpp"
16-
#include "xtensor/xstorage.hpp"
17-
#include "xtensor/xutils.hpp"
18-
#include "xtensor/xview.hpp"
11+
// #include "xtensor/core/core/xshape.hpp"
12+
#include "xtensor/containers/xadapt.hpp"
13+
#include "xtensor/containers/xstorage.hpp"
14+
#include "xtensor/core/xnoalias.hpp"
15+
#include "xtensor/generators/xbuilder.hpp"
16+
#include "xtensor/generators/xrandom.hpp"
17+
#include "xtensor/utils/xutils.hpp"
18+
#include "xtensor/views/xview.hpp"
1919

2020
namespace xt
2121
{

‎benchmark/benchmark_view_adapt.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
#include <benchmark/benchmark.h>
1313

14-
#include "xtensor/xadapt.hpp"
15-
#include "xtensor/xfixed.hpp"
16-
#include "xtensor/xnoalias.hpp"
17-
#include "xtensor/xrandom.hpp"
18-
#include "xtensor/xtensor.hpp"
19-
#include "xtensor/xview.hpp"
14+
#include "xtensor/containers/xadapt.hpp"
15+
#include "xtensor/containers/xfixed.hpp"
16+
#include "xtensor/containers/xtensor.hpp"
17+
#include "xtensor/core/xnoalias.hpp"
18+
#include "xtensor/generators/xrandom.hpp"
19+
#include "xtensor/views/xview.hpp"
2020

2121
namespace xt
2222
{

‎benchmark/benchmark_view_assignment.cpp

+24-23
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
#include <benchmark/benchmark.h>
1010

11-
#include "xtensor/xarray.hpp"
12-
#include "xtensor/xfixed.hpp"
13-
#include "xtensor/xnoalias.hpp"
14-
#include "xtensor/xrandom.hpp"
15-
#include "xtensor/xtensor.hpp"
11+
#include "xtensor/containers/xarray.hpp"
12+
#include "xtensor/containers/xfixed.hpp"
13+
#include "xtensor/containers/xtensor.hpp"
14+
#include "xtensor/core/xnoalias.hpp"
15+
#include "xtensor/generators/xrandom.hpp"
1616

1717
namespace xt
1818
{
@@ -61,23 +61,24 @@ namespace xt
6161
}
6262
}
6363

64-
inline void assign_create_strided_view(benchmark::State& state)
65-
{
66-
xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
67-
for (auto _ : state)
68-
{
69-
for (std::size_t i = 0; i < tens.shape()[0]; ++i)
70-
{
71-
for (std::size_t j = 0; j < tens.shape()[1]; ++j)
72-
{
73-
auto v = xt::strided_view(tens, {i, j, all(), all()});
74-
xt::xtensor<double, 2> vas = v;
75-
benchmark::ClobberMemory();
76-
}
77-
}
78-
}
79-
}
80-
64+
/**
65+
* inline void assign_create_strided_view(benchmark::State& state)
66+
* {
67+
* xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
68+
* for (auto _ : state)
69+
* {
70+
* for (std::size_t i = 0; i < tens.shape()[0]; ++i)
71+
* {
72+
* for (std::size_t j = 0; j < tens.shape()[1]; ++j)
73+
* {
74+
* auto v = xt::strided_view(tens, {i, j, all(), all()});
75+
* xt::xtensor<double, 2> vas = v;
76+
* benchmark::ClobberMemory();
77+
* }
78+
* }
79+
* }
80+
* }
81+
*/
8182
inline void assign_create_manual_view(benchmark::State& state)
8283
{
8384
xt::xtensor<double, 4> tens = xt::random::rand<double>({100, 100, 3, 3});
@@ -151,7 +152,7 @@ namespace xt
151152
BENCHMARK(create_strided_view_outofplace);
152153
BENCHMARK(create_strided_view_inplace);
153154
BENCHMARK(assign_create_manual_noview);
154-
BENCHMARK(assign_create_strided_view);
155+
// BENCHMARK(assign_create_strided_view);
155156
BENCHMARK(assign_create_view);
156157
BENCHMARK(assign_create_manual_view);
157158
BENCHMARK(data_offset);

‎benchmark/benchmark_views.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
#include <benchmark/benchmark.h>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xmanipulation.hpp"
17-
#include "xtensor/xnoalias.hpp"
18-
#include "xtensor/xstrided_view.hpp"
19-
#include "xtensor/xstrides.hpp"
20-
#include "xtensor/xtensor.hpp"
21-
#include "xtensor/xview.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xtensor.hpp"
17+
#include "xtensor/core/xnoalias.hpp"
18+
#include "xtensor/core/xstrides.hpp"
19+
#include "xtensor/misc/xmanipulation.hpp"
20+
#include "xtensor/views/xstrided_view.hpp"
21+
#include "xtensor/views/xview.hpp"
2222

2323
namespace xt
2424
{

‎benchmark/benchmark_xshape.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include <benchmark/benchmark.h>
1414

15-
#include "xtensor/xshape.hpp"
16-
#include "xtensor/xstorage.hpp"
15+
#include "xtensor/containers/xstorage.hpp"
16+
#include "xtensor/core/xshape.hpp"
1717

1818
namespace xt
1919
{

‎benchmark/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include <benchmark/benchmark.h>
1212

13-
#include "xtensor/xarray.hpp"
14-
#include "xtensor/xtensor.hpp"
13+
#include "xtensor/containers/xarray.hpp"
14+
#include "xtensor/containers/xtensor.hpp"
1515

1616
#ifdef XTENSOR_USE_XSIMD
1717
#ifdef __GNUC__

0 commit comments

Comments
 (0)