Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

ExecutionArrayInterfaceBasic<T> explicitly construct DeviceAdapterId objects

Browse Source 
Rather than implicitly presume the `VTKM_DEVICE_ADAPTER_` macros can
convert to DeviceAdapterId.
This commit is contained in:
Robert Maynard 2018-07-25 12:04:30 -04:00
parent 86b9ab9969
commit e031e64967
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/cuda/internal/ExecutionArrayInterfaceBasicCuda.cu
View File

@ -31,7 +31,7 @@ namespace internal
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::GetDeviceId() const
{
return VTKM_DEVICE_ADAPTER_CUDA;
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_CUDA);
}
void ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::Allocate(TypelessExecutionArray& execArray,

2
vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.cxx
View File

@ -28,7 +28,7 @@ namespace internal
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP>::GetDeviceId() const
{
return VTKM_DEVICE_ADAPTER_OPENMP;
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_OPENMP);
}
} // namespace internal

2
vtkm/cont/serial/internal/ExecutionArrayInterfaceBasicSerial.cxx
View File

@ -27,7 +27,7 @@ namespace internal
{
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::GetDeviceId() const
{
return VTKM_DEVICE_ADAPTER_SERIAL;
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_SERIAL);
}
} // namespace internal

4
vtkm/cont/tbb/internal/ExecutionArrayInterfaceBasicTBB.cxx
View File

@ -25,9 +25,9 @@ namespace cont
{
namespace internal
{
vtkm::cont::DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagTBB>::GetDeviceId() const
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagTBB>::GetDeviceId() const
{
return VTKM_DEVICE_ADAPTER_TBB;
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_TBB);
}
} // namespace internal

2
vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx
View File

@ -130,7 +130,7 @@ struct ExecutionArrayInterfaceBasic<DeviceAdapterTagTestAlgorithmGeneral>
using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
VTKM_CONT
DeviceAdapterId GetDeviceId() const final { return -3; }
DeviceAdapterId GetDeviceId() const final { return DeviceAdapterId(-3); }
};
}
}