Skip to content

Commit

Permalink
[MXNET-1111] Remove CPUPinned in ImageRecordIter (apache#12666)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
ctcyang authored and azai91 committed Dec 1, 2018
1 parent dfb4369 commit 879cc52
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/io/iter_image_recordio_2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 879cc52

Please sign in to comment.