Commit bc092fb3 authored by Marian Triebe's avatar Marian Triebe

Merge branch 'master' into topic/opencl

parents f10b5aee 37c4ed35
...@@ -118,7 +118,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -118,7 +118,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
}; };
} }
void enqueue(const message_header& hdr, any_tuple msg) override { void enqueue(msg_hdr_cref hdr, any_tuple msg, execution_unit*) override {
CPPA_LOG_TRACE(""); CPPA_LOG_TRACE("");
typename util::il_indices<util::type_list<Args...>>::type indices; typename util::il_indices<util::type_list<Args...>>::type indices;
enqueue_impl(hdr.sender, std::move(msg), hdr.id, indices); enqueue_impl(hdr.sender, std::move(msg), hdr.id, indices);
...@@ -130,10 +130,10 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -130,10 +130,10 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
using args_vec = std::vector<mem_ptr>; using args_vec = std::vector<mem_ptr>;
actor_facade(const program& prog, kernel_ptr kernel, actor_facade(const program& prog, kernel_ptr kernel,
const dim_vec& global_dimensions, const dim_vec& global_dimensions,
const dim_vec& global_offsets, const dim_vec& global_offsets,
const dim_vec& local_dimensions, const dim_vec& local_dimensions,
arg_mapping map_args, result_mapping map_result, arg_mapping map_args, result_mapping map_result,
size_t result_size) size_t result_size)
: m_kernel(kernel) , m_program(prog.m_program) : m_kernel(kernel) , m_program(prog.m_program)
, m_context(prog.m_context) , m_queue(prog.m_queue) , m_context(prog.m_context) , m_queue(prog.m_queue)
...@@ -155,10 +155,10 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -155,10 +155,10 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
response_promise handle{this->address(), sender, id.response_id()}; response_promise handle{this->address(), sender, id.response_id()};
evnt_vec events; evnt_vec events;
args_vec arguments; args_vec arguments;
add_arguments_to_kernel<Ret>(events, arguments, m_result_size, add_arguments_to_kernel<Ret>(events, arguments, m_result_size,
get_ref<Is>(*opt)...); get_ref<Is>(*opt)...);
auto cmd = make_counted<command<actor_facade, Ret>>( auto cmd = make_counted<command<actor_facade, Ret>>(
handle, this, handle, this,
std::move(events), std::move(arguments), std::move(events), std::move(arguments),
m_result_size, *opt m_result_size, *opt
); );
...@@ -194,7 +194,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -194,7 +194,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
} }
template<typename T0, typename... Ts> template<typename T0, typename... Ts>
void add_arguments_to_kernel_rec(evnt_vec& events, args_vec& arguments, void add_arguments_to_kernel_rec(evnt_vec& events, args_vec& arguments,
T0& arg0, Ts&... args) { T0& arg0, Ts&... args) {
cl_int err{0}; cl_int err{0};
size_t buffer_size = sizeof(typename T0::value_type) * arg0.size(); size_t buffer_size = sizeof(typename T0::value_type) * arg0.size();
......
...@@ -97,9 +97,11 @@ void opencl_metainfo::initialize() ...@@ -97,9 +97,11 @@ void opencl_metainfo::initialize()
const void *, const void *,
size_t, size_t,
void *) { void *) {
CPPA_LOG_ERROR("\n##### Error message via pfn_notify #####\n" + CPPA_LOGC_ERROR("cppa::opencl::opencl_metainfo",
string(errinfo) + "initialize",
"\n########################################"); "\n##### Error message via pfn_notify #####\n" +
string(errinfo) +
"\n########################################");
}; };
// create a context // create a context
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment