Commit 6c3f6693 authored by Robert Maynard's avatar Robert Maynard
Browse files

Remove dead code for converting zip handles to iterators for cuda.

This code isn't needed anymore as the new iterator facade handles this
use case properly.
parent 549dfa54
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <thrust/functional.h> #include <thrust/functional.h>
#include <thrust/iterator/counting_iterator.h> #include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h> #include <thrust/iterator/transform_iterator.h>
#include <thrust/iterator/zip_iterator.h>
#if defined(__GNUC__) || defined(____clang__) #if defined(__GNUC__) || defined(____clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
...@@ -53,7 +52,6 @@ namespace detail { ...@@ -53,7 +52,6 @@ namespace detail {
// Tags to specify what type of thrust iterator to use. // Tags to specify what type of thrust iterator to use.
struct ThrustIteratorTransformTag { }; struct ThrustIteratorTransformTag { };
struct ThrustIteratorZipTag { };
struct ThrustIteratorDevicePtrTag { }; struct ThrustIteratorDevicePtrTag { };
// Traits to help classify what thrust iterators will be used. // Traits to help classify what thrust iterators will be used.
...@@ -123,16 +121,6 @@ MakeIteratorBegin(PortalType portal, detail::ThrustIteratorTransformTag) ...@@ -123,16 +121,6 @@ MakeIteratorBegin(PortalType portal, detail::ThrustIteratorTransformTag)
return vtkm::exec::cuda::internal::IteratorFromArrayPortal<PortalType>(portal,0); return vtkm::exec::cuda::internal::IteratorFromArrayPortal<PortalType>(portal,0);
} }
template<class PortalType>
VTKM_CONT_EXPORT
typename IteratorTraits<PortalType>::IteratorType
MakeIteratorBegin(PortalType portal, detail::ThrustIteratorZipTag)
{
return MakeZipIterator(portal.GetFirstPortal(),
portal.GetSecondPortal()
);
}
template<class PortalType> template<class PortalType>
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
typename IteratorTraits<PortalType>::IteratorType typename IteratorTraits<PortalType>::IteratorType
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment