Commit d24755de authored by Paul's avatar Paul
Browse files

Formatting

parent 96358e41
...@@ -38,7 +38,8 @@ migraphx::argument run_gpu(F f) ...@@ -38,7 +38,8 @@ migraphx::argument run_gpu(F f)
migraphx::program::parameter_map m; migraphx::program::parameter_map m;
for(auto&& x : p.get_parameter_shapes()) for(auto&& x : p.get_parameter_shapes())
{ {
m[x.first] = migraphx::gpu::to_gpu(migraphx::generate_argument(x.second, get_hash(x.first))); m[x.first] =
migraphx::gpu::to_gpu(migraphx::generate_argument(x.second, get_hash(x.first)));
} }
auto out = migraphx::gpu::from_gpu(p.eval(m)); auto out = migraphx::gpu::from_gpu(p.eval(m));
std::cout << p << std::endl; std::cout << p << std::endl;
......
...@@ -10,7 +10,8 @@ struct eliminate_allocation_target ...@@ -10,7 +10,8 @@ struct eliminate_allocation_target
std::string name() const { return "eliminate_allocation"; } std::string name() const { return "eliminate_allocation"; }
std::vector<migraphx::pass> get_passes(migraphx::context&) const std::vector<migraphx::pass> get_passes(migraphx::context&) const
{ {
return {migraphx::eliminate_allocation{"allocate", align}, migraphx::dead_code_elimination{}}; return {migraphx::eliminate_allocation{"allocate", align},
migraphx::dead_code_elimination{}};
} }
migraphx::context get_context() const { return {}; } migraphx::context get_context() const { return {}; }
}; };
......
...@@ -93,20 +93,22 @@ TEST_CASE(basic) ...@@ -93,20 +93,22 @@ TEST_CASE(basic)
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {1, 5, 8, 8}}}); p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {1, 5, 8, 8}}});
auto p3 = p.add_instruction(fred_op{}, a3); auto p3 = p.add_instruction(fred_op{}, a3);
std::size_t axis = 1; std::size_t axis = 1;
auto a4 = auto a4 = p.add_instruction(
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {1, 10, 8, 8}}}); allocate{migraphx::shape{migraphx::shape::float_type, {1, 10, 8, 8}}});
p.add_instruction(concat(axis), p1, p2, p3, a4); p.add_instruction(concat(axis), p1, p2, p3, a4);
return p; return p;
}; };
auto create_control_program = []() { auto create_control_program = []() {
migraphx::program p; migraphx::program p;
auto a1 = auto a1 = p.add_instruction(
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {1, 10, 8, 8}}}); allocate{migraphx::shape{migraphx::shape::float_type, {1, 10, 8, 8}}});
auto l1 = p.add_instruction( auto l1 = p.add_instruction(
migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 2, 8, 8}}, 0}, {a1}); migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 2, 8, 8}}, 0},
{a1});
auto p1 = p.add_instruction(fred_op{}, l1); auto p1 = p.add_instruction(fred_op{}, l1);
auto l2 = p.add_instruction( auto l2 = p.add_instruction(
migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 3, 8, 8}}, 512}, {a1}); migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 3, 8, 8}}, 512},
{a1});
auto p2 = p.add_instruction(fred_op{}, l2); auto p2 = p.add_instruction(fred_op{}, l2);
auto l3 = p.add_instruction( auto l3 = p.add_instruction(
migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 5, 8, 8}}, 1280}, migraphx::op::load{migraphx::shape{migraphx::shape::float_type, {1, 5, 8, 8}}, 1280},
...@@ -137,8 +139,8 @@ TEST_CASE(wont_work) ...@@ -137,8 +139,8 @@ TEST_CASE(wont_work)
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 5, 8, 8}}}); p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 5, 8, 8}}});
auto p3 = p.add_instruction(fred_op{}, a3); auto p3 = p.add_instruction(fred_op{}, a3);
std::size_t axis = 1; std::size_t axis = 1;
auto a4 = auto a4 = p.add_instruction(
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 10, 8, 8}}}); allocate{migraphx::shape{migraphx::shape::float_type, {2, 10, 8, 8}}});
p.add_instruction(concat(axis), p1, p2, p3, a4); p.add_instruction(concat(axis), p1, p2, p3, a4);
return p; return p;
}; };
...@@ -154,8 +156,8 @@ TEST_CASE(wont_work) ...@@ -154,8 +156,8 @@ TEST_CASE(wont_work)
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 5, 8, 8}}}); p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 5, 8, 8}}});
auto p3 = p.add_instruction(fred_op{}, a3); auto p3 = p.add_instruction(fred_op{}, a3);
std::size_t axis = 1; std::size_t axis = 1;
auto a4 = auto a4 = p.add_instruction(
p.add_instruction(allocate{migraphx::shape{migraphx::shape::float_type, {2, 10, 8, 8}}}); allocate{migraphx::shape{migraphx::shape::float_type, {2, 10, 8, 8}}});
p.add_instruction(concat(axis), p1, p2, p3, a4); p.add_instruction(concat(axis), p1, p2, p3, a4);
return p; return p;
}; };
......
...@@ -38,7 +38,8 @@ TEST_CASE(fwd_conv_batchnorm_rewrite_test) ...@@ -38,7 +38,8 @@ TEST_CASE(fwd_conv_batchnorm_rewrite_test)
migraphx::program p; migraphx::program p;
auto x = p.add_literal(xs, xdata); auto x = p.add_literal(xs, xdata);
auto w = p.add_literal(ws, wdata); auto w = p.add_literal(ws, wdata);
auto conv = p.add_instruction(migraphx::op::convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}}, x, w); auto conv =
p.add_instruction(migraphx::op::convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}}, x, w);
auto scale = p.add_literal(migraphx::literal{vars, {3.0f}}); auto scale = p.add_literal(migraphx::literal{vars, {3.0f}});
auto bias = p.add_literal(migraphx::literal{vars, {8.1f}}); auto bias = p.add_literal(migraphx::literal{vars, {8.1f}});
auto mean = p.add_literal(migraphx::literal{vars, {4.0f}}); auto mean = p.add_literal(migraphx::literal{vars, {4.0f}});
......
...@@ -119,7 +119,8 @@ migraphx::argument run_gpu(migraphx::program& p) ...@@ -119,7 +119,8 @@ migraphx::argument run_gpu(migraphx::program& p)
migraphx::program::parameter_map m; migraphx::program::parameter_map m;
for(auto&& x : p.get_parameter_shapes()) for(auto&& x : p.get_parameter_shapes())
{ {
m[x.first] = migraphx::gpu::to_gpu(migraphx::generate_argument(x.second, get_hash(x.first))); m[x.first] =
migraphx::gpu::to_gpu(migraphx::generate_argument(x.second, get_hash(x.first)));
} }
EXPECT(bool{m.find("output") != m.end()}); EXPECT(bool{m.find("output") != m.end()});
return migraphx::gpu::from_gpu(p.eval(m)); return migraphx::gpu::from_gpu(p.eval(m));
...@@ -365,7 +366,8 @@ struct test_softmax2 ...@@ -365,7 +366,8 @@ struct test_softmax2
migraphx::program create_program() const migraphx::program create_program() const
{ {
migraphx::program p; migraphx::program p;
auto x = p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {1, 1000, 1, 1}}); auto x =
p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {1, 1000, 1, 1}});
p.add_instruction(migraphx::op::softmax{}, x); p.add_instruction(migraphx::op::softmax{}, x);
return p; return p;
} }
...@@ -376,7 +378,8 @@ struct test_conv ...@@ -376,7 +378,8 @@ struct test_conv
migraphx::program create_program() const migraphx::program create_program() const
{ {
migraphx::program p; migraphx::program p;
auto input = p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}}); auto input =
p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}});
auto weights = auto weights =
p.add_parameter("w", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}}); p.add_parameter("w", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}});
p.add_instruction(migraphx::op::convolution{}, input, weights); p.add_instruction(migraphx::op::convolution{}, input, weights);
...@@ -403,7 +406,8 @@ struct test_conv_relu ...@@ -403,7 +406,8 @@ struct test_conv_relu
migraphx::program create_program() const migraphx::program create_program() const
{ {
migraphx::program p; migraphx::program p;
auto input = p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}}); auto input =
p.add_parameter("x", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}});
auto weights = auto weights =
p.add_parameter("w", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}}); p.add_parameter("w", migraphx::shape{migraphx::shape::float_type, {4, 3, 3, 3}});
auto conv = p.add_instruction(migraphx::op::convolution{}, input, weights); auto conv = p.add_instruction(migraphx::op::convolution{}, input, weights);
...@@ -417,7 +421,8 @@ struct test_conv_relu_half ...@@ -417,7 +421,8 @@ struct test_conv_relu_half
migraphx::program create_program() const migraphx::program create_program() const
{ {
migraphx::program p; migraphx::program p;
auto input = p.add_parameter("x", migraphx::shape{migraphx::shape::half_type, {4, 3, 3, 3}}); auto input =
p.add_parameter("x", migraphx::shape{migraphx::shape::half_type, {4, 3, 3, 3}});
auto weights = auto weights =
p.add_parameter("w", migraphx::shape{migraphx::shape::half_type, {4, 3, 3, 3}}); p.add_parameter("w", migraphx::shape{migraphx::shape::half_type, {4, 3, 3, 3}});
auto conv = p.add_instruction(migraphx::op::convolution{}, input, weights); auto conv = p.add_instruction(migraphx::op::convolution{}, input, weights);
...@@ -525,8 +530,10 @@ struct test_gemm_ld ...@@ -525,8 +530,10 @@ struct test_gemm_ld
migraphx::program create_program() const migraphx::program create_program() const
{ {
migraphx::program p; migraphx::program p;
auto a = p.add_parameter("a", migraphx::shape{migraphx::shape::float_type, {4, 5}, {10, 1}}); auto a =
auto b = p.add_parameter("b", migraphx::shape{migraphx::shape::float_type, {5, 3}, {20, 1}}); p.add_parameter("a", migraphx::shape{migraphx::shape::float_type, {4, 5}, {10, 1}});
auto b =
p.add_parameter("b", migraphx::shape{migraphx::shape::float_type, {5, 3}, {20, 1}});
p.add_instruction(migraphx::op::dot{}, a, b); p.add_instruction(migraphx::op::dot{}, a, b);
return p; return p;
} }
...@@ -800,7 +807,8 @@ struct test_conv_bn_relu_pooling2 ...@@ -800,7 +807,8 @@ struct test_conv_bn_relu_pooling2
auto scale = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 1 + channels))); auto scale = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 1 + channels)));
auto bias = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 2 + channels))); auto bias = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 2 + channels)));
auto mean = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 3 + channels))); auto mean = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 3 + channels)));
auto variance = p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 4 + channels))); auto variance =
p.add_literal(migraphx::abs(migraphx::generate_literal(vars, 4 + channels)));
return p.add_instruction( return p.add_instruction(
migraphx::op::batch_norm_inference{}, x, scale, bias, mean, variance); migraphx::op::batch_norm_inference{}, x, scale, bias, mean, variance);
} }
......
...@@ -110,8 +110,9 @@ struct pass_standard_op ...@@ -110,8 +110,9 @@ struct pass_standard_op
struct nop struct nop
{ {
std::string name() const { return "nop"; } std::string name() const { return "nop"; }
migraphx::argument migraphx::argument compute(migraphx::context&,
compute(migraphx::context&, const migraphx::shape&, const std::vector<migraphx::argument>&) const const migraphx::shape&,
const std::vector<migraphx::argument>&) const
{ {
return {}; return {};
} }
......
...@@ -120,12 +120,15 @@ TEST_CASE(flatten_shape) ...@@ -120,12 +120,15 @@ TEST_CASE(flatten_shape)
expect_shape(migraphx::shape{migraphx::shape::float_type, {1, 2 * 4 * 6 * 8}}, expect_shape(migraphx::shape{migraphx::shape::float_type, {1, 2 * 4 * 6 * 8}},
migraphx::op::flatten{0}, migraphx::op::flatten{0},
input); input);
expect_shape( expect_shape(migraphx::shape{migraphx::shape::float_type, {2, 4 * 6 * 8}},
migraphx::shape{migraphx::shape::float_type, {2, 4 * 6 * 8}}, migraphx::op::flatten{1}, input); migraphx::op::flatten{1},
expect_shape( input);
migraphx::shape{migraphx::shape::float_type, {2 * 4, 6 * 8}}, migraphx::op::flatten{2}, input); expect_shape(migraphx::shape{migraphx::shape::float_type, {2 * 4, 6 * 8}},
expect_shape( migraphx::op::flatten{2},
migraphx::shape{migraphx::shape::float_type, {2 * 4 * 6, 8}}, migraphx::op::flatten{3}, input); input);
expect_shape(migraphx::shape{migraphx::shape::float_type, {2 * 4 * 6, 8}},
migraphx::op::flatten{3},
input);
expect_shape(migraphx::shape{migraphx::shape::float_type, {2 * 4 * 6 * 8, 1}}, expect_shape(migraphx::shape{migraphx::shape::float_type, {2 * 4 * 6 * 8, 1}},
migraphx::op::flatten{4}, migraphx::op::flatten{4},
input); input);
......
...@@ -17,8 +17,9 @@ struct simple_operation ...@@ -17,8 +17,9 @@ struct simple_operation
{ {
MIGRAPH_THROW("not computable"); MIGRAPH_THROW("not computable");
} }
migraphx::argument migraphx::argument compute(migraphx::context&,
compute(migraphx::context&, const migraphx::shape&, const std::vector<migraphx::argument>&) const const migraphx::shape&,
const std::vector<migraphx::argument>&) const
{ {
MIGRAPH_THROW("not computable"); MIGRAPH_THROW("not computable");
} }
...@@ -36,8 +37,9 @@ struct simple_operation_no_print ...@@ -36,8 +37,9 @@ struct simple_operation_no_print
{ {
MIGRAPH_THROW("not computable"); MIGRAPH_THROW("not computable");
} }
migraphx::argument migraphx::argument compute(migraphx::context&,
compute(migraphx::context&, const migraphx::shape&, const std::vector<migraphx::argument>&) const const migraphx::shape&,
const std::vector<migraphx::argument>&) const
{ {
MIGRAPH_THROW("not computable"); MIGRAPH_THROW("not computable");
} }
......
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