Commit eef9de6f authored by Paul's avatar Paul
Browse files

Formatting

parent ea87f25e
...@@ -133,7 +133,7 @@ struct convolution ...@@ -133,7 +133,7 @@ struct convolution
struct pooling struct pooling
{ {
std::string mode = "average"; std::string mode = "average";
std::array<std::size_t, 2> padding = {{0, 0}}; std::array<std::size_t, 2> padding = {{0, 0}};
std::array<std::size_t, 2> stride = {{1, 1}}; std::array<std::size_t, 2> stride = {{1, 1}};
std::array<std::size_t, 2> lengths = {{1, 1}}; std::array<std::size_t, 2> lengths = {{1, 1}};
......
...@@ -41,11 +41,11 @@ int main(int argc, char const* argv[]) ...@@ -41,11 +41,11 @@ int main(int argc, char const* argv[])
if(argc > 1) if(argc > 1)
{ {
std::string file = argv[1]; std::string file = argv[1];
auto p = migraph::parse_onnx(file); auto p = migraph::parse_onnx(file);
std::cout << p << std::endl; std::cout << p << std::endl;
auto x = run_cpu(file); auto x = run_cpu(file);
auto y = run_gpu(file); auto y = run_gpu(file);
visit_all(x, y)([](auto cpu, auto gpu) { visit_all(x, y)([](auto cpu, auto gpu) {
if(migraph::verify_range(cpu, gpu, 1)) if(migraph::verify_range(cpu, gpu, 1))
{ {
......
...@@ -122,7 +122,9 @@ migraph::argument run_gpu() ...@@ -122,7 +122,9 @@ migraph::argument run_gpu()
return migraph::gpu::from_gpu(p.eval(m)); return migraph::gpu::from_gpu(p.eval(m));
} }
void verify_args(const std::string& name, const migraph::argument& cpu_arg, const migraph::argument& gpu_arg) void verify_args(const std::string& name,
const migraph::argument& cpu_arg,
const migraph::argument& gpu_arg)
{ {
visit_all(cpu_arg, gpu_arg)([&](auto cpu, auto gpu) { visit_all(cpu_arg, gpu_arg)([&](auto cpu, auto gpu) {
if(not migraph::verify_range(cpu, gpu)) if(not migraph::verify_range(cpu, gpu))
...@@ -383,15 +385,16 @@ struct test_conv_bn_relu_pooling ...@@ -383,15 +385,16 @@ struct test_conv_bn_relu_pooling
migraph::shape xs{migraph::shape::float_type, {1, 3, 224, 224}}; migraph::shape xs{migraph::shape::float_type, {1, 3, 224, 224}};
migraph::shape ws{migraph::shape::float_type, {64, 3, 7, 7}}; migraph::shape ws{migraph::shape::float_type, {64, 3, 7, 7}};
auto x = p.add_parameter("x", xs); auto x = p.add_parameter("x", xs);
auto w = p.add_parameter("w", ws); auto w = p.add_parameter("w", ws);
auto conv = p.add_instruction(migraph::convolution{{3, 3}, {2, 2}, {1, 1}}, x, w); auto conv = p.add_instruction(migraph::convolution{{3, 3}, {2, 2}, {1, 1}}, x, w);
migraph::shape vars{migraph::shape::float_type, {64}}; migraph::shape vars{migraph::shape::float_type, {64}};
auto mean = p.add_literal(migraph::abs(migraph::generate_literal(vars, 0))); auto mean = p.add_literal(migraph::abs(migraph::generate_literal(vars, 0)));
auto variance = p.add_literal(migraph::abs(migraph::generate_literal(vars, 1))); auto variance = p.add_literal(migraph::abs(migraph::generate_literal(vars, 1)));
auto scale = p.add_literal(migraph::abs(migraph::generate_literal(vars, 2))); auto scale = p.add_literal(migraph::abs(migraph::generate_literal(vars, 2)));
auto bias = p.add_literal(migraph::abs(migraph::generate_literal(vars, 3))); auto bias = p.add_literal(migraph::abs(migraph::generate_literal(vars, 3)));
auto bn = p.add_instruction(migraph::batch_norm_inference{}, conv, mean, variance, scale, bias); auto bn =
p.add_instruction(migraph::batch_norm_inference{}, conv, mean, variance, scale, bias);
auto relu = p.add_instruction(migraph::activation{"relu"}, bn); auto relu = p.add_instruction(migraph::activation{"relu"}, bn);
p.add_instruction(migraph::pooling{"average", {1, 1}, {2, 2}, {3, 3}}, relu); p.add_instruction(migraph::pooling{"average", {1, 1}, {2, 2}, {3, 3}}, relu);
return p; return p;
......
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