Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
tfeher committed Nov 14, 2023
1 parent bb0f9e8 commit ca2f17a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cpp/bench/ann/src/raft/raft_ann_bench_param_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -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\", "
Expand Down

0 comments on commit ca2f17a

Please sign in to comment.