Merge pull request #94 from zhangchen-qinyinghua/master

Make the stream operator for Shape consistent
dmlc · Jan 14, 2016 · 1da409c · 1da409c
2 parents 29863c5 + 7c7e433
commit 1da409c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mshadow/tensor_blob.h b/mshadow/tensor_blob.h
@@ -317,7 +317,7 @@ struct TShape {
 inline std::ostream &operator<<(std::ostream &os, const TShape &shape) {
   os << '(';
   for (index_t i = 0; i < shape.ndim(); ++i) {
-    if (i != 0) os << ", ";
+    if (i != 0) os << ',';
     os << shape[i];
   }
   // python style tuple

diff --git a/mshadow/tensor_cpu-inl.h b/mshadow/tensor_cpu-inl.h
@@ -35,12 +35,14 @@ inline void DeleteStream<cpu>(Stream<cpu> *stream) {
 
 template<int ndim>
 inline std::ostream &operator<<(std::ostream &os, const Shape<ndim> &shape) { // NOLINT(*)
-  os << "(";
+  os << '(';
   for (int i = 0; i < ndim; ++i) {
-    if (i != 0) os << ",";
+    if (i != 0) os << ',';
     os << shape[i];
   }
-  os << ")";
+  // python style tuple
+  if (ndim == 1) os << ',';
+  os << ')';
   return os;
 }