fix cuda compile, export function.

This commit is contained in:
dpugmire 2020-06-19 10:57:30 -04:00
parent 00b1f85ebd
commit 0654d1853d
4 changed files with 7 additions and 3 deletions

@ -184,6 +184,7 @@ set(sources
Field.cxx
FieldRangeCompute.cxx
FieldRangeGlobalCompute.cxx
ParticleArrayCopy.cxx
PartitionedDataSet.cxx
PointLocator.cxx
PointLocatorUniformGrid.cxx

@ -10,6 +10,7 @@
#include <vtkm/cont/Invoker.h>
#include <vtkm/cont/ParticleArrayCopy.h>
#include <vtkm/worklet/WorkletMapField.h>
namespace vtkm
{
@ -71,6 +72,7 @@ VTKM_CONT void ParticleArrayCopy(
/// \c ArrayHandle.
///
VTKM_CONT void ParticleArrayCopy(
const vtkm::cont::ArrayHandle<vtkm::Particle, vtkm::cont::StorageTagBasic>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, vtkm::cont::StorageTagBasic>& outPos,

@ -12,6 +12,7 @@
#include <vtkm/Particle.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/vtkm_cont_export.h>
namespace vtkm
{
@ -23,7 +24,7 @@ namespace cont
/// Given an \c ArrayHandle of vtkm::Particle, this function copies the
/// position field into an \c ArrayHandle of \c Vec3f objects.
///
VTKM_CONT_EXPORT
VTKM_CONT void ParticleArrayCopy(
const vtkm::cont::ArrayHandle<vtkm::Particle, vtkm::cont::StorageTagBasic>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, vtkm::cont::StorageTagBasic>& outPos);
@ -34,7 +35,7 @@ VTKM_CONT void ParticleArrayCopy(
/// position, ID, number of steps, status and time into a separate
/// \c ArrayHandle.
///
VTKM_CONT_EXPORT
VTKM_CONT void ParticleArrayCopy(
const vtkm::cont::ArrayHandle<vtkm::Particle, vtkm::cont::StorageTagBasic>& inP,
vtkm::cont::ArrayHandle<vtkm::Vec3f, vtkm::cont::StorageTagBasic>& outPos,

@ -177,7 +177,7 @@ vtkm_library(
DEVICE_SOURCES ${sources_device}
USE_VTKM_JOB_POOL
)
target_link_libraries(vtkm_filter PUBLIC vtkm_worklet vtkm_cont)
target_link_libraries(vtkm_filter PUBLIC vtkm_worklet)
add_subdirectory(internal)