Skip to content

Commit de29ca6

Browse files
authored
Merge pull request #3394 from eseiler/fix/latest
fix: latest google benchmark
2 parents 99890b9 + d1d4865 commit de29ca6

6 files changed

Lines changed: 54 additions & 6 deletions

File tree

test/performance/range/gap_decorator_helper.hpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
#include <seqan3/alignment/exception.hpp>
1717
#include <seqan3/alphabet/all.hpp>
1818

19+
namespace benchmark
20+
{
21+
#pragma GCC diagnostic push
22+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
23+
using Benchmark = benchmark::internal::Benchmark;
24+
#pragma GCC diagnostic pop
25+
} // namespace benchmark
26+
1927
#define SEQAN3_LEN_LONG 1 << 18
2028
#define SEQAN3_LEN_SHORT 1 << 12
2129

@@ -29,7 +37,7 @@
2937
* | !SEQAN3_LONG_TESTS | 1 << [4:2:12] | [1, 5, 50] %
3038
* | SEQAN3_LONG_TESTS | 1 << [4:2:18] | [1, 5, 25, 50, 75] %
3139
*/
32-
void custom_arguments(benchmark::internal::Benchmark * b)
40+
void custom_arguments(benchmark::Benchmark * b)
3341
{
3442
std::vector<long long int> gap_percentages{1, 5, 50};
3543
long long int seq_len_max = SEQAN3_LEN_SHORT;

test/performance/search/dream_index/interleaved_bloom_filter_benchmark.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@
99
#include <seqan3/utility/range/to.hpp>
1010
#include <seqan3/utility/views/zip.hpp>
1111

12+
namespace benchmark
13+
{
14+
#pragma GCC diagnostic push
15+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
16+
using Benchmark = benchmark::internal::Benchmark;
17+
#pragma GCC diagnostic pop
18+
} // namespace benchmark
19+
1220
inline benchmark::Counter hashes_per_second(size_t const count)
1321
{
1422
return benchmark::Counter(count, benchmark::Counter::kIsIterationInvariantRate, benchmark::Counter::OneK::kIs1000);
1523
}
1624

17-
static void arguments(benchmark::internal::Benchmark * b)
25+
static void arguments(benchmark::Benchmark * b)
1826
{
1927
// Bins must be powers of two
2028
for (int32_t bins : {64, 8192})

test/performance/search/index_construction_benchmark.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,18 @@
1717
# include <seqan/index.h>
1818
#endif
1919

20+
namespace benchmark
21+
{
22+
#pragma GCC diagnostic push
23+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
24+
using Benchmark = benchmark::internal::Benchmark;
25+
#pragma GCC diagnostic pop
26+
} // namespace benchmark
27+
2028
static constexpr int32_t max_length{50000};
2129
static constexpr size_t seed{0x6'12'6f};
2230

23-
static void arguments(benchmark::internal::Benchmark * b)
31+
static void arguments(benchmark::Benchmark * b)
2432
{
2533
#ifndef NDEBUG
2634
constexpr std::array<int32_t, 2> values{50, 5000};

test/performance/search/views/view_kmer_hash_benchmark.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
# include <seqan/index.h>
1414
#endif // SEQAN3_HAS_SEQAN2
1515

16+
namespace benchmark
17+
{
18+
#pragma GCC diagnostic push
19+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
20+
using Benchmark = benchmark::internal::Benchmark;
21+
#pragma GCC diagnostic pop
22+
} // namespace benchmark
23+
1624
inline benchmark::Counter bp_per_second(size_t const basepairs)
1725
{
1826
return benchmark::Counter(basepairs,
@@ -32,7 +40,7 @@ inline seqan3::shape make_gapped_shape(size_t const k)
3240
return shape;
3341
}
3442

35-
static void arguments(benchmark::internal::Benchmark * b)
43+
static void arguments(benchmark::Benchmark * b)
3644
{
3745
for (int32_t sequence_length : {1000, 50000, /*1'000'000*/})
3846
{

test/performance/search/views/view_minimiser_hash_benchmark.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
# include <seqan/index.h>
1717
#endif // SEQAN3_HAS_SEQAN2
1818

19+
namespace benchmark
20+
{
21+
#pragma GCC diagnostic push
22+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
23+
using Benchmark = benchmark::internal::Benchmark;
24+
#pragma GCC diagnostic pop
25+
} // namespace benchmark
26+
1927
inline benchmark::Counter bp_per_second(size_t const basepairs)
2028
{
2129
return benchmark::Counter(basepairs,
@@ -35,7 +43,7 @@ inline seqan3::shape make_gapped_shape(size_t const k)
3543
return shape;
3644
}
3745

38-
static void arguments(benchmark::internal::Benchmark * b)
46+
static void arguments(benchmark::Benchmark * b)
3947
{
4048
for (int32_t sequence_length : {50000, /*1'000'000*/})
4149
{

test/performance/utility/bloom_filter/bloom_filter_benchmark.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@
77
#include <seqan3/test/performance/sequence_generator.hpp>
88
#include <seqan3/utility/bloom_filter/bloom_filter.hpp>
99

10+
namespace benchmark
11+
{
12+
#pragma GCC diagnostic push
13+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
14+
using Benchmark = benchmark::internal::Benchmark;
15+
#pragma GCC diagnostic pop
16+
} // namespace benchmark
17+
1018
inline benchmark::Counter hashes_per_second(size_t const count)
1119
{
1220
return benchmark::Counter(count, benchmark::Counter::kIsIterationInvariantRate, benchmark::Counter::OneK::kIs1000);
1321
}
1422

15-
static void arguments(benchmark::internal::Benchmark * b)
23+
static void arguments(benchmark::Benchmark * b)
1624
{
1725
// Size of the IBF will be 2^bits bits
1826
for (int32_t bits = 15; bits <= 20; bits += 5)

0 commit comments

Comments
 (0)