Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented kDLCPUPinned (cudaMallocHost) #4985

Merged
merged 4 commits into from
Mar 10, 2020
Merged

Implemented kDLCPUPinned (cudaMallocHost) #4985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a3d60f
implement kDLCPUPinned
jmorrill Mar 4, 2020
ee5e8de
Fix line endings
jmorrill Mar 4, 2020
2b877fd
Fix whitespace for linter
jmorrill Mar 4, 2020
7577b2a
cleanup up allocdataspace method
jmorrill Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/tvm/runtime/device_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ inline const char* DeviceName(int type) {
switch (type) {
case kDLCPU: return "cpu";
case kDLGPU: return "gpu";
case kDLCPUPinned: return "cpu_pinned";
case kDLOpenCL: return "opencl";
case kDLSDAccel: return "sdaccel";
case kDLAOCL: return "aocl";
Expand Down
39 changes: 34 additions & 5 deletions src/runtime/cuda/cuda_device_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,25 @@ class CUDADeviceAPI final : public DeviceAPI {
size_t nbytes,
size_t alignment,
DLDataType type_hint) final {
CUDA_CALL(cudaSetDevice(ctx.device_id));
CHECK_EQ(256 % alignment, 0U)
<< "CUDA space is aligned at 256 bytes";
<< "CUDA space is aligned at 256 bytes";
void *ret;
CUDA_CALL(cudaMalloc(&ret, nbytes));
if (ctx.device_type == kDLCPUPinned) {
CUDA_CALL(cudaMallocHost(&ret, nbytes));
} else {
CUDA_CALL(cudaSetDevice(ctx.device_id));
CUDA_CALL(cudaMalloc(&ret, nbytes));
}
return ret;
}

void FreeDataSpace(TVMContext ctx, void* ptr) final {
CUDA_CALL(cudaSetDevice(ctx.device_id));
CUDA_CALL(cudaFree(ptr));
if (ctx.device_type == kDLCPUPinned) {
CUDA_CALL(cudaFreeHost(ptr));
} else {
CUDA_CALL(cudaSetDevice(ctx.device_id));
CUDA_CALL(cudaFree(ptr));
}
}

void CopyDataFromTo(const void* from,
Expand All @@ -137,6 +145,21 @@ class CUDADeviceAPI final : public DeviceAPI {
cudaStream_t cu_stream = static_cast<cudaStream_t>(stream);
from = static_cast<const char*>(from) + from_offset;
to = static_cast<char*>(to) + to_offset;

if (ctx_from.device_type == kDLCPUPinned) {
ctx_from.device_type = kDLCPU;
}

if (ctx_to.device_type == kDLCPUPinned) {
ctx_to.device_type = kDLCPU;
}

// In case there is a copy from host mem to host mem */
if (ctx_to.device_type == kDLCPU && ctx_from.device_type == kDLCPU) {
memcpy(to, from, size);
return;
}

if (ctx_from.device_type == kDLGPU && ctx_to.device_type == kDLGPU) {
CUDA_CALL(cudaSetDevice(ctx_from.device_id));
if (ctx_from.device_id == ctx_to.device_id) {
Expand Down Expand Up @@ -235,5 +258,11 @@ TVM_REGISTER_GLOBAL("device_api.gpu")
*rv = static_cast<void*>(ptr);
});

TVM_REGISTER_GLOBAL("device_api.cpu_pinned")
.set_body([](TVMArgs args, TVMRetValue* rv) {
DeviceAPI* ptr = CUDADeviceAPI::Global().get();
*rv = static_cast<void*>(ptr);
});

} // namespace runtime
} // namespace tvm
4 changes: 3 additions & 1 deletion src/runtime/ndarray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ void NDArray::CopyFromTo(const DLTensor* from,

CHECK(from->ctx.device_type == to->ctx.device_type
|| from->ctx.device_type == kDLCPU
|| to->ctx.device_type == kDLCPU)
|| to->ctx.device_type == kDLCPU
|| from->ctx.device_type == kDLCPUPinned
|| to->ctx.device_type == kDLCPUPinned)
<< "Can not copy across different ctx types directly";

// Use the context that is *not* a cpu context to get the correct device
Expand Down