Skip to content

Fix min-max extrema kernel code #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix min-max extrema kernel code #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions include/boost/compute/algorithm/detail/find_extrema_on_cpu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ inline InputIterator find_extrema_on_cpu(InputIterator first,
k.add_arg<uint_ *>(memory_object::global_memory, "output_idx");

k <<
"uint block = " <<
"(uint)ceil(((float)count)/get_global_size(0));\n" <<
"uint index = get_global_id(0) * block;\n" <<
"uint block = (uint)ceil(((float)count)/get_global_size(0));\n" <<
"uint index = min(count - 1, (uint)get_global_id(0) * block);\n" <<
"uint end = min(count, index + block);\n" <<

"uint value_index = index;\n" <<
Expand Down
15 changes: 15 additions & 0 deletions test/test_extrema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,21 @@ BOOST_AUTO_TEST_CASE(int_min_max)
BOOST_CHECK_EQUAL(max_iter.read(queue), 513);
}

BOOST_AUTO_TEST_CASE(int_unhandy_max)
{
boost::compute::vector<int> vector(device.compute_units() * 10, context);

// fill with 0 -> 10 * device.compute_units()
boost::compute::iota(vector.begin(), vector.end(), 0, queue);
// Last compute unit may hit out of range if initial index isn't handled well
int unhandy = 2 * device.compute_units() + 1;

boost::compute::vector<int>::iterator max_iter =
boost::compute::max_element(vector.begin(), vector.begin() + unhandy, queue);
BOOST_CHECK(max_iter == (vector.begin() + unhandy - 1));
BOOST_CHECK_EQUAL(*max_iter, unhandy - 1);
}

BOOST_AUTO_TEST_CASE(int2_min_max_custom_comparision_function)
{
using boost::compute::int2_;
Expand Down