Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix GPU memory initialization #150

Merged
merged 1 commit into from
May 28, 2016
Merged

Fix GPU memory initialization #150

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
29 changes: 22 additions & 7 deletions tools/caffe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,12 @@ int train() {
}
}

// Read flags for list of GPUs
vector<int> gpus;
get_gpus(&gpus);
caffe::GPUMemoryManager::Arena arena(gpus);

// Set mode and device id[s]
if (gpus.size() == 0) {
LOG(INFO) << "Use CPU.";
Caffe::set_mode(Caffe::CPU);
Expand Down Expand Up @@ -239,9 +243,17 @@ int test() {
CHECK_GT(FLAGS_model.size(), 0) << "Need a model definition to score.";
CHECK_GT(FLAGS_weights.size(), 0) << "Need model weights to score.";

// Set device id and mode
// Read flags for list of GPUs
vector<int> gpus;
get_gpus(&gpus);
while (gpus.size() > 1) {
// Only use one GPU
LOG(INFO) << "Not using GPU #" << gpus.back() << " for single-GPU function";
gpus.pop_back();
}
caffe::GPUMemoryManager::Arena arena(gpus);

// Set mode and device id
if (gpus.size() != 0) {
LOG(INFO) << "Use GPU with device ID " << gpus[0];
#ifndef CPU_ONLY
Expand Down Expand Up @@ -311,9 +323,17 @@ RegisterBrewFunction(test);
int time() {
CHECK_GT(FLAGS_model.size(), 0) << "Need a model definition to time.";

// Set device id and mode
// Read flags for list of GPUs
vector<int> gpus;
get_gpus(&gpus);
while (gpus.size() > 1) {
// Only use one GPU
LOG(INFO) << "Not using GPU #" << gpus.back() << " for single-GPU function";
gpus.pop_back();
}
caffe::GPUMemoryManager::Arena arena(gpus);

// Set mode and device_id
if (gpus.size() != 0) {
LOG(INFO) << "Use GPU with device ID " << gpus[0];
Caffe::SetDevice(gpus[0]);
Expand Down Expand Up @@ -413,11 +433,6 @@ int main(int argc, char** argv) {
// Run tool or show usage.
caffe::GlobalInit(&argc, &argv);

// Initialize gpu memory arena
vector<int> gpus;
get_gpus(&gpus);
caffe::GPUMemoryManager::Arena arena(gpus);

if (argc == 2) {
#ifdef WITH_PYTHON_LAYER
try {
Expand Down