gpu access of ndarray (apache#7496)

* gpu access of ndarray * gpu access from C++ api * gpu access fix * Update c_api.cc * Update c_api.cc
iblislin · Aug 26, 2017 · 1e48e12 · 1e48e12
1 parent 2e6ef8c
commit 1e48e12
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/cpp-package/include/mxnet-cpp/ndarray.hpp b/cpp-package/include/mxnet-cpp/ndarray.hpp
@@ -359,7 +359,6 @@ inline int NDArray::GetDType() const {
 
 inline const mx_float *NDArray::GetData() const {
   void *ret;
-  CHECK_NE(GetContext().GetDeviceType(), DeviceType::kGPU);
   MXNDArrayGetData(blob_ptr_->handle_, &ret);
   if (GetDType() != 0) {
     return NULL;

diff --git a/src/c_api/c_api.cc b/src/c_api/c_api.cc
@@ -437,13 +437,7 @@ int MXNDArrayGetData(NDArrayHandle handle,
   API_BEGIN();
   NDArray *arr = static_cast<NDArray*>(handle);
   if (!arr->is_none()) {
-    CHECK(arr->ctx().dev_mask() == cpu::kDevMask)
-        << "MXNDArrayGetData can only be called for NDArray on CPU";
-    const TBlob &b = arr->data();
-    CHECK(b.CheckContiguous());
-    MSHADOW_REAL_TYPE_SWITCH(arr->dtype(), DType, {
-      *out_pdata = b.FlatTo2D<cpu, DType>().dptr_;
-    });
+    *out_pdata = arr->data().dptr_;
   } else {
     *out_pdata = nullptr;
   }