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

Make ArrayPortalStreaming methods CONT

Browse Source 
Changing the macros of the methods of ArrayPortalStreaming to be only
for CONT (the control environment) rather than both CONT and EXEC (both
the control and export environments). ArrayPortalStreaming is really
only used in the control environment and passed to the default transport
where the data is copied to the execution environment.

My hope is that this change will eliminate some rather odd and non-
descriptive warnings on the dashboard.
This commit is contained in:
Kenneth Moreland 2016-11-15 00:12:20 -07:00
parent e1a9264d5d
commit 5a444af67b
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
vtkm/cont/ArrayHandleStreaming.h
View File

@ -34,69 +34,57 @@ public:
typedef P PortalType;
typedef typename PortalType::ValueType ValueType;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalStreaming() : InputPortal(), BlockIndex(0), BlockSize(0), CurBlockSize(0) { }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalStreaming(const PortalType &inputPortal, vtkm::Id blockIndex,
vtkm::Id blockSize, vtkm::Id curBlockSize) :
InputPortal(inputPortal), BlockIndex(blockIndex),
BlockSize(blockSize), CurBlockSize(curBlockSize) { }
VTKM_SUPPRESS_EXEC_WARNINGS
template<typename OtherP>
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalStreaming(const ArrayPortalStreaming<OtherP> &src) :
InputPortal(src.GetPortal()),
BlockIndex(src.GetBlockIndex()),
BlockSize(src.GetBlockSize()),
CurBlockSize(src.GetCurBlockSize()) { }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
vtkm::Id GetNumberOfValues() const {
return this->CurBlockSize;
}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ValueType Get(vtkm::Id index) const {
return this->InputPortal.Get(BlockIndex*BlockSize + index);
return this->InputPortal.Get(this->BlockIndex*this->BlockSize + index);
}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
void Set(vtkm::Id index, const ValueType &value) const {
this->InputPortal.Set(BlockIndex*BlockSize + index, value);
this->InputPortal.Set(this->BlockIndex*this->BlockSize + index, value);
}
VTKM_EXEC_CONT
VTKM_CONT
const PortalType &GetPortal() const { return this->InputPortal; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
void SetBlockSize(vtkm::Id blockSize) { BlockSize = blockSize; }
VTKM_CONT
void SetBlockSize(vtkm::Id blockSize) { this->BlockSize = blockSize; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
void SetBlockIndex(vtkm::Id blockIndex) { BlockIndex = blockIndex; }
VTKM_CONT
void SetBlockIndex(vtkm::Id blockIndex) { this->BlockIndex = blockIndex; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
void SetCurBlockSize(vtkm::Id curBlockSize) { CurBlockSize = curBlockSize; }
VTKM_CONT
void SetCurBlockSize(vtkm::Id curBlockSize) { this->CurBlockSize = curBlockSize; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
vtkm::Id GetBlockSize() { return this->BlockSize; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
vtkm::Id GetBlockIndex() { return this->BlockIndex; }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
vtkm::Id GetCurBlockSize() { return this->CurBlockSize; }
private: