Merge topic 'runtime_device_tracker_log_each_device_changes'

0ee575372 VTK-m now logs whenever at runtime a device is enabled/disabled.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1501
This commit is contained in:
Robert Maynard 2019-01-02 16:14:11 +00:00 committed by Kitware Robot
commit b47ed21631
2 changed files with 6 additions and 2 deletions

@ -182,8 +182,6 @@ InitializeResult Initialize(int& argc, char* argv[], InitializeOptions opts)
{
auto id = vtkm::cont::make_DeviceAdapterId(options[DEVICE].arg);
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
"Forcing device '" << tracker.GetDeviceName(id) << "'");
tracker.ForceDevice(id);
config.Device = id;
}

@ -137,6 +137,9 @@ VTKM_CONT
void RuntimeDeviceTracker::SetDeviceState(vtkm::cont::DeviceAdapterId deviceId, bool state)
{
this->CheckDevice(deviceId);
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
"Setting device '" << deviceId.GetName() << "' to " << state);
this->Internals->RuntimeValid[deviceId.GetValue()] = state;
}
@ -197,6 +200,9 @@ void RuntimeDeviceTracker::ForceDeviceImpl(vtkm::cont::DeviceAdapterId deviceId,
}
this->CheckDevice(deviceId);
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
"Forcing execution to occur on device '" << deviceId.GetName() << "'");
std::fill_n(this->Internals->RuntimeValid, VTKM_MAX_DEVICE_ADAPTER_ID, false);
this->Internals->RuntimeValid[deviceId.GetValue()] = runtimeExists;