Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Add version of ArrayCopy that takes a device adapter

Browse Source 
This is still more convenient than declaring DeviceAdapterAlgorithm just
to copy two arrays. Now the function works whether or not you know what
the device should be.
This commit is contained in:
Kenneth Moreland 2017-09-25 16:54:24 -06:00
parent 65c7324ffe
commit f4ff589a9d
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vtkm/cont/ArrayCopy.h
View File

@ -34,16 +34,39 @@ namespace vtkm
namespace cont
{
/// \brief Does a deep copy from one array to another array.
///
/// Given a source \c ArrayHandle and a destination \c ArrayHandle, this function allocates the
/// destination \c ArrayHandle to the correct size and deeply copies all the values from the source
/// to the destination.
///
/// This version of the method takes a device adapter on which to perform the copy. If you do not
/// have a device adapter handy, use a version of \c ArrayCopy that uses a \c RuntimeDeviceTracker
/// (or no device at all) to choose a good option for you.
///
template <typename InValueType,
typename InStorage,
typename OutValueType,
typename OutStorage,
typename Device>
VTKM_CONT void ArrayCopy(const vtkm::cont::ArrayHandle<InValueType, InStorage>& source,
vtkm::cont::ArrayHandle<OutValueType, OutStorage>& destination,
Device)
{
vtkm::cont::DeviceAdapterAlgorithm<Device>::Copy(
vtkm::cont::make_ArrayHandleCast<OutValueType>(source), destination);
}
namespace detail
{
template <typename ValueType, typename InStorage, typename OutStorage>
template <typename InValueType, typename InStorage, typename OutValueType, typename OutStorage>
struct ArrayCopyFunctor
{
using InArrayHandleType = vtkm::cont::ArrayHandle<ValueType, InStorage>;
using InArrayHandleType = vtkm::cont::ArrayHandle<InValueType, InStorage>;
InArrayHandleType InputArray;
using OutArrayHandleType = vtkm::cont::ArrayHandle<ValueType, OutStorage>;
using OutArrayHandleType = vtkm::cont::ArrayHandle<OutValueType, OutStorage>;
OutArrayHandleType OutputArray;
bool OnlyUseCurrentInputDevice;
@ -71,7 +94,7 @@ struct ArrayCopyFunctor
return false;
}
vtkm::cont::DeviceAdapterAlgorithm<Device>::Copy(this->InputArray, this->OutputArray);
vtkm::cont::ArrayCopy(this->InputArray, this->OutputArray, Device());
return true;
}
@ -87,15 +110,16 @@ struct ArrayCopyFunctor
///
/// This method optionally takes a \c RuntimeDeviceTracker to control which devices to try.
///
template <typename ValueType, typename InStorage, typename OutStorage>
template <typename InValueType, typename InStorage, typename OutValueType, typename OutStorage>
VTKM_CONT void ArrayCopy(
const vtkm::cont::ArrayHandle<ValueType, InStorage>& source,
vtkm::cont::ArrayHandle<ValueType, OutStorage>& destination,
const vtkm::cont::ArrayHandle<InValueType, InStorage>& source,
vtkm::cont::ArrayHandle<OutValueType, OutStorage>& destination,
vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
{
bool isCopied = false;
detail::ArrayCopyFunctor<ValueType, InStorage, OutStorage> functor(source, destination, true);
detail::ArrayCopyFunctor<InValueType, InStorage, OutValueType, OutStorage> functor(
source, destination, true);
// First pass, only use source's already loaded device.
isCopied = vtkm::cont::TryExecute(functor, tracker);
@ -115,15 +139,6 @@ VTKM_CONT void ArrayCopy(
// If we are here, then we just failed to copy.
throw vtkm::cont::ErrorExecution("Failed to run ArrayCopy on any device.");
}
template <typename InValueType, typename InStorage, typename OutValueType, typename OutStorage>
VTKM_CONT void ArrayCopy(
const vtkm::cont::ArrayHandle<InValueType, InStorage>& source,
vtkm::cont::ArrayHandle<OutValueType, OutStorage>& destination,
vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
{
ArrayCopy(vtkm::cont::make_ArrayHandleCast<OutValueType>(source), destination, tracker);
}
}
} // namespace vtkm::cont

10
vtkm/cont/ArrayHandleCast.h
View File

@ -76,6 +76,16 @@ VTKM_CONT ArrayHandleCast<T, HandleType> make_ArrayHandleCast(const HandleType&
{
return ArrayHandleCast<T, HandleType>(handle);
}
/// Overriden version of \c make_ArrayHandleCast that returns the original object type.
///
template <typename T, typename Storage>
VTKM_CONT vtkm::cont::ArrayHandle<T, Storage> make_ArrayHandleCast(
const vtkm::cont::ArrayHandle<T, Storage>& handle,
const T& = T())
{
return handle;
}
}
} // namespace vtkm::cont