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

Fix compatibility with CUDA 2.1 #5002

Closed
wants to merge 5 commits into from
Closed

Fix compatibility with CUDA 2.1 #5002

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
029169c
Fix compatibility with CUDA 2.1
uvNikita Nov 18, 2016
0c93447
Use std::min instead of ternary operator
uvNikita Nov 18, 2016
38fca10
Add missing include for min function
uvNikita Nov 18, 2016
dfee052
Change include to alphabetical order
uvNikita Nov 18, 2016
5f5b3d8
Get CUDA device properties only on the first call of CAFFE_GET_BLOCKS
uvNikita Nov 19, 2016
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
8 changes: 7 additions & 1 deletion include/caffe/util/device_alternate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,13 @@ const int CAFFE_CUDA_NUM_THREADS = 512;

// CUDA: number of blocks for threads.
inline int CAFFE_GET_BLOCKS(const int N) {
return (N + CAFFE_CUDA_NUM_THREADS - 1) / CAFFE_CUDA_NUM_THREADS;
cudaDeviceProp prop;
int device;
cudaGetDevice(&device);
CUDA_CHECK(cudaGetDeviceProperties(&prop, device));
int num_blocks = (N + CAFFE_CUDA_NUM_THREADS - 1) / CAFFE_CUDA_NUM_THREADS;
int max_blocks = prop.maxGridSize[0];
return num_blocks < max_blocks ? num_blocks : max_blocks;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there is reason why you don't use return std::min<int>(num_blocks, max_blocks); ?

Copy link
Author

Choose a reason for hiding this comment

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

Not really :) I can change it, thank you.

}

} // namespace caffe
Expand Down