Merge pull request #2934 from reyoung/feature/fix_merge_bug

Fix Merge Bugs

Merge pull request #2934 from reyoung/feature/fix_merge_bug
Fix Merge Bugs
50fa7e63 · Yu Yang · GitHub · 051676a7 · e00aae53 · 50fa7e63
隐藏空白更改
内联并排

Showing with 0 addition and 4 deletion

paddle/framework/ddim.cc paddle/framework/ddim.cc +0 -2

paddle/framework/ddim.h paddle/framework/ddim.h +0 -2

未找到文件。
--- a/paddle/framework/ddim.cc
+++ b/paddle/framework/ddim.cc
@@ -280,8 +280,6 @@ std::ostream& operator<<(std::ostream& os, const DDim& ddim) {
  return os;
 }

-ssize_t DDim::size() const { return arity(*this); }
-
 DDim::DDim(std::initializer_list<int> init_list) {
  *this = make_ddim(init_list);
 }

--- a/paddle/framework/ddim.h
+++ b/paddle/framework/ddim.h
@@ -52,8 +52,6 @@ struct DDim {

  DDimVar getVar() { return var; }

-  ssize_t size() const;
-
  bool operator==(DDim d) const;

  bool operator!=(DDim d) const;