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

Fixed CUDA build errors.

Browse Source
This commit is contained in:
Petar Hristov 2020-07-27 10:00:11 +01:00
parent ce653c78f1
commit 6b82c1ab77
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/worklet/contourtree_augmented/Types.h
View File

@ -162,6 +162,7 @@ public:
bool UpEdge; bool UpEdge;
Float64 SubtreeHeight; Float64 SubtreeHeight;
VTKM_EXEC
bool operator<(const EdgeDataHeight& b) const bool operator<(const EdgeDataHeight& b) const
{ {
if (this->I == b.I) if (this->I == b.I)
@ -206,6 +207,7 @@ public:
bool UpEdge; bool UpEdge;
Id SubtreeVolume; Id SubtreeVolume;
VTKM_EXEC
bool operator<(const EdgeDataVolume& b) const bool operator<(const EdgeDataVolume& b) const
{ {
if (this->I == b.I) if (this->I == b.I)

3
vtkm/worklet/contourtree_augmented/processcontourtree/HypersweepWorklets.h
View File

@ -667,7 +667,8 @@ public:
} }
else else
{ {
chainToBranchPortal.Set(supernode, NO_SUCH_ELEMENT); // This should just be vtkm::worklet::contourtree_augmented::NO_SUCH_ELEMENT, but there's the build error - identifier "vtkm::worklet::contourtree_augmented::NO_SUCH_ELEMENT" is undefined in device code
chainToBranchPortal.Set(supernode, std::numeric_limits<vtkm::Id>::min());
} }
} }
}; // ComputeMinMaxValues }; // ComputeMinMaxValues