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

Some stream fixes

Browse Source
This commit is contained in:
AlexeyAB
2018-01-07 20:44:04 +03:00
parent 0419c54042
commit 0cb81e5f50
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/yolo_v2_class.cpp
View File

@ -34,7 +34,7 @@ struct detector_gpu_t{
};
YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id)
YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id)
{
int old_gpu_index;
#ifdef GPU
@ -178,7 +178,8 @@ YOLODLL_API std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool
int old_gpu_index;
#ifdef GPU
cudaGetDevice(&old_gpu_index);
cudaSetDevice(net.gpu_index);
if(cur_gpu_id != old_gpu_index)
cudaSetDevice(net.gpu_index);
#endif
//std::cout << "net.gpu_index = " << net.gpu_index << std::endl;
@ -242,7 +243,8 @@ YOLODLL_API std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool
free(sized.data);
#ifdef GPU
cudaSetDevice(old_gpu_index);
if (cur_gpu_id != old_gpu_index)
cudaSetDevice(old_gpu_index);
#endif
return bbox_vec;