Move array copy to cxx

This commit is contained in:
dpugmire 2020-06-18 17:53:19 -04:00
parent 35ed68911e
commit bac9664104
3 changed files with 92 additions and 53 deletions

@ -149,6 +149,7 @@ set(sources
internal/VirtualObjectTransfer.cxx
Initialize.cxx
Logging.cxx
ParticleArrayCopy.cxx
RuntimeDeviceTracker.cxx
StorageBasic.cxx
Token.cxx

@ -0,0 +1,89 @@
//============================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
//
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/cont/Invoker.h>
#include <vtkm/cont/ParticleArrayCopy.h>
namespace vtkm
{
namespace cont
{
namespace detail
{
struct CopyParticlePositionWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn inParticle, FieldOut outPos);
VTKM_EXEC void operator()(const vtkm::Particle& inParticle, vtkm::Vec3f& outPos) const
{
outPos = inParticle.Pos;
}
};
struct CopyParticleAllWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn inParticle,
FieldOut outPos,
FieldOut outID,
FieldOut outSteps,
FieldOut outStatus,
FieldOut outTime);
VTKM_EXEC void operator()(const vtkm::Particle& inParticle,
vtkm::Vec3f& outPos,
vtkm::Id& outID,
vtkm::Id& outSteps,
vtkm::ParticleStatus& outStatus,
vtkm::FloatDefault& outTime) const
{
outPos = inParticle.Pos;
outID = inParticle.ID;
outSteps = inParticle.NumSteps;
outStatus = inParticle.Status;
outTime = inParticle.Time;
}
};
} // namespace detail
template <typename InStorage, typename OutStorage>
VTKM_CONT void ParticleArrayCopy(const vtkm::cont::ArrayHandle<vtkm::Particle, InStorage>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos)
{
vtkm::cont::Invoker invoke;
detail::CopyParticlePositionWorklet worklet;
invoke(worklet, inP, outPos);
}
/// \brief Copy all fields in vtkm::Particle to standard types.
///
/// Given an \c ArrayHandle of vtkm::Particle, this function copies the
/// position, ID, number of steps, status and time into a separate
/// \c ArrayHandle.
///
template <typename InStorage, typename OutStorage>
VTKM_CONT void ParticleArrayCopy(
const vtkm::cont::ArrayHandle<vtkm::Particle, InStorage>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos,
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outID,
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outSteps,
vtkm::cont::ArrayHandle<vtkm::ParticleStatus, OutStorage>& outStatus,
vtkm::cont::ArrayHandle<vtkm::FloatDefault, OutStorage>& outTime)
{
vtkm::cont::Invoker invoke;
detail::CopyParticleAllWorklet worklet;
invoke(worklet, inP, outPos, outID, outSteps, outStatus, outTime);
}
}
} // namespace vtkm::cont

@ -12,51 +12,12 @@
#include <vtkm/Particle.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/Invoker.h>
namespace vtkm
{
namespace cont
{
namespace detail
{
struct CopyParticlePositionWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn inParticle, FieldOut outPos);
VTKM_EXEC void operator()(const vtkm::Particle& inParticle, vtkm::Vec3f& outPos) const
{
outPos = inParticle.Pos;
}
};
struct CopyParticleAllWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn inParticle,
FieldOut outPos,
FieldOut outID,
FieldOut outSteps,
FieldOut outStatus,
FieldOut outTime);
VTKM_EXEC void operator()(const vtkm::Particle& inParticle,
vtkm::Vec3f& outPos,
vtkm::Id& outID,
vtkm::Id& outSteps,
vtkm::ParticleStatus& outStatus,
vtkm::FloatDefault& outTime) const
{
outPos = inParticle.Pos;
outID = inParticle.ID;
outSteps = inParticle.NumSteps;
outStatus = inParticle.Status;
outTime = inParticle.Time;
}
};
} // namespace detail
/// \brief Copy fields in vtkm::Particle to standard types.
///
/// Given an \c ArrayHandle of vtkm::Particle, this function copies the
@ -65,13 +26,7 @@ struct CopyParticleAllWorklet : public vtkm::worklet::WorkletMapField
template <typename InStorage, typename OutStorage>
VTKM_CONT void ParticleArrayCopy(const vtkm::cont::ArrayHandle<vtkm::Particle, InStorage>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos)
{
vtkm::cont::Invoker invoke;
detail::CopyParticlePositionWorklet worklet;
invoke(worklet, inP, outPos);
}
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos);
/// \brief Copy all fields in vtkm::Particle to standard types.
///
@ -87,13 +42,7 @@ VTKM_CONT void ParticleArrayCopy(
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outID,
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outSteps,
vtkm::cont::ArrayHandle<vtkm::ParticleStatus, OutStorage>& outStatus,
vtkm::cont::ArrayHandle<vtkm::FloatDefault, OutStorage>& outTime)
{
vtkm::cont::Invoker invoke;
detail::CopyParticleAllWorklet worklet;
invoke(worklet, inP, outPos, outID, outSteps, outStatus, outTime);
}
vtkm::cont::ArrayHandle<vtkm::FloatDefault, OutStorage>& outTime);
}
} // namespace vtkm::cont