4141
4242namespace tcnn {
4343
44- static_assert (
45- __CUDACC_VER_MAJOR__ > 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ >= 2 ),
46- " tiny-cuda-nn requires at least CUDA 10.2"
47- );
44+ static_assert (__CUDACC_VER_MAJOR__ > 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ >= 2 ), " tiny-cuda-nn requires at least CUDA 10.2" );
4845
4946std::function<void (LogSeverity, const std::string&)> g_log_callback = [](LogSeverity severity, const std::string& msg) {
5047 switch (severity) {
@@ -214,9 +211,7 @@ int cuda_device() {
214211 return device;
215212}
216213
217- void set_cuda_device (int device) {
218- CUDA_CHECK_THROW (cudaSetDevice (device));
219- }
214+ void set_cuda_device (int device) { CUDA_CHECK_THROW (cudaSetDevice (device)); }
220215
221216int cuda_device_count () {
222217 int device_count;
@@ -244,9 +239,7 @@ const cudaDeviceProp& cuda_get_device_properties(int device) {
244239 return cuda_device_properties ().at (device);
245240}
246241
247- std::string cuda_device_name (int device) {
248- return cuda_get_device_properties (device).name ;
249- }
242+ std::string cuda_device_name (int device) { return cuda_get_device_properties (device).name ; }
250243
251244uint32_t cuda_compute_capability (int device) {
252245 const auto & props = cuda_get_device_properties (device);
@@ -261,22 +254,20 @@ uint32_t cuda_max_supported_compute_capability() {
261254 return 80 ;
262255 } else if (cuda_version < 11080 ) {
263256 return 86 ;
264- } else {
257+ } else if (cuda_version < 12080 ) {
265258 return 90 ;
259+ } else {
260+ return 120 ;
266261 }
267262}
268263
269264uint32_t cuda_supported_compute_capability (int device) {
270265 return std::min (cuda_compute_capability (device), cuda_max_supported_compute_capability ());
271266}
272267
273- size_t cuda_max_shmem (int device) {
274- return cuda_get_device_properties (device).sharedMemPerBlockOptin ;
275- }
268+ size_t cuda_max_shmem (int device) { return cuda_get_device_properties (device).sharedMemPerBlockOptin ; }
276269
277- uint32_t cuda_max_registers (int device) {
278- return (uint32_t )cuda_get_device_properties (device).regsPerBlock ;
279- }
270+ uint32_t cuda_max_registers (int device) { return (uint32_t )cuda_get_device_properties (device).regsPerBlock ; }
280271
281272size_t cuda_memory_granularity (int device) {
282273 size_t granularity;
@@ -358,4 +349,4 @@ template <> std::string type_to_string<double>() { return "double"; }
358349template <> std::string type_to_string<float >() { return " float" ; }
359350template <> std::string type_to_string<__half>() { return " __half" ; }
360351
361- }
352+ } // namespace tcnn
0 commit comments