Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

trying to figure out how to use deviceAdapterAlgorithms

Browse Source
This commit is contained in:
Samuel Li 2016-07-27 16:23:26 -07:00
parent ab021ce6f0
commit 7dc59d80d7
4 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vtkm/worklet/testing/CMakeLists.txt
View File

@ -19,25 +19,25 @@
##============================================================================
set(unit_tests
UnitTestCellAverage.cxx
UnitTestClipping.cxx
UnitTestExternalFaces.cxx
UnitTestFieldHistogram.cxx
UnitTestFieldStatistics.cxx
UnitTestMarchingCubes.cxx
UnitTestPointElevation.cxx
UnitTestScatterCounting.cxx
UnitTestSplatKernels.cxx
UnitTestStreamLineUniformGrid.cxx
UnitTestTetrahedralizeExplicitGrid.cxx
UnitTestTetrahedralizeUniformGrid.cxx
UnitTestThreshold.cxx
UnitTestWorkletMapField.cxx
UnitTestWorkletMapFieldExecArg.cxx
UnitTestWorkletMapFieldWholeArray.cxx
UnitTestWorkletMapTopologyExplicit.cxx
UnitTestWorkletMapTopologyUniform.cxx
UnitTestVertexClustering.cxx
# UnitTestCellAverage.cxx
# UnitTestClipping.cxx
# UnitTestExternalFaces.cxx
# UnitTestFieldHistogram.cxx
# UnitTestFieldStatistics.cxx
# UnitTestMarchingCubes.cxx
# UnitTestPointElevation.cxx
# UnitTestScatterCounting.cxx
# UnitTestSplatKernels.cxx
# UnitTestStreamLineUniformGrid.cxx
# UnitTestTetrahedralizeExplicitGrid.cxx
# UnitTestTetrahedralizeUniformGrid.cxx
# UnitTestThreshold.cxx
# UnitTestWorkletMapField.cxx
# UnitTestWorkletMapFieldExecArg.cxx
# UnitTestWorkletMapFieldWholeArray.cxx
# UnitTestWorkletMapTopologyExplicit.cxx
# UnitTestWorkletMapTopologyUniform.cxx
# UnitTestVertexClustering.cxx
UnitTestWaveletCompressor.cxx
)

6
vtkm/worklet/testing/UnitTestWaveletCompressor.cxx
View File

@ -27,7 +27,7 @@
#include <vector>
VTKM_CONT_EXPORT
void TestExtend1D()
{
// make input data array handle
@ -182,9 +182,9 @@ void TestWaveDecomposeReconstruct()
void TestWaveletCompressor()
{
std::cout << "Welcome to WaveletCompressor test program :) " << std::endl;
//TestExtend1D();
TestExtend1D();
//TestDWTIDWT1D();
TestWaveDecomposeReconstruct();
//TestWaveDecomposeReconstruct();
}
int UnitTestWaveletCompressor(int, char *[])

11
vtkm/worklet/wavelets/WaveletBase.h
View File

@ -25,6 +25,7 @@
#include <vtkm/worklet/wavelets/WaveletFilter.h>
#include <vtkm/Math.h>
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
namespace vtkm {
namespace worklet {
@ -67,6 +68,16 @@ public:
}
}
template< typename ArrayType1, typename ArrayType2 >
VTKM_EXEC_EXPORT
void DeviceCopy( const ArrayType1 &srcArray,
ArrayType2 &dstArray)
{
vtkm::cont::DeviceAdapterAlgorithm< VTKM_DEFAULT_DEVICE_ADAPTER_TAG>::Copy
( srcArray, dstArray );
}
// Destructor
virtual ~WaveletBase()
{

5
vtkm/worklet/wavelets/WaveletDWT.h
View File

@ -115,8 +115,9 @@ public:
ArrayConcat leftOn( leftExtend, sigIn );
ArrayConcat2 rightOn(leftOn, rightExtend );
vtkm::cont::DeviceAdapterAlgorithm< VTKM_DEFAULT_DEVICE_ADAPTER_TAG>::Copy
( rightOn, sigOut );
//vtkm::cont::DeviceAdapterAlgorithm< VTKM_DEFAULT_DEVICE_ADAPTER_TAG>::Copy
// ( rightOn, sigOut );
WaveletBase::DeviceCopy( rightOn, sigOut );
return 0;
}