提交 50fa7e63 编写于 作者: Y Yu Yang 提交者: GitHub

Merge pull request #2934 from reyoung/feature/fix_merge_bug

Fix Merge Bugs
...@@ -280,8 +280,6 @@ std::ostream& operator<<(std::ostream& os, const DDim& ddim) { ...@@ -280,8 +280,6 @@ std::ostream& operator<<(std::ostream& os, const DDim& ddim) {
return os; return os;
} }
ssize_t DDim::size() const { return arity(*this); }
DDim::DDim(std::initializer_list<int> init_list) { DDim::DDim(std::initializer_list<int> init_list) {
*this = make_ddim(init_list); *this = make_ddim(init_list);
} }
......
...@@ -52,8 +52,6 @@ struct DDim { ...@@ -52,8 +52,6 @@ struct DDim {
DDimVar getVar() { return var; } DDimVar getVar() { return var; }
ssize_t size() const;
bool operator==(DDim d) const; bool operator==(DDim d) const;
bool operator!=(DDim d) const; bool operator!=(DDim d) const;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册