Commit 42045189 authored by Marian Triebe's avatar Marian Triebe

Coding style

clang-format with BreakConstructorInitializersBeforeComma false
parent 3d59325f
...@@ -55,8 +55,8 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -55,8 +55,8 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
friend class command<actor_facade, Ret>; friend class command<actor_facade, Ret>;
public: public:
using args_tuple = cow_tuple< using args_tuple =
typename detail::rm_const_and_ref<Args>::type...>; cow_tuple<typename detail::rm_const_and_ref<Args>::type...>;
using arg_mapping = std::function<optional<args_tuple>(any_tuple)>; using arg_mapping = std::function<optional<args_tuple>(any_tuple)>;
using result_mapping = std::function<any_tuple(Ret&)>; using result_mapping = std::function<any_tuple(Ret&)>;
...@@ -114,16 +114,16 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -114,16 +114,16 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
const dim_vec& global_dimensions, const dim_vec& global_offsets, const dim_vec& global_dimensions, const dim_vec& global_offsets,
const dim_vec& local_dimensions, arg_mapping map_args, const dim_vec& local_dimensions, arg_mapping map_args,
result_mapping map_result, size_t result_size) result_mapping map_result, size_t result_size)
: m_kernel(kernel) : m_kernel(kernel),
, m_program(prog.m_program) m_program(prog.m_program),
, m_context(prog.m_context) m_context(prog.m_context),
, m_queue(prog.m_queue) m_queue(prog.m_queue),
, m_global_dimensions(global_dimensions) m_global_dimensions(global_dimensions),
, m_global_offsets(global_offsets) m_global_offsets(global_offsets),
, m_local_dimensions(local_dimensions) m_local_dimensions(local_dimensions),
, m_map_args(std::move(map_args)) m_map_args(std::move(map_args)),
, m_map_result(std::move(map_result)) m_map_result(std::move(map_result)),
, m_result_size(result_size) { m_result_size(result_size) {
CAF_LOG_TRACE("id: " << this->id()); CAF_LOG_TRACE("id: " << this->id());
} }
...@@ -165,7 +165,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -165,7 +165,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
err = clSetKernelArg(m_kernel.get(), i, sizeof(cl_mem), err = clSetKernelArg(m_kernel.get(), i, sizeof(cl_mem),
static_cast<void*>(&arguments[i])); static_cast<void*>(&arguments[i]));
CAF_LOG_ERROR_IF(err != CL_SUCCESS, CAF_LOG_ERROR_IF(err != CL_SUCCESS,
"clSetKernelArg: " << get_opencl_error(err)); "clSetKernelArg: " << get_opencl_error(err));
} }
clFlush(m_queue.get()); clFlush(m_queue.get());
} }
......
...@@ -42,14 +42,14 @@ class command : public ref_counted { ...@@ -42,14 +42,14 @@ class command : public ref_counted {
command(response_promise handle, intrusive_ptr<T> actor_facade, command(response_promise handle, intrusive_ptr<T> actor_facade,
std::vector<cl_event> events, std::vector<mem_ptr> arguments, std::vector<cl_event> events, std::vector<mem_ptr> arguments,
size_t result_size, any_tuple msg) size_t result_size, any_tuple msg)
: m_result_size(result_size) : m_result_size(result_size),
, m_handle(handle) m_handle(handle),
, m_actor_facade(actor_facade) m_actor_facade(actor_facade),
, m_queue(actor_facade->m_queue) m_queue(actor_facade->m_queue),
, m_events(std::move(events)) m_events(std::move(events)),
, m_arguments(std::move(arguments)) m_arguments(std::move(arguments)),
, m_result(m_result_size) m_result(m_result_size),
, m_msg(msg) {} m_msg(msg) {}
~command() { ~command() {
cl_int err{0}; cl_int err{0};
...@@ -77,21 +77,15 @@ class command : public ref_counted { ...@@ -77,21 +77,15 @@ class command : public ref_counted {
data_or_nullptr(m_actor_facade->m_local_dimensions), m_events.size(), data_or_nullptr(m_actor_facade->m_local_dimensions), m_events.size(),
(m_events.empty() ? nullptr : m_events.data()), &event_k); (m_events.empty() ? nullptr : m_events.data()), &event_k);
if (err != CL_SUCCESS) { if (err != CL_SUCCESS) {
CAF_LOGMF(CAF_ERROR, CAF_LOGMF(CAF_ERROR, "clEnqueueNDRangeKernel: " << get_opencl_error(err));
"clEnqueueNDRangeKernel: " << get_opencl_error(err));
this->deref(); // or can anything actually happen? this->deref(); // or can anything actually happen?
return; return;
} else { } else {
cl_event event_r; cl_event event_r;
err = clEnqueueReadBuffer(m_queue.get(), err =
m_arguments.back().get(), clEnqueueReadBuffer(m_queue.get(), m_arguments.back().get(), CL_FALSE,
CL_FALSE, 0, sizeof(typename R::value_type) * m_result_size,
0, m_result.data(), 1, &event_k, &event_r);
sizeof(typename R::value_type) * m_result_size,
m_result.data(),
1,
&event_k,
&event_r);
if (err != CL_SUCCESS) { if (err != CL_SUCCESS) {
throw std::runtime_error("clEnqueueReadBuffer: " + throw std::runtime_error("clEnqueueReadBuffer: " +
get_opencl_error(err)); get_opencl_error(err));
......
...@@ -35,11 +35,11 @@ class device_info { ...@@ -35,11 +35,11 @@ class device_info {
device_info(device_ptr device, command_queue_ptr queue, device_info(device_ptr device, command_queue_ptr queue,
size_t work_group_size, cl_uint dimensons, size_t work_group_size, cl_uint dimensons,
const dim_vec& items_per_dimension) const dim_vec& items_per_dimension)
: m_max_work_group_size(work_group_size) : m_max_work_group_size(work_group_size),
, m_max_dimensions(dimensons) m_max_dimensions(dimensons),
, m_max_work_items_per_dim(items_per_dimension) m_max_work_items_per_dim(items_per_dimension),
, m_device(device) m_device(device),
, m_cmd_queue(queue) {} m_cmd_queue(queue) {}
inline size_t get_max_work_group_size(); inline size_t get_max_work_group_size();
inline cl_uint get_max_dimensions(); inline cl_uint get_max_dimensions();
......
...@@ -101,10 +101,10 @@ using event_ptr = smart_ptr<cl_event, clRetainEvent, clReleaseEvent>; ...@@ -101,10 +101,10 @@ using event_ptr = smart_ptr<cl_event, clRetainEvent, clReleaseEvent>;
using kernel_ptr = smart_ptr<cl_kernel, clRetainKernel, clReleaseKernel>; using kernel_ptr = smart_ptr<cl_kernel, clRetainKernel, clReleaseKernel>;
using context_ptr = smart_ptr<cl_context, clRetainContext, clReleaseContext>; using context_ptr = smart_ptr<cl_context, clRetainContext, clReleaseContext>;
using program_ptr = smart_ptr<cl_program, clRetainProgram, clReleaseProgram>; using program_ptr = smart_ptr<cl_program, clRetainProgram, clReleaseProgram>;
using device_ptr = smart_ptr<cl_device_id, clRetainDeviceDummy, using device_ptr =
clReleaseDeviceDummy>; smart_ptr<cl_device_id, clRetainDeviceDummy, clReleaseDeviceDummy>;
using command_queue_ptr = smart_ptr<cl_command_queue, clRetainCommandQueue, using command_queue_ptr =
clReleaseCommandQueue>; smart_ptr<cl_command_queue, clRetainCommandQueue, clReleaseCommandQueue>;
} // namespace opencl } // namespace opencl
} // namespace caf } // namespace caf
......
...@@ -82,8 +82,8 @@ void opencl_metainfo::initialize() { ...@@ -82,8 +82,8 @@ void opencl_metainfo::initialize() {
auto pfn_notify = [](const char* errinfo, const void*, size_t, void*) { auto pfn_notify = [](const char* errinfo, const void*, size_t, void*) {
CAF_LOGC_ERROR("caf::opencl::opencl_metainfo", "initialize", CAF_LOGC_ERROR("caf::opencl::opencl_metainfo", "initialize",
"\n##### Error message via pfn_notify #####\n" + "\n##### Error message via pfn_notify #####\n" +
string(errinfo) + string(errinfo) +
"\n########################################"); "\n########################################");
}; };
// create a context // create a context
...@@ -107,7 +107,7 @@ void opencl_metainfo::initialize() { ...@@ -107,7 +107,7 @@ void opencl_metainfo::initialize() {
&return_size); &return_size);
if (err != CL_SUCCESS) { if (err != CL_SUCCESS) {
CAF_LOGMF(CAF_ERROR, CAF_LOGMF(CAF_ERROR,
"clGetDeviceInfo (CL_DEVICE_NAME): " << get_opencl_error(err)); "clGetDeviceInfo (CL_DEVICE_NAME): " << get_opencl_error(err));
fill(buf, buf + buf_size, 0); fill(buf, buf + buf_size, 0);
} }
command_queue_ptr cmd_queue; command_queue_ptr cmd_queue;
...@@ -115,7 +115,7 @@ void opencl_metainfo::initialize() { ...@@ -115,7 +115,7 @@ void opencl_metainfo::initialize() {
CL_QUEUE_PROFILING_ENABLE, &err)); CL_QUEUE_PROFILING_ENABLE, &err));
if (err != CL_SUCCESS) { if (err != CL_SUCCESS) {
CAF_LOGMF(CAF_DEBUG, "Could not create command queue for device " CAF_LOGMF(CAF_DEBUG, "Could not create command queue for device "
<< buf << ": " << get_opencl_error(err)); << buf << ": " << get_opencl_error(err));
} else { } else {
size_t max_work_group_size{0}; size_t max_work_group_size{0};
err = clGetDeviceInfo(device.get(), CL_DEVICE_MAX_WORK_GROUP_SIZE, err = clGetDeviceInfo(device.get(), CL_DEVICE_MAX_WORK_GROUP_SIZE,
......
...@@ -33,9 +33,9 @@ namespace opencl { ...@@ -33,9 +33,9 @@ namespace opencl {
program::program(context_ptr context, command_queue_ptr queue, program::program(context_ptr context, command_queue_ptr queue,
program_ptr program) program_ptr program)
: m_context(move(context)) : m_context(move(context)),
, m_program(move(program)) m_program(move(program)),
, m_queue(move(queue)) {} m_queue(move(queue)) {}
program program::create(const char* kernel_source, const char* options, program program::create(const char* kernel_source, const char* options,
uint32_t device_id) { uint32_t device_id) {
...@@ -90,8 +90,8 @@ program program::create(const char* kernel_source, const char* options, ...@@ -90,8 +90,8 @@ program program::create(const char* kernel_source, const char* options,
buffer.data(), nullptr); buffer.data(), nullptr);
CAF_LOGC_ERROR("caf::opencl::program", "create", CAF_LOGC_ERROR("caf::opencl::program", "create",
"Build log:\n" + string(buffer.data()) + "Build log:\n" + string(buffer.data()) +
"\n########################################"); "\n########################################");
} }
#endif #endif
throw runtime_error(oss.str()); throw runtime_error(oss.str());
......
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