Check the source array's active device in ArrayCopy.
This commit is contained in:
parent
399f23963e
commit
d3fbe535f2
@ -12,8 +12,9 @@
|
||||
|
||||
#include <vtkm/cont/Algorithm.h>
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
#include <vtkm/cont/ArrayHandleCast.h>
|
||||
#include <vtkm/cont/TryExecute.h>
|
||||
#include <vtkm/cont/DeviceAdapterTag.h>
|
||||
#include <vtkm/cont/ErrorExecution.h>
|
||||
#include <vtkm/cont/Logging.h>
|
||||
|
||||
// TODO: When virtual arrays are available, compile the implementation in a .cxx/.cu file. Common
|
||||
// arrays are copied directly but anything else would be copied through virtual methods.
|
||||
@ -28,14 +29,37 @@ namespace cont
|
||||
/// destination \c ArrayHandle to the correct size and deeply copies all the values from the source
|
||||
/// to the destination.
|
||||
///
|
||||
/// This method will attempt to copy the data using the device that the input
|
||||
/// data is already valid on. If the input data is only valid in the control
|
||||
/// environment, the runtime device tracker is used to try to find another
|
||||
/// device.
|
||||
///
|
||||
template <typename InValueType, typename InStorage, typename OutValueType, typename OutStorage>
|
||||
VTKM_CONT inline void ArrayCopy(const vtkm::cont::ArrayHandle<InValueType, InStorage>& source,
|
||||
vtkm::cont::ArrayHandle<OutValueType, OutStorage>& destination)
|
||||
{
|
||||
bool isCopied =
|
||||
vtkm::cont::Algorithm::Copy(vtkm::cont::DeviceAdapterTagAny(), source, destination);
|
||||
if (!isCopied)
|
||||
{ // If after the second pass, still not valid through an exception
|
||||
// Find the device that already has a copy of the data:
|
||||
vtkm::cont::DeviceAdapterId devId = source.GetDeviceAdapterId();
|
||||
|
||||
// If the data is not on any device, let the runtime tracker pick an available
|
||||
// parallel copy algorithm.
|
||||
if (devId.GetValue() == VTKM_DEVICE_ADAPTER_UNDEFINED)
|
||||
{
|
||||
devId = vtkm::cont::make_DeviceAdapterId(VTKM_DEVICE_ADAPTER_ANY);
|
||||
}
|
||||
|
||||
bool success = vtkm::cont::Algorithm::Copy(devId, source, destination);
|
||||
|
||||
if (!success && devId.GetValue() != VTKM_DEVICE_ADAPTER_ANY)
|
||||
{ // Retry on any device if the first attempt failed.
|
||||
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
|
||||
"Failed to run ArrayCopy on device '" << devId.GetName()
|
||||
<< "'. Retrying on any device.");
|
||||
success = vtkm::cont::Algorithm::Copy(vtkm::cont::DeviceAdapterTagAny{}, source, destination);
|
||||
}
|
||||
|
||||
if (!success)
|
||||
{
|
||||
throw vtkm::cont::ErrorExecution("Failed to run ArrayCopy on any device.");
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user