Merge pull request #3285 from longjon/cuda-dead-cpp

Remove dead preprocessor code for number of CUDA threads