Commit e5de78ae authored by Khalique Ahmed's avatar Khalique Ahmed
Browse files

formatting

parent bca45a1a
...@@ -96,8 +96,8 @@ struct convolution ...@@ -96,8 +96,8 @@ struct convolution
} }
if(not x_shape.dynamic() and not w_shape.dynamic() and if(not x_shape.dynamic() and not w_shape.dynamic() and
(x_shape.lens().at(1) != (w_shape.lens().at(1) * group) and (x_shape.lens().at(1) != (w_shape.lens().at(1) * group) and
x_shape.lens().back() != (w_shape.lens().back() * group))) x_shape.lens().back() != (w_shape.lens().back() * group)))
MIGRAPHX_THROW("CONVOLUTION: mismatched channel numbers"); MIGRAPHX_THROW("CONVOLUTION: mismatched channel numbers");
if(x_shape.dynamic() or w_shape.dynamic()) if(x_shape.dynamic() or w_shape.dynamic())
...@@ -135,7 +135,8 @@ struct convolution ...@@ -135,7 +135,8 @@ struct convolution
ret.push_back(std::size_t(std::max<std::ptrdiff_t>( ret.push_back(std::size_t(std::max<std::ptrdiff_t>(
1, 1,
(x_lens[i + 1] - (1 + dilation[i] * (*(w_lens.rbegin() + i) - 1)) + padding_factor) / (x_lens[i + 1] - (1 + dilation[i] * (*(w_lens.rbegin() + i) - 1)) +
padding_factor) /
stride[i] + stride[i] +
1))); 1)));
} }
......
...@@ -138,10 +138,10 @@ inline tensor_descriptor make_tensor(const migraphx::shape& os, bool pack = fals ...@@ -138,10 +138,10 @@ inline tensor_descriptor make_tensor(const migraphx::shape& os, bool pack = fals
MIGRAPHX_THROW("MAKE_TENSOR: unsupported type"); MIGRAPHX_THROW("MAKE_TENSOR: unsupported type");
} }
// miopenSetTensorDescriptor(t.get(), d, s.lens().size(), lens.data(), strides.data()); // miopenSetTensorDescriptor(t.get(), d, s.lens().size(), lens.data(), strides.data());
miopenSetNdTensorDescriptorWithLayout(t.get(), d, miopenTensorLayout_t::miopenTensorNHWC, lens.data(), lens.size()); miopenSetNdTensorDescriptorWithLayout(
t.get(), d, miopenTensorLayout_t::miopenTensorNHWC, lens.data(), lens.size());
return t; return t;
} }
......
...@@ -89,7 +89,7 @@ struct op_parser : auto_register<register_op_parser_action, Derived> ...@@ -89,7 +89,7 @@ struct op_parser : auto_register<register_op_parser_action, Derived>
// } // }
// else // else
// { // {
result = implicit_multi_op(self.parse(opd, parser, info, args)); result = implicit_multi_op(self.parse(opd, parser, info, args));
// } // }
return result; return result;
} }
......
...@@ -60,8 +60,7 @@ struct parse_pack : op_parser<parse_pack> ...@@ -60,8 +60,7 @@ struct parse_pack : op_parser<parse_pack>
[&](instruction_ref arg) { [&](instruction_ref arg) {
return info.add_instruction(make_op("unsqueeze", {{"axes", {axis}}}), arg); return info.add_instruction(make_op("unsqueeze", {{"axes", {axis}}}), arg);
}); });
return return info.add_instruction(make_op("concat", {{"axis", axis}}), unsqueezed_args);
info.add_instruction(make_op("concat", {{"axis", axis}}), unsqueezed_args);
// return parser.to_nhwc( // return parser.to_nhwc(
// info.add_instruction(make_op("concat", {{"axis", axis}}), unsqueezed_args)); // info.add_instruction(make_op("concat", {{"axis", axis}}), unsqueezed_args));
} }
......
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