This is an automated email from the ASF dual-hosted git repository.
haibin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 12371fb [MXNET-1111] Remove CPUPinned in ImageRecordIter (#12666)
12371fb is described below
commit 12371fb6b98823c369187fc6dbd26c2fcfcacca9
Author: Carl Yang <carl14...@gmail.com>
AuthorDate: Mon Oct 29 16:23:51 2018 -0700
[MXNET-1111] Remove CPUPinned in ImageRecordIter (#12666)
* squash commit
* get rid of argument
* undo a lot of unnecessary changes
* undo more changes
* fix typo
* fix lint
* address comments and fix rebase mistake
* fix typo made during rebase
* revert cpu_pinned
* revert changes, because works without needing to copy params to GPU.
thanks @yuxihu for testing and @apeforest for raising this issue!
* revert changes to comm and nccl
---
src/io/iter_image_recordio_2.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/io/iter_image_recordio_2.cc b/src/io/iter_image_recordio_2.cc
index f414839..b567c72 100644
--- a/src/io/iter_image_recordio_2.cc
+++ b/src/io/iter_image_recordio_2.cc
@@ -285,9 +285,9 @@ inline bool
ImageRecordIOParser2<DType>::ParseNext(DataBatch *out) {
shape_vec.push_back(param_.label_width);
TShape label_shape(shape_vec.begin(), shape_vec.end());
- out->data.at(0) = NDArray(data_shape, Context::CPUPinned(0), false,
+ out->data.at(0) = NDArray(data_shape, Context::CPU(0), false,
mshadow::DataType<DType>::kFlag);
- out->data.at(1) = NDArray(label_shape, Context::CPUPinned(0), false,
+ out->data.at(1) = NDArray(label_shape, Context::CPU(0), false,
mshadow::DataType<real_t>::kFlag);
unit_size_[0] = param_.data_shape.Size();
unit_size_[1] = param_.label_width;
