mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 02:25:42 +00:00
ExecutionArrayInterfaceBasic<T> explicitly construct DeviceAdapterId objects
Rather than implicitly presume the `VTKM_DEVICE_ADAPTER_` macros can convert to DeviceAdapterId.
This commit is contained in:
parent
86b9ab9969
commit
e031e64967
@ -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,
|
||||
|
@ -28,7 +28,7 @@ namespace internal
|
||||
|
||||
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP>::GetDeviceId() const
|
||||
{
|
||||
return VTKM_DEVICE_ADAPTER_OPENMP;
|
||||
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_OPENMP);
|
||||
}
|
||||
|
||||
} // namespace internal
|
||||
|
@ -27,7 +27,7 @@ namespace internal
|
||||
{
|
||||
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::GetDeviceId() const
|
||||
{
|
||||
return VTKM_DEVICE_ADAPTER_SERIAL;
|
||||
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_SERIAL);
|
||||
}
|
||||
|
||||
} // namespace internal
|
||||
|
@ -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
|
||||
|
@ -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); }
|
||||
};
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user