Merge pull request apache#49 from antinucleon/master

Add constructor with stream for Tensor
stefanhenneking · Sep 16, 2015 · cf879e7 · cf879e7
2 parents d3d6147 + b37cf0e
commit cf879e7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mshadow/tensor.h b/mshadow/tensor.h
@@ -295,6 +295,10 @@ struct Tensor: public TRValue<Tensor<Device, dimension, DType>,
   /*! \brief constructor from data pointer and shape, without stride */
   MSHADOW_XINLINE Tensor(DType *dptr, const Shape<dimension> &shape)
       : dptr_(dptr), shape_(shape), stride_(shape[kSubdim]), stream_(NULL) {}
+  /*! \brief constructor from data pointer and shape, without stride */
+  MSHADOW_XINLINE Tensor(DType *dptr, const Shape<dimension> &shape,
+                         Stream<Device> *stream)
+    : dptr_(dptr), shape_(shape), stride_(shape[kSubdim]), stream_(stream) {}
   /*! \brief constructor from data pointer and shape  */
   MSHADOW_XINLINE Tensor(DType *dptr,
                          const Shape<dimension> &shape,