Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix Compilation bug with Fill method

Browse Source
This commit is contained in:
nadavi 2019-10-09 15:39:49 -06:00
parent 1de5774d57
commit 64dede7486
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/Algorithm.h
View File

@ -594,7 +594,7 @@ struct Algorithm
template <typename WordType>
VTKM_CONT static void Fill(vtkm::cont::BitField& bits, WordType word)
{
FillBitField(vtkm::cont::DeviceAdapterTagAny{}, bits, word);
Fill(vtkm::cont::DeviceAdapterTagAny{}, bits, word);
}
template <typename T, typename S>

23
vtkm/cont/DeviceAdapterAlgorithm.h
View File

@ -134,7 +134,7 @@ struct DeviceAdapterAlgorithm
template <typename WordType>
VTKM_CONT static void Fill(vtkm::cont::BitField& bits, WordType word, vtkm::Id numBits);
template <typename WordType>
VTKM_CONT static void Fill(vtkm::cont::BitField& bits, WordType word, bool value);
VTKM_CONT static void Fill(vtkm::cont::BitField& bits, WordType word);
/// @}
/// Fill @a array with @a value. If @a numValues is specified, the array will
@ -253,16 +253,6 @@ struct DeviceAdapterAlgorithm
VTKM_CONT static T ScanInclusive(const vtkm::cont::ArrayHandle<T, CIn>& input,
vtkm::cont::ArrayHandle<T, COut>& output);
/// \brief Streaming version of scan exclusive
///
/// Computes a scan one block at a time.
///
/// \return The total sum.
///
template <typename T, class CIn, class COut>
VTKM_CONT static T StreamingScanExclusive(const vtkm::Id numBlocks,
const vtkm::cont::ArrayHandle<T, CIn>& input,
vtkm::cont::ArrayHandle<T, COut>& output);
/// \brief Compute an inclusive prefix sum operation on the input ArrayHandle.
///
@ -378,6 +368,17 @@ struct DeviceAdapterAlgorithm
const vtkm::cont::ArrayHandle<U, VIn>& values,
vtkm::cont::ArrayHandle<U, VOut>& output);
/// \brief Streaming version of scan exclusive
///
/// Computes a scan one block at a time.
///
/// \return The total sum.
///
template <typename T, class CIn, class COut>
VTKM_CONT static T StreamingScanExclusive(const vtkm::Id numBlocks,
const vtkm::cont::ArrayHandle<T, CIn>& input,
vtkm::cont::ArrayHandle<T, COut>& output);
/// \brief Compute an extended prefix sum operation on the input ArrayHandle.
///
/// Computes an extended prefix sum operation on the \c input ArrayHandle,

17
vtkm/cont/testing/UnitTestAlgorithm.cxx
View File

@ -23,6 +23,22 @@ namespace
//
static constexpr vtkm::Id ARRAY_SIZE = 10;
void FillTest()
{
vtkm::cont::BitField bits;
vtkm::cont::ArrayHandle<vtkm::Id> array;
bits.Allocate(ARRAY_SIZE);
array.Allocate(ARRAY_SIZE);
vtkm::cont::Algorithm::Fill(bits, true);
vtkm::cont::Algorithm::Fill(bits, true, 5);
vtkm::cont::Algorithm::Fill(bits, vtkm::UInt8(0xab));
vtkm::cont::Algorithm::Fill(bits, vtkm::UInt8(0xab), 5);
vtkm::cont::Algorithm::Fill(array, vtkm::Id(5));
vtkm::cont::Algorithm::Fill(array, vtkm::Id(5), 5);
}
void CopyTest()
{
vtkm::cont::ArrayHandle<vtkm::Id> input;
@ -171,6 +187,7 @@ void UniqueTest()
void TestAll()
{
FillTest();
CopyTest();
BoundsTest();
ReduceTest();