From e7bb332eecd8a9cb841b4283180653fbadcc9a3b Mon Sep 17 00:00:00 2001
From: wangliu <wangliu@baidu.com>
Date: Thu, 7 Jun 2018 11:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	CMakeLists.txt
#	src/framework/dim.h
#	src/framework/program/program-optimize/node.h
---
 src/framework/dim.h       | 22 ----------------------
 test/common/test-size.cpp | 17 -----------------
 2 files changed, 39 deletions(-)
 delete mode 100644 test/common/test-size.cpp

diff --git a/src/framework/dim.h b/src/framework/dim.h
index 6e2179ba3e..38e62df995 100644
--- a/src/framework/dim.h
+++ b/src/framework/dim.h
@@ -325,27 +325,5 @@ Dim<sizeof...(Args)> make_dim(Args... idxes) {
   return Dim<sizeof...(Args)>(idxes...);
 }
 
-// Allows us to output a Dim
-// XXX For some reason, overloading fails to resolve this correctly
-// template <int i>
-/*typename std::enable_if<(i > 1), std::ostream &>::type operator<<(
-    std::ostream &os, const Dim<i> &d) {
-  os << d.head << ", " << d.tail;l
-  return os;
-}
-
-// Base case that allows us to output a Dim
-// XXX I wish this could be an overload instead of a template
-template <int i>
-typename std::enable_if<(i == 1), std::ostream &>::type operator<<(
-    std::ostream &os, const Dim<i> &d) {
-  os << d.head;
-  return os;
-}
-
-inline std::ostream &operator<<(std::ostream &os, const Dim<0> &d) {
-  return os;
-}*/
-
 }  // namespace framework
 }  // namespace paddle_mobile
diff --git a/test/common/test-size.cpp b/test/common/test-size.cpp
deleted file mode 100644
index e8e8fa6f20..0000000000
--- a/test/common/test-size.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-//
-// Created by Wang,Liu(MMS) on 2018/6/6.
-//
-- 
GitLab