From ca2f17a57760e39ae1289c846b7fa8c70bd7032c Mon Sep 17 00:00:00 2001 From: Tamas Bela Feher Date: Tue, 14 Nov 2023 22:13:27 +0100 Subject: [PATCH] Fix merge error --- cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h b/cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h index 8edae1c005..f5741dee17 100644 --- a/cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h +++ b/cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h @@ -206,14 +206,14 @@ void parse_build_param(const nlohmann::json& conf, } } -AllocatorType parse_allocator(std::string mem_type) +raft::bench::ann::AllocatorType parse_allocator(std::string mem_type) { if (mem_type == "device") { - return AllocatorType::Device; + return raft::bench::ann::AllocatorType::Device; } else if (mem_type == "host_pinned") { - return AllocatorType::HostPinned; + return raft::bench::ann::AllocatorType::HostPinned; } else if (mem_type == "host_huge_page") { - return AllocatorType::HostHugePage; + return raft::bench::ann::AllocatorType::HostHugePage; } THROW( "Invalid value for memory type %s, must be one of [\"device\", \"host_pinned\", "