Skip to content
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

Jump to bottom

Allow kernel argument to take custom struct by value #834

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

Allow kernel argument to take custom struct by value #834

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
8 changes: 8 additions & 0 deletions include/boost/compute/types/struct.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ inline std::string adapt_struct_insert_member(T (Struct::*)[N], const char *name
) \
<< "}"; \
} \
template<> \
struct set_kernel_arg<type> \
{ \
void operator()(kernel &kernel_, size_t index, const type &c) \
{ \
kernel_.set_arg(index, sizeof(type), &c); \
} \
}; \
}}}

#endif // BOOST_COMPUTE_TYPES_STRUCT_HPP
33 changes: 33 additions & 0 deletions test/test_struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <boost/compute/type_traits/type_definition.hpp>
#include <boost/compute/utility/source.hpp>

#include "check_macros.hpp"

namespace compute = boost::compute;

// example code defining an atom class
Expand Down Expand Up @@ -131,6 +133,37 @@ BOOST_AUTO_TEST_CASE(custom_kernel)
queue.enqueue_1d_range_kernel(custom_kernel, 0, atoms.size(), 1);
}

BOOST_AUTO_TEST_CASE(custom_kernel_set_struct_by_value)
{
std::string source = BOOST_COMPUTE_STRINGIZE_SOURCE(
__kernel void custom_kernel(Atom atom,
__global float *position,
__global int *number)
{
position[0] = atom.x;
position[1] = atom.y;
position[2] = atom.z;
number[0] = atom.number;
}
);
source = compute::type_definition<chemistry::Atom>() + "\n" + source;
compute::program program =
compute::program::build_with_source(source, context);
compute::kernel custom_kernel = program.create_kernel("custom_kernel");

chemistry::Atom atom(1.0f, 2.0f, 3.0f, 4);
compute::vector<float> position(3);
compute::vector<int> number(1);

custom_kernel.set_arg(0, atom);
custom_kernel.set_arg(1, position);
custom_kernel.set_arg(2, number);
queue.enqueue_task(custom_kernel);

CHECK_RANGE_EQUAL(float, 3, position, (1.0f, 2.0f, 3.0f));
CHECK_RANGE_EQUAL(int, 1, number, (4));
}

// Creates a StructWithArray containing 'x', 'y', 'z'.
StructWithArray make_struct_with_array(int x, int y, int z)
{
Expand Down