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

Merge topic 'test-contour-tree-augmented-mc'

Browse Source 
0183db685 Split array access into separate lines and add VTKM_ASSERT
0a33737ea Re-enable unit tests for ContourTreeUniformAugmentedFilter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2390
This commit is contained in:
Gunther Weber 2021-01-28 16:43:39 +00:00 committed by Kitware Robot
commit 32a25a4b05
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/centos7.yml
View File

@ -30,8 +30,6 @@ test:centos7_gcc48:
- .centos7
- .cmake_test_linux
- .only-default
variables:
CTEST_EXCLUSIONS: "UnitTestContourTreeUniformAugmentedFilterCUDA|UnitTestContourTreeUniformAugmentedCUDA"
dependencies:
- build:centos7_gcc48
needs:
@ -50,7 +48,7 @@ test:rhel8_test_centos7:
- .cmake_test_linux
- .only-default
variables:
CTEST_EXCLUSIONS: "built_against_test_install|UnitTestContourTreeUniformAugmentedFilterCUDA|UnitTestContourTreeUniformAugmentedCUDA"
CTEST_EXCLUSIONS: "built_against_test_install"
dependencies:
- build:centos7_gcc48
needs:

46
vtkm/worklet/contourtree_augmented/meshtypes/MeshStructureMarchingCubes.h
View File

@ -313,22 +313,38 @@ public:
caseNo |= (vtkm::UInt8)(1 << vtxNo);
}
}
const auto& vertex_permutation = CubeVertexPermutationsPortal.Get(permIndex);
if (getMaxComponents)
{
for (int edgeNo = 0; edgeNo < 3; ++edgeNo)
{
if (InCubeConnectionsSixPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo))
{
int root0 = CubeVertexPermutationsPortal.Get(
permIndex)[LinkVertexConnectionsSixPortal.Get(edgeNo)[0]];
const auto& edge = LinkVertexConnectionsSixPortal.Get(edgeNo);
vtkm::IdComponent edge0 = edge[0];
vtkm::IdComponent edge1 = edge[1];
VTKM_ASSERT(0 <= edge0 && edge0 < CubeVertexPermutations_PermVecLength);
VTKM_ASSERT(0 <= edge1 && edge1 < CubeVertexPermutations_PermVecLength);
int root0 = vertex_permutation[edge0];
int root1 = vertex_permutation[edge1];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
while (parentId[root0] != root0)
{
root0 = parentId[root0];
int root1 = CubeVertexPermutationsPortal.Get(
permIndex)[LinkVertexConnectionsSixPortal.Get(edgeNo)[1]];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
}
while (parentId[root1] != root1)
{
root1 = parentId[root1];
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
}
if (root0 != root1)
{
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
parentId[root1] = root0;
}
}
}
}
@ -338,16 +354,30 @@ public:
{
if (InCubeConnectionsEighteenPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo))
{
int root0 = CubeVertexPermutationsPortal.Get(
permIndex)[LinkVertexConnectionsEighteenPortal.Get(edgeNo)[0]];
const auto& edge = LinkVertexConnectionsEighteenPortal.Get(edgeNo);
vtkm::IdComponent edge0 = edge[0];
vtkm::IdComponent edge1 = edge[1];
VTKM_ASSERT(0 <= edge0 && edge0 < CubeVertexPermutations_PermVecLength);
VTKM_ASSERT(0 <= edge1 && edge1 < CubeVertexPermutations_PermVecLength);
int root0 = vertex_permutation[edge0];
int root1 = vertex_permutation[edge1];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
while (parentId[root0] != root0)
{
root0 = parentId[root0];
int root1 = CubeVertexPermutationsPortal.Get(
permIndex)[LinkVertexConnectionsEighteenPortal.Get(edgeNo)[1]];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
}
while (parentId[root1] != root1)
{
root1 = parentId[root1];
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
}
if (root0 != root1)
{
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
parentId[root1] = root0;
}
}
}
}