add compute capability check
Merge master