Removed Longest Median benchmarks. Updated benchmark radii.

Author: Jaybro

examples/benchmark/bm_nanoflann.cpp

@@ -144,17 +144,17 @@ BENCHMARK_DEFINE_F(BmNanoflann, RadiusCt)(benchmark::State& state) {
 // Argument 2: Search radius (divided by 10.0).
 BENCHMARK_REGISTER_F(BmNanoflann, RadiusCt)
     ->Unit(benchmark::kMillisecond)
-    ->Args({1, 2})
-    ->Args({6, 2})
-    ->Args({8, 2})
-    ->Args({10, 2})
-    ->Args({12, 2})
-    ->Args({14, 2})
-    ->Args({1, 4})
-    ->Args({6, 4})
-    ->Args({8, 4})
-    ->Args({10, 4})
-    ->Args({12, 4})
-    ->Args({14, 4});
+    ->Args({1, 15})
+    ->Args({6, 15})
+    ->Args({8, 15})
+    ->Args({10, 15})
+    ->Args({12, 15})
+    ->Args({14, 15})
+    ->Args({1, 30})
+    ->Args({6, 30})
+    ->Args({8, 30})
+    ->Args({10, 30})
+    ->Args({12, 30})
+    ->Args({14, 30});
 
 BENCHMARK_MAIN();

examples/benchmark/bm_pico_kd_tree.cpp

@@ -11,26 +11,13 @@ using PicoTraits =
 template <typename PointX>
 using PicoKdTreeCtSldMid = pico_tree::KdTree<PicoTraits<PointX>>;
 
-template <typename PointX>
-using PicoKdTreeCtLngMed = pico_tree::KdTree<
-    PicoTraits<PointX>,
-    pico_tree::L2Squared<PicoTraits<PointX>>,
-    pico_tree::SplitterLongestMedian<PicoTraits<PointX>>>;
-
 template <typename PointX>
 using PicoKdTreeRtSldMid = pico_tree::KdTree<
     PicoTraits<PointX>,
     pico_tree::L2Squared<PicoTraits<PointX>>,
     pico_tree::SplitterSlidingMidpoint<PicoTraits<PointX>>,
     pico_tree::kDynamicDim>;
 
-template <typename PointX>
-using PicoKdTreeRtLngMed = pico_tree::KdTree<
-    PicoTraits<PointX>,
-    pico_tree::L2Squared<PicoTraits<PointX>>,
-    pico_tree::SplitterLongestMedian<PicoTraits<PointX>>,
-    pico_tree::kDynamicDim>;
-
 class BmPicoKdTree : public pico_tree::Benchmark {
  public:
 };
@@ -47,14 +34,6 @@ BENCHMARK_DEFINE_F(BmPicoKdTree, BuildCtSldMid)(benchmark::State& state) {
   }
 }
 
-BENCHMARK_DEFINE_F(BmPicoKdTree, BuildCtLngMed)(benchmark::State& state) {
-  int max_leaf_size = state.range(0);
-
-  for (auto _ : state) {
-    PicoKdTreeCtLngMed<PointX> tree(points_tree_, max_leaf_size);
-  }
-}
-
 BENCHMARK_DEFINE_F(BmPicoKdTree, BuildRtSldMid)(benchmark::State& state) {
   int max_leaf_size = state.range(0);
 
@@ -63,32 +42,16 @@ BENCHMARK_DEFINE_F(BmPicoKdTree, BuildRtSldMid)(benchmark::State& state) {
   }
 }
 
-BENCHMARK_DEFINE_F(BmPicoKdTree, BuildRtLngMed)(benchmark::State& state) {
-  int max_leaf_size = state.range(0);
-
-  for (auto _ : state) {
-    PicoKdTreeRtLngMed<PointX> tree(points_tree_, max_leaf_size);
-  }
-}
-
 // Argument 1: Maximum leaf size.
 BENCHMARK_REGISTER_F(BmPicoKdTree, BuildCtSldMid)
     ->Unit(benchmark::kMillisecond)
     ->Arg(1)
     ->DenseRange(6, 14, 2);
-BENCHMARK_REGISTER_F(BmPicoKdTree, BuildCtLngMed)
-    ->Unit(benchmark::kMillisecond)
-    ->Arg(1)
-    ->DenseRange(6, 14, 2);
 
 BENCHMARK_REGISTER_F(BmPicoKdTree, BuildRtSldMid)
     ->Unit(benchmark::kMillisecond)
     ->Arg(1)
     ->DenseRange(6, 14, 2);
-BENCHMARK_REGISTER_F(BmPicoKdTree, BuildRtLngMed)
-    ->Unit(benchmark::kMillisecond)
-    ->Arg(1)
-    ->DenseRange(6, 14, 2);
 
 // ****************************************************************************
 // Knn
@@ -110,22 +73,6 @@ BENCHMARK_DEFINE_F(BmPicoKdTree, KnnCtSldMid)(benchmark::State& state) {
   }
 }
 
-BENCHMARK_DEFINE_F(BmPicoKdTree, KnnCtLngMed)(benchmark::State& state) {
-  int max_leaf_size = state.range(0);
-  int knn_count = state.range(1);
-
-  PicoKdTreeCtLngMed<PointX> tree(points_tree_, max_leaf_size);
-
-  for (auto _ : state) {
-    std::vector<pico_tree::Neighbor<Index, Scalar>> results;
-    std::size_t sum = 0;
-    for (auto const& p : points_test_) {
-      tree.SearchKnn(p, knn_count, &results);
-      benchmark::DoNotOptimize(sum += results.size());
-    }
-  }
-}
-
 BENCHMARK_DEFINE_F(BmPicoKdTree, NnCtSldMid)(benchmark::State& state) {
   int max_leaf_size = state.range(0);
 
@@ -139,19 +86,6 @@ BENCHMARK_DEFINE_F(BmPicoKdTree, NnCtSldMid)(benchmark::State& state) {
   }
 }
 
-BENCHMARK_DEFINE_F(BmPicoKdTree, NnCtLngMed)(benchmark::State& state) {
-  int max_leaf_size = state.range(0);
-
-  PicoKdTreeCtLngMed<PointX> tree(points_tree_, max_leaf_size);
-
-  for (auto _ : state) {
-    pico_tree::Neighbor<Index, Scalar> result;
-    for (auto const& p : points_test_) {
-      tree.SearchNn(p, &result);
-    }
-  }
-}
-
 BENCHMARK_REGISTER_F(BmPicoKdTree, KnnCtSldMid)
     ->Unit(benchmark::kMillisecond)
     ->Args({1, 1})
@@ -179,18 +113,6 @@ BENCHMARK_REGISTER_F(BmPicoKdTree, KnnCtSldMid)
     ->Args({12, 12})
     ->Args({14, 12});
 
-// For a single nn this method performs the fasted. Increasing the amount of nns
-// will land it in between sliding midpoint and nanoflann, until it seems to
-// become slower than both other methods.
-BENCHMARK_REGISTER_F(BmPicoKdTree, KnnCtLngMed)
-    ->Unit(benchmark::kMillisecond)
-    ->Args({1, 4})
-    ->Args({6, 4})
-    ->Args({8, 4})
-    ->Args({10, 4})
-    ->Args({12, 4})
-    ->Args({14, 4});
-
 // The 2nd argument is used to keep plot_benchmarks.py the same.
 BENCHMARK_REGISTER_F(BmPicoKdTree, NnCtSldMid)
     ->Unit(benchmark::kMillisecond)
@@ -201,16 +123,6 @@ BENCHMARK_REGISTER_F(BmPicoKdTree, NnCtSldMid)
     ->Args({12, 1})
     ->Args({14, 1});
 
-// The 2nd argument is used to keep plot_benchmarks.py the same.
-BENCHMARK_REGISTER_F(BmPicoKdTree, NnCtLngMed)
-    ->Unit(benchmark::kMillisecond)
-    ->Args({1, 1})
-    ->Args({6, 1})
-    ->Args({8, 1})
-    ->Args({10, 1})
-    ->Args({12, 1})
-    ->Args({14, 1});
-
 // ****************************************************************************
 // Radius
 // ****************************************************************************
@@ -236,17 +148,17 @@ BENCHMARK_DEFINE_F(BmPicoKdTree, RadiusCtSldMid)(benchmark::State& state) {
 // Argument 2: Search radius (divided by 10.0).
 BENCHMARK_REGISTER_F(BmPicoKdTree, RadiusCtSldMid)
     ->Unit(benchmark::kMillisecond)
-    ->Args({1, 2})
-    ->Args({6, 2})
-    ->Args({8, 2})
-    ->Args({10, 2})
-    ->Args({12, 2})
-    ->Args({14, 2})
-    ->Args({1, 4})
-    ->Args({6, 4})
-    ->Args({8, 4})
-    ->Args({10, 4})
-    ->Args({12, 4})
-    ->Args({14, 4});
+    ->Args({1, 15})
+    ->Args({6, 15})
+    ->Args({8, 15})
+    ->Args({10, 15})
+    ->Args({12, 15})
+    ->Args({14, 15})
+    ->Args({1, 30})
+    ->Args({6, 30})
+    ->Args({8, 30})
+    ->Args({10, 30})
+    ->Args({12, 30})
+    ->Args({14, 30});
 
 BENCHMARK_MAIN();