Diskann Benchmarking Wrapper #260
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,6 +135,12 @@ void bench_build(::benchmark::State& state, | |
| } | ||
| } | ||
|
|
||
| if (index.algo == "diskann_ssd") { | ||
| make_sure_parent_dir_exists(index.file); | ||
| index.build_param["dataset_file"] = dataset->base_filename(); | ||
| index.build_param["path_to_index"] = index.file; | ||
| } | ||
|
|
||
| std::unique_ptr<algo<T>> algo; | ||
| try { | ||
| algo = create_algo<T>(index.algo, dataset->distance(), dataset->dim(), index.build_param); | ||
|
|
@@ -144,7 +150,8 @@ void bench_build(::benchmark::State& state, | |
|
|
||
| const auto algo_property = parse_algo_property(algo->get_preference(), index.build_param); | ||
|
|
||
| const T* base_set = nullptr; | ||
| if (index.algo != "diskann_ssd") base_set = dataset->base_set(algo_property.dataset_memory_type); | ||
|
There was a problem hiding this comment. @achirkin if we do not have this line, the entire dataset will be read into the |
||
| std::size_t index_size = dataset->base_set_size(); | ||
|
|
||
| cuda_timer gpu_timer{algo}; | ||
|
|
@@ -223,7 +230,12 @@ void bench_search(::benchmark::State& state, | |
|
|
||
| const T* query_set = nullptr; | ||
|
|
||
| std::string filename; | ||
| if (index.algo != "diskann_ssd") | ||
| filename = index.file; | ||
| else | ||
| filename = index.file + "_disk.index"; | ||
| if (!file_exists(filename)) { | ||
| state.SkipWithError("Index file is missing. Run the benchmark in the build mode first."); | ||
| return; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright (c) 2024, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "../common/ann_types.hpp" | ||
| #include "cuvs_vamana_wrapper.h" | ||
|
|
||
| #include <rmm/cuda_device.hpp> | ||
| #include <rmm/mr/device/pool_memory_resource.hpp> | ||
| #include <rmm/resource_ref.hpp> | ||
|
|
||
| namespace cuvs::bench { | ||
|
|
||
| template <typename T, typename IdxT> | ||
| void parse_build_param(const nlohmann::json& conf, | ||
| typename cuvs::bench::cuvs_vamana<T, IdxT>::build_param& param) | ||
| { | ||
| if (conf.contains("graph_degree")) { param.graph_degree = conf.at("graph_degree"); } | ||
| if (conf.contains("visited_size")) { param.visited_size = conf.at("visited_size"); } | ||
| if (conf.contains("alpha")) { param.alpha = conf.at("alpha"); } | ||
| } | ||
|
|
||
| template <typename T, typename IdxT> | ||
| void parse_search_param(const nlohmann::json& conf, | ||
| typename cuvs::bench::cuvs_vamana<T, IdxT>::search_param& param) | ||
| { | ||
| if (conf.contains("L_search")) { param.L_search = conf.at("L_search"); } | ||
| if (conf.contains("num_threads")) { param.num_threads = conf.at("num_threads"); } | ||
| } | ||
|
|
||
| template <typename T> | ||
| auto create_algo(const std::string& algo_name, | ||
| const std::string& distance, | ||
| int dim, | ||
| const nlohmann::json& conf) -> std::unique_ptr<cuvs::bench::algo<T>> | ||
| { | ||
| [[maybe_unused]] cuvs::bench::Metric metric = parse_metric(distance); | ||
| std::unique_ptr<cuvs::bench::algo<T>> a; | ||
|
|
||
| if constexpr (std::is_same_v<T, float> or std::is_same_v<T, std::uint8_t>) { | ||
| if (algo_name == "cuvs_vamana") { | ||
| typename cuvs::bench::cuvs_vamana<T, uint32_t>::build_param param; | ||
| parse_build_param<T, uint32_t>(conf, param); | ||
| a = std::make_unique<cuvs::bench::cuvs_vamana<T, uint32_t>>(metric, dim, param); | ||
| } | ||
| } | ||
|
|
||
| if (!a) { throw std::runtime_error("invalid algo: '" + algo_name + "'"); } | ||
|
|
||
| return a; | ||
| } | ||
|
|
||
| template <typename T> | ||
| auto create_search_param(const std::string& algo_name, const nlohmann::json& conf) | ||
| -> std::unique_ptr<typename cuvs::bench::algo<T>::search_param> | ||
| { | ||
| if (algo_name == "cuvs_vamana") { | ||
| auto param = std::make_unique<typename cuvs::bench::cuvs_vamana<T, uint32_t>::search_param>(); | ||
| parse_search_param<T, uint32_t>(conf, *param); | ||
| return param; | ||
| } | ||
|
|
||
| throw std::runtime_error("invalid algo: '" + algo_name + "'"); | ||
| } | ||
|
|
||
| } // namespace cuvs::bench | ||
|
|
||
| REGISTER_ALGO_INSTANCE(float); | ||
|
|
||
| #ifdef ANN_BENCH_BUILD_MAIN | ||
| #include "../common/benchmark.hpp" | ||
| /* | ||
| [NOTE] Dear developer, | ||
|
|
||
| Please don't modify the content of the `main` function; this will make the behavior of the benchmark | ||
| executable differ depending on the cmake flags and will complicate the debugging. In particular, | ||
| don't try to setup an RMM memory resource here; it will anyway be modified by the memory resource | ||
| set on per-algorithm basis. For example, see `cuvs/cuvs_ann_bench_utils.h`. | ||
| */ | ||
| int main(int argc, char** argv) { return cuvs::bench::run_main(argc, argv); } | ||
| #endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does MSFT DiskANN repo not support ARM?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, they have
mkl-develas a dependency, which is not meant to be installed in aarch64.