From 465580e2a64adb8d0dfd1aa782a4cf2732334427 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 11 Sep 2023 17:01:25 -0400 Subject: [PATCH 1/4] Adding rmm to raft-ann-bench dependencies --- conda/recipes/raft-ann-bench/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index b817968379..b131a11151 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -78,6 +78,8 @@ requirements: - h5py {{ h5py_version }} - benchmark - matplotlib + # rmm is needed to determine if package is gpu-enabled + - rmm = {{ minor_version }} - python - pandas - pyyaml From a6edbf20d2e80fddca46106d2a4802b99064dc63 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 11 Sep 2023 17:15:24 -0400 Subject: [PATCH 2/4] Update conda/recipes/raft-ann-bench/meta.yaml --- conda/recipes/raft-ann-bench/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/raft-ann-bench/meta.yaml b/conda/recipes/raft-ann-bench/meta.yaml index b131a11151..91d0fdb729 100644 --- a/conda/recipes/raft-ann-bench/meta.yaml +++ b/conda/recipes/raft-ann-bench/meta.yaml @@ -79,7 +79,7 @@ requirements: - benchmark - matplotlib # rmm is needed to determine if package is gpu-enabled - - rmm = {{ minor_version }} + - rmm ={{ minor_version }} - python - pandas - pyyaml From afcbc4629170495ba49d05bf9579bc17264c493d Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 11 Sep 2023 19:05:39 -0400 Subject: [PATCH 3/4] Adding full exception message to skipWithError --- cpp/bench/ann/src/common/benchmark.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp index 4e91ee0690..eaa573f5af 100644 --- a/cpp/bench/ann/src/common/benchmark.hpp +++ b/cpp/bench/ann/src/common/benchmark.hpp @@ -211,9 +211,10 @@ void bench_search(::benchmark::State& state, try { algo->set_search_dataset(dataset->base_set(algo_property.dataset_memory_type), dataset->base_set_size()); - } catch (const std::exception&) { + } catch (const std::exception& ex) { state.SkipWithError("The algorithm '" + index.name + - "' requires the base set, but it's not available."); + "' requires the base set, but it's not available. " + + "Exception: " + ex.what()); return; } } From 2f0a5b61a49325bbcb57631725f143be28706892 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 11 Sep 2023 19:08:27 -0400 Subject: [PATCH 4/4] Adding better exception printing --- cpp/bench/ann/src/common/benchmark.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp index eaa573f5af..4ec977700d 100644 --- a/cpp/bench/ann/src/common/benchmark.hpp +++ b/cpp/bench/ann/src/common/benchmark.hpp @@ -214,7 +214,7 @@ void bench_search(::benchmark::State& state, } catch (const std::exception& ex) { state.SkipWithError("The algorithm '" + index.name + "' requires the base set, but it's not available. " + - "Exception: " + ex.what()); + "Exception: " + std::string(ex.what())); return; } }