Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'safe-cuda-runtime-config'

Browse Source 
f42f59d68 Fix crash when CUDA device is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gunther Weber <ghweber@lbl.gov>
Merge-request: !3216
This commit is contained in:
Kenneth Moreland 2024-05-17 12:20:18 +00:00 committed by Kitware Robot
commit f2b73fe2e4
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/changelog/safe-cuda-runtime-config.md Normal file
View File

@ -0,0 +1,7 @@
# Fix crash when CUDA device is disabled
There was an issue where if VTK-m was compiled with CUDA support but then
run on a computer where no CUDA device was available, an inappropriate
exception was thrown (instead of just disabling the device). The
initialization code should now properly check for the existance of a CUDA
device.

16
vtkm/cont/cuda/internal/RuntimeDeviceConfigurationCuda.h
View File

@ -10,6 +10,7 @@
#ifndef vtk_m_cont_cuda_internal_RuntimeDeviceConfigurationCuda_h #ifndef vtk_m_cont_cuda_internal_RuntimeDeviceConfigurationCuda_h
#define vtk_m_cont_cuda_internal_RuntimeDeviceConfigurationCuda_h #define vtk_m_cont_cuda_internal_RuntimeDeviceConfigurationCuda_h
#include <vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.h>
#include <vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h> #include <vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h>
#include <vtkm/cont/internal/RuntimeDeviceConfiguration.h> #include <vtkm/cont/internal/RuntimeDeviceConfiguration.h>
@ -35,6 +36,13 @@ class RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagCuda>
{ {
public: public:
RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagCuda>() RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagCuda>()
{
this->CudaDeviceCount = 0;
this->CudaProp.clear();
vtkm::cont::DeviceAdapterRuntimeDetector<vtkm::cont::DeviceAdapterTagCuda> detector;
if (detector.Exists())
{
try
{ {
int tmp; int tmp;
VTKM_CUDA_CALL(cudaGetDeviceCount(&tmp)); VTKM_CUDA_CALL(cudaGetDeviceCount(&tmp));
@ -45,6 +53,14 @@ public:
VTKM_CUDA_CALL(cudaGetDeviceProperties(&this->CudaProp[i], i)); VTKM_CUDA_CALL(cudaGetDeviceProperties(&this->CudaProp[i], i));
} }
} }
catch (...)
{
VTKM_LOG_F(vtkm::cont::LogLevel::Error,
"Error retrieving CUDA device information. Disabling.");
this->CudaDeviceCount = 0;
}
}
}
VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const override final VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const override final
{ {