From 9f84648ececb93dcd37a881e55931b6cb241abde Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 14 Nov 2023 01:07:45 -0500 Subject: [PATCH] Adjusting end-to-end start time so it doesn't include stream creation time (#1989) We can safely assume all cuda streams have been created before we run benchmark experiments. With the sensitivity to latencies for smaller batch sizes, this has an impact on overall throughput. Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Ben Frederickson (https://github.com/benfred) URL: https://github.com/rapidsai/raft/pull/1989 --- cpp/bench/ann/src/common/benchmark.hpp | 2 +- .../raft-ann-bench/src/raft-ann-bench/data_export/__main__.py | 2 +- python/raft-ann-bench/src/raft-ann-bench/run/conf/datasets.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp index 1cbd54cb7b..7db5eab194 100644 --- a/cpp/bench/ann/src/common/benchmark.hpp +++ b/cpp/bench/ann/src/common/benchmark.hpp @@ -287,8 +287,8 @@ void bench_search(::benchmark::State& state, std::shared_ptr> neighbors = std::make_shared>(algo_property.query_memory_type, k * query_set_size); - auto start = std::chrono::high_resolution_clock::now(); cuda_timer gpu_timer; + auto start = std::chrono::high_resolution_clock::now(); { nvtx_case nvtx{state.name()}; diff --git a/python/raft-ann-bench/src/raft-ann-bench/data_export/__main__.py b/python/raft-ann-bench/src/raft-ann-bench/data_export/__main__.py index fd6c2077e7..3a547938ce 100644 --- a/python/raft-ann-bench/src/raft-ann-bench/data_export/__main__.py +++ b/python/raft-ann-bench/src/raft-ann-bench/data_export/__main__.py @@ -114,7 +114,7 @@ def convert_json_to_csv_search(dataset, dataset_path): write["build cpu_time"] = None write["build GPU"] = None - for col_idx in range(5, len(build_df.columns)): + for col_idx in range(6, len(build_df.columns)): col_name = build_df.columns[col_idx] write[col_name] = None diff --git a/python/raft-ann-bench/src/raft-ann-bench/run/conf/datasets.yaml b/python/raft-ann-bench/src/raft-ann-bench/run/conf/datasets.yaml index a2b948a464..be63e1d535 100644 --- a/python/raft-ann-bench/src/raft-ann-bench/run/conf/datasets.yaml +++ b/python/raft-ann-bench/src/raft-ann-bench/run/conf/datasets.yaml @@ -107,7 +107,7 @@ - name: wiki_all_1M dims: 768 - base_file: wiki_all_1M/base.1MM.fbin + base_file: wiki_all_1M/base.1M.fbin query_file: wiki_all_1M/queries.fbin groundtruth_neighbors_file: wiki_all_1M/groundtruth.1M.neighbors.ibin distance: euclidean