Merge branch 'make_sure_to_use_cuda_execution_policy' into 'master'

Cuda copy from host to device can't use the cuda execution policy.

See merge request !165
This commit is contained in:
Robert Maynard 2015-09-02 10:29:03 -04:00
commit f413941aa7

@ -167,7 +167,6 @@ public:
{
storage->Allocate(static_cast<vtkm::Id>(this->Array.size()));
::thrust::copy(
thrust::cuda::par,
this->Array.data(),
this->Array.data() + static_cast<difference_type>(this->Array.size()),
vtkm::cont::ArrayPortalToIteratorBegin(storage->GetPortal()));