Commit 48f35aa0 authored by Paul's avatar Paul
Browse files

Formatting

parent fa52b516
...@@ -11,10 +11,7 @@ namespace gpu { ...@@ -11,10 +11,7 @@ namespace gpu {
using hip_ptr = MIGRAPH_MANAGE_PTR(void, hipFree); using hip_ptr = MIGRAPH_MANAGE_PTR(void, hipFree);
std::string hip_error(int error) std::string hip_error(int error) { return hipGetErrorString(static_cast<hipError_t>(error)); }
{
return hipGetErrorString(static_cast<hipError_t>(error));
}
hip_ptr allocate_gpu(std::size_t sz) hip_ptr allocate_gpu(std::size_t sz)
{ {
...@@ -54,7 +51,7 @@ hip_ptr write_to_gpu(const void* x, std::size_t sz) ...@@ -54,7 +51,7 @@ hip_ptr write_to_gpu(const void* x, std::size_t sz)
argument allocate_gpu(shape s) argument allocate_gpu(shape s)
{ {
auto p = share(allocate_gpu(s.bytes()+1)); auto p = share(allocate_gpu(s.bytes() + 1));
return {s, [p]() mutable { return reinterpret_cast<char*>(p.get()); }}; return {s, [p]() mutable { return reinterpret_cast<char*>(p.get()); }};
} }
......
...@@ -102,12 +102,13 @@ struct miopen_convolution ...@@ -102,12 +102,13 @@ struct miopen_convolution
auto y_desc = make_tensor(output_shape); auto y_desc = make_tensor(output_shape);
std::size_t workspace_size = 0; std::size_t workspace_size = 0;
miopenConvolutionForwardGetWorkSpaceSize(ctx.handle.get(), x_desc.get(), w_desc.get(), cd.get(), y_desc.get(), &workspace_size); miopenConvolutionForwardGetWorkSpaceSize(
ctx.handle.get(), x_desc.get(), w_desc.get(), cd.get(), y_desc.get(), &workspace_size);
workspace_shape = shape{shape::int8_type, {workspace_size}}; workspace_shape = shape{shape::int8_type, {workspace_size}};
auto x = to_gpu(generate_argument(inputs[0]->get_shape())); auto x = to_gpu(generate_argument(inputs[0]->get_shape()));
auto w = to_gpu(generate_argument(inputs[1]->get_shape())); auto w = to_gpu(generate_argument(inputs[1]->get_shape()));
auto y = to_gpu(generate_argument(output_shape)); auto y = to_gpu(generate_argument(output_shape));
auto workspace = allocate_gpu(workspace_shape); auto workspace = allocate_gpu(workspace_shape);
int algo_count; int algo_count;
...@@ -355,12 +356,13 @@ struct miopen_apply ...@@ -355,12 +356,13 @@ struct miopen_apply
auto&& op = any_cast<convolution>(ins->op); auto&& op = any_cast<convolution>(ins->op);
auto conv = miopen_convolution{op, make_conv(op)}; auto conv = miopen_convolution{op, make_conv(op)};
auto ws = conv.compile(ctx, ins->result, ins->arguments); auto ws = conv.compile(ctx, ins->result, ins->arguments);
auto workspace = insert_allocation(ins, ws); auto workspace = insert_allocation(ins, ws);
auto output = insert_allocation(ins, ins->result); auto output = insert_allocation(ins, ins->result);
prog->replace_instruction(ins, conv, ins->arguments.at(0), ins->arguments.at(1), workspace, output); prog->replace_instruction(
ins, conv, ins->arguments.at(0), ins->arguments.at(1), workspace, output);
} }
void apply_pooling(instruction_ref ins) void apply_pooling(instruction_ref ins)
......
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