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

Merge topic 'simplify_timer_logic'

Browse Source 
8d4611387 Simplify Timer now that RuntimeDeviceTracker handles 'any' device.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1707
This commit is contained in:
Robert Maynard 2019-06-19 16:54:30 +00:00 committed by Kitware Robot
commit 5e534205d3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/cont/Timer.cxx
View File

@ -216,7 +216,7 @@ Timer::Timer(vtkm::cont::DeviceAdapterId device)
, Internal(nullptr)
{
const vtkm::cont::RuntimeDeviceTracker& tracker = vtkm::cont::GetRuntimeDeviceTracker();
if (device != DeviceAdapterTagAny() && !tracker.CanRunOn(device))
if (!tracker.CanRunOn(device))
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Device '" << device.GetName() << "' can not run on current Device."
@ -245,7 +245,7 @@ void Timer::Reset()
void Timer::Reset(vtkm::cont::DeviceAdapterId device)
{
const vtkm::cont::RuntimeDeviceTracker& tracker = vtkm::cont::GetRuntimeDeviceTracker();
if (device != DeviceAdapterTagAny() && !tracker.CanRunOn(device))
if (!tracker.CanRunOn(device))
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Device '" << device.GetName() << "' can not run on current Device."
@ -318,7 +318,7 @@ vtkm::Float64 Timer::GetElapsedTime(vtkm::cont::DeviceAdapterId device) const
// If we have specified a specific device, make sure we can run on it.
auto& tracker = vtkm::cont::GetRuntimeDeviceTracker();
if (deviceToTime != vtkm::cont::DeviceAdapterTagAny() && !tracker.CanRunOn(deviceToTime))
if (!tracker.CanRunOn(deviceToTime))
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Device '" << deviceToTime.GetName() << "' can not run on current Device."