Skip to content

GitLab

Commit 9e0dca3d authored by Shucai Xiao's avatar Shucai Xiao
Browse files

clang format

parent 8a18175b
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 48 deletions
test/cpu_ops_test.cpp
View file @ 9e0dca3d
...@@ -1389,22 +1389,17 @@ TEST_CASE(quant_conv2d_test_default_mode) ...@@ -1389,22 +1389,17 @@ TEST_CASE(quant_conv2d_test_default_mode)
std::iota(c.begin(), c.end(), 0); std::iota(c.begin(), c.end(), 0);
auto cl = p.add_literal(migraphx::literal{c_shape, c}); auto cl = p.add_literal(migraphx::literal{c_shape, c});
p.add_instruction(migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::same}, al, cl); p.add_instruction(
migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::same}, al, cl);
p.compile(migraphx::cpu::target{}); p.compile(migraphx::cpu::target{});
auto result = p.eval({}); auto result = p.eval({});
std::vector<float> s = { std::vector<float> s = {
10197, 10548, 6939, 3420, 11601, 11952, 10197, 10548, 6939, 3420, 11601, 11952, 7839, 3852, 7383, 7590, 4953, 2421, 3480,
7839, 3852, 7383, 7590, 4953, 2421, 3570, 2316, 1125, 25506, 26586, 17874, 9009, 29826, 30906, 20718, 10413, 20505, 21198,
3480, 3570, 2316, 1125, 25506, 26586, 14187, 7119, 10527, 10860, 7257, 3636, 27045, 27396, 17739, 8604, 28449, 28800, 18639,
17874, 9009, 29826, 30906, 20718, 10413, 9036, 17319, 17526, 11289, 5445, 7800, 7890, 5052, 2421, 77346, 78426, 52002, 25857,
20505, 21198, 14187, 7119, 10527, 10860, 81666, 82746, 54846, 27261, 53769, 54462, 36075, 17919, 26511, 26844, 17769, 8820};
7257, 3636, 27045, 27396, 17739, 8604,
28449, 28800, 18639, 9036, 17319, 17526,
11289, 5445, 7800, 7890, 5052, 2421,
77346, 78426, 52002, 25857, 81666, 82746,
54846, 27261, 53769, 54462, 36075, 17919,
26511, 26844, 17769, 8820};
std::vector<float> results_vector; std::vector<float> results_vector;
result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); }); result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); });
...@@ -1424,14 +1419,27 @@ TEST_CASE(quant_conv2d_test_valid_mode) ...@@ -1424,14 +1419,27 @@ TEST_CASE(quant_conv2d_test_valid_mode)
std::iota(c.begin(), c.end(), 0); std::iota(c.begin(), c.end(), 0);
auto cl = p.add_literal(migraphx::literal{c_shape, c}); auto cl = p.add_literal(migraphx::literal{c_shape, c});
p.add_instruction(migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::valid}, al, cl); p.add_instruction(
migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::valid}, al, cl);
p.compile(migraphx::cpu::target{}); p.compile(migraphx::cpu::target{});
auto result = p.eval({}); auto result = p.eval({});
std::vector<float> s = { std::vector<float> s = {10197,
10197, 10548, 11601, 11952, 25506, 26586, 10548,
29826, 30906, 27045, 27396, 28449, 28800, 11601,
77346, 78426, 81666, 82746}; 11952,
25506,
26586,
29826,
30906,
27045,
27396,
28449,
28800,
77346,
78426,
81666,
82746};
std::vector<float> results_vector; std::vector<float> results_vector;
result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); }); result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); });
...@@ -1451,19 +1459,13 @@ TEST_CASE(quant_conv2d_padding_test) ...@@ -1451,19 +1459,13 @@ TEST_CASE(quant_conv2d_padding_test)
auto cl = p.add_literal(migraphx::literal{c_shape, c}); auto cl = p.add_literal(migraphx::literal{c_shape, c});
p.add_instruction(migraphx::op::quant_convolution{{{1, 1}}, {{1, 1}}}, al, cl); p.add_instruction(migraphx::op::quant_convolution{{{1, 1}}, {{1, 1}}}, al, cl);
p.compile(migraphx::cpu::target{}); p.compile(migraphx::cpu::target{});
auto result = p.eval({}); auto result = p.eval({});
std::vector<float> s = { std::vector<float> s = {
4521, 6753, 7014, 4635, 6858, 10197, 4521, 6753, 7014, 4635, 6858, 10197, 10548, 6939, 7830, 11601, 11952, 7839, 5007,
10548, 6939, 7830, 11601, 11952, 7839, 7383, 7590, 4953, 10515, 15987, 16734, 11277, 16821, 25506, 26586, 17874, 19737, 29826,
5007, 7383, 7590, 4953, 10515, 15987, 30906, 20718, 13593, 20505, 21198, 14187, 13161, 19281, 19542, 12699, 18522, 27045, 27396,
16734, 11277, 16821, 25506, 26586, 17874, 17739, 19494, 28449, 28800, 18639, 11919, 17319, 17526, 11289, 34707, 51843, 52590, 34893,
19737, 29826, 30906, 20718, 13593, 20505, 51813, 77346, 78426, 52002, 54729, 81666, 82746, 54846, 36057, 53769, 54462, 36075};
21198, 14187, 13161, 19281, 19542, 12699,
18522, 27045, 27396, 17739, 19494, 28449,
28800, 18639, 11919, 17319, 17526, 11289,
34707, 51843, 52590, 34893, 51813, 77346,
78426, 52002, 54729, 81666, 82746, 54846,
36057, 53769, 54462, 36075};
std::vector<float> results_vector; std::vector<float> results_vector;
result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); }); result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); });
...@@ -1485,10 +1487,22 @@ TEST_CASE(quant_conv2d_padding_stride_test) ...@@ -1485,10 +1487,22 @@ TEST_CASE(quant_conv2d_padding_stride_test)
p.compile(migraphx::cpu::target{}); p.compile(migraphx::cpu::target{});
auto result = p.eval({}); auto result = p.eval({});
std::vector<float> s = { std::vector<float> s = {4521,
4521, 7014, 7830, 11952, 10515, 16734, 7014,
19737, 30906, 13161, 19542, 19494, 28800, 7830,
34707, 52590, 54729, 82746}; 11952,
10515,
16734,
19737,
30906,
13161,
19542,
19494,
28800,
34707,
52590,
54729,
82746};
std::vector<float> results_vector; std::vector<float> results_vector;
result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); }); result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); });
EXPECT(migraphx::verify_range(results_vector, s)); EXPECT(migraphx::verify_range(results_vector, s));
......
test/gpu/miopen.cpp
View file @ 9e0dca3d
...@@ -1492,7 +1492,8 @@ struct test_conv_bn_relu_pooling : verify_program<test_conv_bn_relu_pooling> ...@@ -1492,7 +1492,8 @@ struct test_conv_bn_relu_pooling : verify_program<test_conv_bn_relu_pooling>
struct quant_conv : verify_program<quant_conv> struct quant_conv : verify_program<quant_conv>
{ {
migraphx::program create_program() { migraphx::program create_program()
{
migraphx::program p; migraphx::program p;
migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}}; migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}};
auto pa = p.add_parameter("a", a_shape); auto pa = p.add_parameter("a", a_shape);
...@@ -1505,33 +1506,42 @@ struct quant_conv : verify_program<quant_conv> ...@@ -1505,33 +1506,42 @@ struct quant_conv : verify_program<quant_conv>
struct quant_conv_default_mode : verify_program<quant_conv_default_mode> struct quant_conv_default_mode : verify_program<quant_conv_default_mode>
{ {
migraphx::program create_program() { migraphx::program create_program()
{
migraphx::program p; migraphx::program p;
migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}}; migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}};
auto pa = p.add_parameter("a", a_shape); auto pa = p.add_parameter("a", a_shape);
migraphx::shape c_shape{migraphx::shape::int8_type, {2, 3, 3, 3}}; migraphx::shape c_shape{migraphx::shape::int8_type, {2, 3, 3, 3}};
auto pc = p.add_parameter("c", c_shape); auto pc = p.add_parameter("c", c_shape);
p.add_instruction(migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::same}, pa, pc); p.add_instruction(
migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::same},
pa,
pc);
return p; return p;
} }
}; };
struct quant_conv_valid_mode : verify_program<quant_conv_valid_mode> struct quant_conv_valid_mode : verify_program<quant_conv_valid_mode>
{ {
migraphx::program create_program() { migraphx::program create_program()
{
migraphx::program p; migraphx::program p;
migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}}; migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}};
auto pa = p.add_parameter("a", a_shape); auto pa = p.add_parameter("a", a_shape);
migraphx::shape c_shape{migraphx::shape::int8_type, {2, 3, 3, 3}}; migraphx::shape c_shape{migraphx::shape::int8_type, {2, 3, 3, 3}};
auto pc = p.add_parameter("c", c_shape); auto pc = p.add_parameter("c", c_shape);
p.add_instruction(migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::valid}, pa, pc); p.add_instruction(
migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::valid},
pa,
pc);
return p; return p;
} }
}; };
struct quant_conv_padding : verify_program<quant_conv_padding> struct quant_conv_padding : verify_program<quant_conv_padding>
{ {
migraphx::program create_program() { migraphx::program create_program()
{
migraphx::program p; migraphx::program p;
migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}}; migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}};
auto pa = p.add_parameter("a", a_shape); auto pa = p.add_parameter("a", a_shape);
...@@ -1544,7 +1554,8 @@ struct quant_conv_padding : verify_program<quant_conv_padding> ...@@ -1544,7 +1554,8 @@ struct quant_conv_padding : verify_program<quant_conv_padding>
struct quant_conv_padding_stride : verify_program<quant_conv_padding_stride> struct quant_conv_padding_stride : verify_program<quant_conv_padding_stride>
{ {
migraphx::program create_program() { migraphx::program create_program()
{
migraphx::program p; migraphx::program p;
migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}}; migraphx::shape a_shape{migraphx::shape::int8_type, {2, 3, 4, 4}};
auto pa = p.add_parameter("a", a_shape); auto pa = p.add_parameter("a", a_shape);
......
test/op_shape_test.cpp
View file @ 9e0dca3d
...@@ -96,12 +96,19 @@ TEST_CASE(quant_convolution_shape) ...@@ -96,12 +96,19 @@ TEST_CASE(quant_convolution_shape)
throws_shape(migraphx::op::quant_convolution{}, input3, weight3); throws_shape(migraphx::op::quant_convolution{}, input3, weight3);
migraphx::shape output_same_mode{migraphx::shape::float_type, {4, 4, 3, 3}}; migraphx::shape output_same_mode{migraphx::shape::float_type, {4, 4, 3, 3}};
expect_shape(output_same_mode, migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, expect_shape(output_same_mode,
migraphx::op::same}, input, weights); migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::same},
expect_shape(output, migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, input,
migraphx::op::valid}, input, weights); weights);
throws_shape(migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, expect_shape(output,
migraphx::op::padding_mode_t(9999)}, input, weights); migraphx::op::quant_convolution{{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::valid},
input,
weights);
throws_shape(
migraphx::op::quant_convolution{
{{0, 0}}, {{1, 1}}, {{1, 1}}, migraphx::op::padding_mode_t(9999)},
input,
weights);
} }
TEST_CASE(transpose_shape) TEST_CASE(transpose_shape)
......
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