Skip to content

Commit

Permalink
Change pika::merge to std::merge (#977)
Browse files Browse the repository at this point in the history
  • Loading branch information
aurianer authored Sep 13, 2023
1 parent d241f41 commit d89739a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/dlaf/eigensolver/tridiag_solver/index_manipulation.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
#pragma once

#include <pika/algorithm.hpp>
#include <algorithm>

#include <pika/execution.hpp>

#include <dlaf/eigensolver/tridiag_solver/kernels.h>
Expand Down Expand Up @@ -103,8 +104,7 @@ void sortIndex(const SizeType i_begin, const SizeType i_end, KSender&& k,
auto split_it = in_index_ptr + k;
auto end_it = in_index_ptr + n;
auto cmp = [v_ptr](const SizeType i1, const SizeType i2) { return v_ptr[i1] < v_ptr[i2]; };
pika::merge(pika::execution::par, begin_it, split_it, split_it, end_it, out_index_ptr,
std::move(cmp));
std::merge(begin_it, split_it, split_it, end_it, out_index_ptr, std::move(cmp));
};

TileCollector tc{i_begin, i_end};
Expand Down

0 comments on commit d89739a

Please sign in to comment.