Skip to content

Fix potential CNMEM_NOT_INITIALIZED errors #26

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

Merged
lukeyeager merged 1 commit into from
Aug 31, 2015
Merged

Fix potential CNMEM_NOT_INITIALIZED errors #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions include/caffe/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ class MemoryHandlerActivator {
using_pool_ = true;
MemoryHandler::usePool();
MemoryHandler::setGPUs(gpus);
#ifndef CPU_ONLY
void* temp;
MemoryHandler::mallocGPU(&temp, 4);
MemoryHandler::freeGPU(temp);
Copy link
Member

@lukeyeager lukeyeager Aug 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably warrants an explanatory comment.

Copy link
Member

@lukeyeager lukeyeager Aug 31, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be wrapped in a #ifndef CPU_ONLY (or #ifdef USE_CNMEM) for the CPU-only build.

#endif
}
}
~MemoryHandlerActivator() {
Expand Down