Skip to content

fix: update benchmarks #2848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

fix: update benchmarks #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions benchmark/benchmark_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions benchmark/benchmark_assign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions benchmark/benchmark_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions benchmark/benchmark_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions benchmark/benchmark_creation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions benchmark/benchmark_increment_stepper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions benchmark/benchmark_lambda_expressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions benchmark/benchmark_math.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions benchmark/benchmark_random.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions benchmark/benchmark_reducer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
16 changes: 8 additions & 8 deletions benchmark/benchmark_view_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
12 changes: 6 additions & 6 deletions benchmark/benchmark_view_adapt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
47 changes: 24 additions & 23 deletions benchmark/benchmark_view_assignment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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});
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions benchmark/benchmark_views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions benchmark/benchmark_xshape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions benchmark/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
Loading