Commit bd2804e9 authored by charlie's avatar charlie
Browse files

Dyn image shape test change, fix dyn weight cond

parent eb8f205b
...@@ -96,7 +96,7 @@ struct convolution ...@@ -96,7 +96,7 @@ struct convolution
return ret; return ret;
}; };
if(input.dynamic()) if(input.dynamic() or weights.dynamic())
{ {
std::vector<shape::dynamic_dimension> output_dyn_dims = {input.dyn_dims().at(0), std::vector<shape::dynamic_dimension> output_dyn_dims = {input.dyn_dims().at(0),
input.dyn_dims().at(1)}; input.dyn_dims().at(1)};
......
...@@ -1025,34 +1025,26 @@ TEST_CASE(conv_dynamic_img_shape_test) ...@@ -1025,34 +1025,26 @@ TEST_CASE(conv_dynamic_img_shape_test)
0.81673446, 0.881835, 0.42351639, 0.83322931, 0.34101671, 0.51979151, 0.54920645, 0.81673446, 0.881835, 0.42351639, 0.83322931, 0.34101671, 0.51979151, 0.54920645,
0.19287718, 0.33321689, 0.27752456, 0.45755893, 0.67484562, 0.68383122, 0.52361312, 0.19287718, 0.33321689, 0.27752456, 0.45755893, 0.67484562, 0.68383122, 0.52361312,
0.46437257, 0.50862936, 0.32460429, 0.1726007, 0.29933345, 0.64856728, 0.06471591, 0.46437257, 0.50862936, 0.32460429, 0.1726007, 0.29933345, 0.64856728, 0.06471591,
0.63370843, 0.27900152, 0.18595992, 0.48904812, 0.35368508, 0.09620202, 0.709561, 0.63370843, 0.27900152, 0.18595992, 0.48904812, 0.35368508, 0.09620202};
0.7916206, 0.0443115, 0.62592275, 0.2498623, 0.42725624, 0.7905135, 0.53160169,
0.01303743, 0.01987505, 0.39041803, 0.89530203, 0.23155373, 0.44435213, 0.14407301, c = {0.709561, 0.7916206, 0.0443115, 0.62592275, 0.2498623, 0.42725624, 0.7905135,
0.80968594, 0.38216188, 0.35692557}; 0.53160169, 0.01303743, 0.01987505, 0.39041803, 0.89530203, 0.23155373, 0.44435213,
0.14407301, 0.80968594, 0.38216188, 0.35692557, 0.2568538, 0.83587388, 0.43654904,
c = {0.2568538, 0.83587388, 0.43654904, 0.04974508, 0.80375029, 0.25350374, 0.1820275, 0.04974508, 0.80375029, 0.25350374, 0.1820275, 0.23369029, 0.54358755};
0.23369029, 0.54358755, 0.96287212, 0.28424067, 0.45639522, 0.61295404, 0.97581672,
0.95342667, 0.39949156, 0.37287137, 0.42897821, 0.11085312, 0.83015689, 0.88845748, sol = {6.305986,
0.37558172, 0.72528733, 0.74167964, 0.4398981, 0.85575732, 0.97880085}; 5.564665,
6.122996,
sol = {6.1561007, 5.7262855,
6.7845025, 5.5546584,
7.718525, 5.779489,
7.520974, 5.798161,
6.490427, 5.160476,
6.963689, 6.702436,
8.200459, 5.4851074,
7.9006085, 6.227567,
7.348745, 5.2016754};
6.753414, migraphx::shape input_fixed_shape1{migraphx::shape::float_type, {1, 3, 6, 5}};
7.1623836,
7.8356404,
6.903219,
6.956274,
7.2062597,
7.544957};
migraphx::shape input_fixed_shape1{migraphx::shape::float_type, {1, 3, 6, 6}};
migraphx::parameter_map params1; migraphx::parameter_map params1;
params1["X"] = migraphx::argument(input_fixed_shape1, a.data()); params1["X"] = migraphx::argument(input_fixed_shape1, a.data());
......
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