Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-VTKM_VECTORIZATION_IN_LOOP-placement'

Browse Source 
6efc1920 Fix VTKM_VECTORIZATION_IN_LOOP placement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !321
This commit is contained in:
Sujin Philip 2016-01-25 16:03:16 -05:00 committed by Kitware Robot
commit 3b94d350f4
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h
View File

@ -229,8 +229,8 @@ public:
VTKM_VECTORIZATION_PRE_LOOP
for(vtkm::Id i=(numberOfValues-1); i >= 1; --i)
{
VTKM_VECTORIZATION_IN_LOOP
//nothing for gcc as input & output could be the same
VTKM_VECTORIZATION_IN_LOOP
outputPortal.Set(i, inputPortal.Get(i-1));
}
outputPortal.Set(0, initialValue);
@ -317,19 +317,15 @@ public:
DeviceAdapterAlgorithm<Device>::ScheduleKernel<Functor> kernel(functor);
vtkm::Id3 index;
for(vtkm::Id k=0; k < rangeMax[2]; ++k)
{
index[2] = k;
for(vtkm::Id j=0; j < rangeMax[1]; ++j)
{
index[1] = j;
VTKM_VECTORIZATION_PRE_LOOP
for(vtkm::Id i=0; i < rangeMax[0]; ++i)
{
VTKM_VECTORIZATION_IN_LOOP
index[0] = i;
kernel( index );
kernel(vtkm::Id3(i, j, k));
}
}
}

6
vtkm/cont/tbb/internal/FunctorsTBB.h
View File

@ -383,21 +383,17 @@ public:
void operator()(const ::tbb::blocked_range3d<vtkm::Id> &range) const {
try
{
vtkm::Id3 index;
for( vtkm::Id k=range.pages().begin(); k!=range.pages().end(); ++k)
{
index[2] = k;
for( vtkm::Id j=range.rows().begin(); j!=range.rows().end(); ++j)
{
index[1] = j;
const vtkm::Id start =range.cols().begin();
const vtkm::Id end = range.cols().end();
VTKM_VECTORIZATION_PRE_LOOP
for( vtkm::Id i=start; i != end; ++i)
{
VTKM_VECTORIZATION_IN_LOOP
index[0] = i;
this->Functor( index );
this->Functor(vtkm::Id3(i, j, k));
}
}
}