Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add VTK_EXEC_EXPORT to new CellAverage methods

Browse Source 
Frankly, I am surprised that the CellAverage worklet compiled on CUDA
when the parenthesis operator relied on methods that were not delcared
as __device__.
This commit is contained in:
Kenneth Moreland 2016-10-23 09:45:46 -04:00
parent adfb0bba55
commit 622a44339d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vtkm/worklet/CellAverage.h
View File

@ -64,6 +64,7 @@ public:
private:
template<typename PointValueVecType, typename OutType>
VTKM_EXEC_EXPORT
void DoAverage(const PointValueVecType &pointValues,
const vtkm::IdComponent &numPoints,
OutType &average,
@ -82,6 +83,7 @@ private:
template<typename PointValueVecType,
typename OutType,
vtkm::IdComponent VecSize>
VTKM_EXEC_EXPORT
void DoAverage(const PointValueVecType &pointValues,
const vtkm::IdComponent &numPoints,
OutType &average,
@ -101,6 +103,7 @@ private:
typename OutType,
vtkm::IdComponent InVecSize,
vtkm::IdComponent OutVecSize>
VTKM_EXEC_EXPORT
void DoAverage(const PointValueVecType &vtkmNotUsed(pointValues),
const vtkm::IdComponent &vtkmNotUsed(numPoints),
OutType &vtkmNotUsed(average),

3
vtkm/worklet/testing/UnitTestCellAverage.cxx
View File

@ -51,7 +51,7 @@ void TestCellAverageUniform3D()
void TestCellAverageUniform2D()
{
std::cout << "Testing CellAverage Worklet on 2D strucutred data" << std::endl;
std::cout << "Testing CellAverage Worklet on 2D structured data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make2DUniformDataSet0();
@ -64,6 +64,7 @@ void TestCellAverageUniform2D()
result);
vtkm::Float32 expected[2] = { 30.1f, 40.1f };
std::cout << std::endl;
for (int i = 0; i < 2; ++i)
{
VTKM_TEST_ASSERT(