mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Fixed gpu_id for DLL/SO

Browse Source
This commit is contained in:
AlexeyAB
2018-03-20 02:17:26 +03:00
parent 537d135feb
commit ced198e939
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/yolo_v2_class.cpp
View File

@ -54,11 +54,12 @@ YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_file
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
#ifdef GPU #ifdef GPU
check_cuda( cudaSetDevice(gpu_id) ); //check_cuda( cudaSetDevice(cur_gpu_id) );
printf(" Used GPU %d \n", gpu_id); cuda_set_device(cur_gpu_id);
printf(" Used GPU %d \n", cur_gpu_id);
#endif #endif
network &net = detector_gpu.net; network &net = detector_gpu.net;
net.gpu_index = gpu_id; net.gpu_index = cur_gpu_id;
//gpu_index = i; //gpu_index = i;
char *cfgfile = const_cast<char *>(cfg_filename.data()); char *cfgfile = const_cast<char *>(cfg_filename.data());
@ -69,7 +70,7 @@ YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_file
load_weights(&net, weightfile); load_weights(&net, weightfile);
} }
set_batch_network(&net, 1); set_batch_network(&net, 1);
net.gpu_index = gpu_id; net.gpu_index = cur_gpu_id;
layer l = net.layers[net.n - 1]; layer l = net.layers[net.n - 1];
int j; int j;
@ -109,7 +110,8 @@ YOLODLL_API Detector::~Detector()
int old_gpu_index; int old_gpu_index;
#ifdef GPU #ifdef GPU
cudaGetDevice(&old_gpu_index); cudaGetDevice(&old_gpu_index);
cudaSetDevice(detector_gpu.net.gpu_index); //cudaSetDevice(detector_gpu.net.gpu_index);
cuda_set_device(detector_gpu.net.gpu_index);
#endif #endif
free_network(detector_gpu.net); free_network(detector_gpu.net);