Skip to content

Misc fixes #648

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

Merged
merged 4 commits into from
Aug 23, 2016
Merged

Misc fixes #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cd0222
Fix typo in context.hpp
jszuppe Aug 16, 2016
5442427
Fix typo in wait_list
jszuppe Aug 22, 2016
45ea54f
Fix gather algorithm
jszuppe Aug 22, 2016
2bd90c6
Fix C4267 warn. when compiling with MSVC, OpenCL 2.0
jszuppe Aug 22, 2016
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
4 changes: 1 addition & 3 deletions include/boost/compute/algorithm/gather.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class gather_kernel : public meta_kernel
OutputIterator result)
{
m_count = iterator_range_size(first, last);
m_offset = first.get_index();

*this <<
"const uint i = get_global_id(0);\n" <<
Expand All @@ -50,12 +49,11 @@ class gather_kernel : public meta_kernel
return event();
}

return exec_1d(queue, m_offset, m_count);
return exec_1d(queue, 0, m_count);
}

private:
size_t m_count;
size_t m_offset;
};

} // end detail namespace
Expand Down
2 changes: 1 addition & 1 deletion include/boost/compute/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class context
typename detail::get_object_info_type<context, Enum>::type
get_info() const;

/// Returns \c true if the context is the same at \p other.
/// Returns \c true if the context is the same as \p other.
bool operator==(const context &other) const
{
return m_context == other.m_context;
Expand Down
2 changes: 1 addition & 1 deletion include/boost/compute/kernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class kernel
void set_arg_svm_ptr(size_t index, void* ptr)
{
#ifdef CL_VERSION_2_0
cl_int ret = clSetKernelArgSVMPointer(m_kernel, index, ptr);
cl_int ret = clSetKernelArgSVMPointer(m_kernel, static_cast<cl_uint>(index), ptr);
if(ret != CL_SUCCESS){
BOOST_THROW_EXCEPTION(opencl_error(ret));
}
Expand Down
2 changes: 1 addition & 1 deletion include/boost/compute/utility/wait_list.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ template<class T> class future;
/// specify dependencies for OpenCL operations or to wait on the host until
/// all of the events have completed.
///
/// This class also provides convenience fnuctions for interacting with
/// This class also provides convenience functions for interacting with
/// OpenCL APIs which typically accept event dependencies as a \c cl_event*
/// pointer and a \c cl_uint size. For example:
/// \code
Expand Down
5 changes: 5 additions & 0 deletions test/test_gather.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ BOOST_AUTO_TEST_CASE(gather_int)
indices.begin(), indices.end(), input.begin(), output.begin(), queue
);
CHECK_RANGE_EQUAL(int, 5, output, (1, 5, 2, 4, 3));

compute::gather(
indices.begin() + 1, indices.end(), input.begin(), output.begin(), queue
);
CHECK_RANGE_EQUAL(int, 5, output, (5, 2, 4, 3, 3));
}

BOOST_AUTO_TEST_CASE(copy_index_then_gather)
Expand Down