Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

fix cuda compile, export function.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vtkm/cont/CMakeLists.txt
View File

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

2
vtkm/cont/ParticleArrayCopy.cxx
View File

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

5
vtkm/cont/ParticleArrayCopy.h
View File

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

2
vtkm/filter/CMakeLists.txt
View File

@ -177,7 +177,7 @@ vtkm_library(
DEVICE_SOURCES ${sources_device} DEVICE_SOURCES ${sources_device}
USE_VTKM_JOB_POOL 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) add_subdirectory(internal)