Commit 33e5534c authored by charlie's avatar charlie
Browse files

avoid typedef

parent ac0224a9
...@@ -103,8 +103,7 @@ struct shape ...@@ -103,8 +103,7 @@ struct shape
// shape(type_t, std::vector<std::size_t> l) // shape(type_t, std::vector<std::size_t> l)
shape(type_t t, std::initializer_list<std::size_t> d); shape(type_t t, std::initializer_list<std::size_t> d);
typedef std::vector<dynamic_dimension> dynamic_dimensions; shape(type_t t, std::vector<dynamic_dimension> dims);
shape(type_t t, dynamic_dimensions dims);
template <class Range> template <class Range>
shape(type_t t, const Range& l) : shape(t, std::vector<std::size_t>(l.begin(), l.end())) shape(type_t t, const Range& l) : shape(t, std::vector<std::size_t>(l.begin(), l.end()))
......
...@@ -45,7 +45,7 @@ struct shape_impl ...@@ -45,7 +45,7 @@ struct shape_impl
std::is_sorted(m_strides.rbegin(), m_strides.rend()); std::is_sorted(m_strides.rbegin(), m_strides.rend());
} }
shape_impl(shape::type_t t, shape::dynamic_dimensions dims) shape_impl(shape::type_t t, std::vector<shape::dynamic_dimension> dims)
: m_type(t), m_dyn_dims(std::move(dims)) : m_type(t), m_dyn_dims(std::move(dims))
{ {
} }
...@@ -58,7 +58,7 @@ struct shape_impl ...@@ -58,7 +58,7 @@ struct shape_impl
std::vector<shape> m_shapes = {}; std::vector<shape> m_shapes = {};
bool m_standard = false; bool m_standard = false;
std::vector<shape::dynamic_dimension> m_dyn_dims = {}; std::vector<shape::shape::dynamic_dimension> m_dyn_dims = {};
void calculate_strides() void calculate_strides()
{ {
...@@ -159,7 +159,7 @@ shape::shape(type_t t, std::initializer_list<std::size_t> d) ...@@ -159,7 +159,7 @@ shape::shape(type_t t, std::initializer_list<std::size_t> d)
{ {
} }
shape::shape(type_t t, dynamic_dimensions dims) shape::shape(type_t t, std::vector<shape::dynamic_dimension> dims)
: impl(std::make_shared<shape_impl>(t, std::move(dims))) : impl(std::make_shared<shape_impl>(t, std::move(dims)))
{ {
} }
...@@ -510,7 +510,7 @@ void migraphx_from_value(const value& v, shape& s) ...@@ -510,7 +510,7 @@ void migraphx_from_value(const value& v, shape& s)
auto opts = v.at("opt_dyn_dims").to_vector<std::size_t>(); auto opts = v.at("opt_dyn_dims").to_vector<std::size_t>();
assert(mins.size() == maxes.size() and maxes.size() == opts.size()); assert(mins.size() == maxes.size() and maxes.size() == opts.size());
auto num_dims = mins.size(); auto num_dims = mins.size();
shape::dynamic_dimensions dyn_dims(num_dims); std::vector<shape::dynamic_dimension> dyn_dims(num_dims);
for(int i = 0; i < num_dims; ++i) for(int i = 0; i < num_dims; ++i)
{ {
dyn_dims.at(i) = shape::dynamic_dimension{mins[i], maxes[i], opts[i]}; dyn_dims.at(i) = shape::dynamic_dimension{mins[i], maxes[i], opts[i]};
......
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