Skip to content

BUG: Read the shared face-count map without inserting in Compute Triangle Face Ids #1858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imikejackson merged 1 commit into from
Oct 30, 2026
Merged

BUG: Read the shared face-count map without inserting in Compute Triangle Face Ids #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SharedFeatureFaceImpl
{
public:
SharedFeatureFaceImpl(const std::vector<std::pair<int32, int32>>& faceLabelVector, Int32AbstractDataStore& surfaceMeshFeatureFaceLabels, Int32AbstractDataStore& surfaceMeshFeatureFaceNumTriangles,
std::map<uint64, int32>& faceSizeMap, const std::atomic_bool& shouldCancel)
const std::map<uint64, int32>& faceSizeMap, const std::atomic_bool& shouldCancel)
: m_FaceLabelVector(faceLabelVector)
, m_SurfaceMeshFeatureFaceLabels(surfaceMeshFeatureFaceLabels)
, m_SurfaceMeshFeatureFaceNumTriangles(surfaceMeshFeatureFaceNumTriangles)
Expand All @@ -44,8 +44,11 @@ class SharedFeatureFaceImpl
m_SurfaceMeshFeatureFaceLabels[2 * i + 1] = faceLabelMapEntry.second;

// get feature triangle count
uint64 faceId64 = ConvertToUInt64(faceLabelMapEntry.first, faceLabelMapEntry.second);
m_SurfaceMeshFeatureFaceNumTriangles[i] = m_FaceSizeMap[faceId64];
// Worker threads share the map, so only read it. Row 0 is the reserved (0,0) boundary, which has no
// entry unless a triangle uses that pair; a missing entry has no triangles.
const uint64 faceId64 = ConvertToUInt64(faceLabelMapEntry.first, faceLabelMapEntry.second);
const auto faceSizeIter = m_FaceSizeMap.find(faceId64);
m_SurfaceMeshFeatureFaceNumTriangles[i] = faceSizeIter == m_FaceSizeMap.end() ? 0 : faceSizeIter->second;
if(m_ShouldCancel)
{
break;
Expand All @@ -57,7 +60,7 @@ class SharedFeatureFaceImpl
const std::vector<std::pair<int32, int32>>& m_FaceLabelVector;
Int32AbstractDataStore& m_SurfaceMeshFeatureFaceLabels;
Int32AbstractDataStore& m_SurfaceMeshFeatureFaceNumTriangles;
std::map<uint64, int32>& m_FaceSizeMap;
const std::map<uint64, int32>& m_FaceSizeMap;
const std::atomic_bool& m_ShouldCancel;
};

Expand Down
105 changes: 105 additions & 0 deletions src/Plugins/SimplnxCore/test/SharedFeatureFaceTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
#include "simplnx/Parameters/GeometrySelectionParameter.hpp"
#include "simplnx/UnitTest/UnitTestCommon.hpp"

#include "simplnx/DataStructure/AttributeMatrix.hpp"
#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp"
#include <array>
#include <catch2/catch.hpp>
#include <utility>
#include <vector>

using namespace nx::core;
using namespace nx::core::UnitTest;
Expand All @@ -28,6 +33,78 @@ const DataPath k_GeometryPath = DataPath({k_TriangleGeometryName});
const DataPath k_FeatureAttributeMatrixPath = k_GeometryPath.createChildPath(k_FaceFeatureName);
const DataPath k_FaceLabelsPath = k_GeometryPath.createChildPath(k_FaceAttributeMatrixName).createChildPath(k_FaceLabelsName);

/**
* @brief Builds one disjoint triangle per label pair, runs the filter without randomization, and checks every output.
* @param pairs Face label pair for each triangle.
* @param expectedIds Expected shared feature face ID for each triangle.
* @param expectedLabels Expected label pair for each boundary row, including the reserved row 0.
* @param expectedCounts Expected triangle count for each boundary row, including the reserved row 0.
*/
void ExecuteAndCheckLabelPairs(const std::vector<std::pair<int32, int32>>& pairs, const std::vector<int32>& expectedIds, const std::vector<std::pair<int32, int32>>& expectedLabels,
const std::vector<int32>& expectedCounts)
{
DataStructure ds;
auto* meshGeomPtr = TriangleGeom::Create(ds, "Mesh");
REQUIRE(meshGeomPtr != nullptr);
auto* verticesPtr = UnitTest::CreateTestDataArray<float32>(ds, "Vertices", {pairs.size() * 3}, {3}, meshGeomPtr->getId());
auto* trianglesPtr = UnitTest::CreateTestDataArray<uint64>(ds, "Triangles", {pairs.size()}, {3}, meshGeomPtr->getId());
auto* faceDataPtr = AttributeMatrix::Create(ds, "Faces", ShapeType{pairs.size()}, meshGeomPtr->getId());
REQUIRE(verticesPtr != nullptr);
REQUIRE(trianglesPtr != nullptr);
REQUIRE(faceDataPtr != nullptr);
meshGeomPtr->setVertices(*verticesPtr);
meshGeomPtr->setFaceList(*trianglesPtr);
meshGeomPtr->setFaceDataId(faceDataPtr->getId());
auto* labelsPtr = UnitTest::CreateTestDataArray<int32>(ds, "Labels", {pairs.size()}, {2}, faceDataPtr->getId());
REQUIRE(labelsPtr != nullptr);
for(usize tupleIdx = 0; tupleIdx < pairs.size(); ++tupleIdx)
{
const auto x = static_cast<float32>(2 * tupleIdx);
const std::array<float32, 9> xyz{x, 0, 0, x + 1, 0, 0, x, 1, 0};
for(usize compIdx = 0; compIdx < xyz.size(); ++compIdx)
{
(*verticesPtr)[9 * tupleIdx + compIdx] = xyz[compIdx];
}
for(usize compIdx = 0; compIdx < 3; ++compIdx)
{
(*trianglesPtr)[3 * tupleIdx + compIdx] = 3 * tupleIdx + compIdx;
}
(*labelsPtr)[2 * tupleIdx] = pairs[tupleIdx].first;
(*labelsPtr)[2 * tupleIdx + 1] = pairs[tupleIdx].second;
}
SharedFeatureFaceFilter filter;
auto args = filter.getDefaultArguments();
args.insertOrAssign(SharedFeatureFaceFilter::k_TriGeometryDataPath_Key, std::make_any<DataPath>(DataPath({"Mesh"})));
args.insertOrAssign(SharedFeatureFaceFilter::k_FaceLabelsArrayPath_Key, std::make_any<DataPath>(DataPath({"Mesh", "Faces", "Labels"})));
args.insertOrAssign(SharedFeatureFaceFilter::k_RandomizeFeatures_Key, std::make_any<bool>(false));
args.insertOrAssign(SharedFeatureFaceFilter::k_FeatureFaceIdsArrayName_Key, std::make_any<std::string>("Ids"));
args.insertOrAssign(SharedFeatureFaceFilter::k_GrainBoundaryAttributeMatrixName_Key, std::make_any<std::string>("Boundaries"));
args.insertOrAssign(SharedFeatureFaceFilter::k_FeatureFaceLabelsArrayName_Key, std::make_any<std::string>("Labels"));
args.insertOrAssign(SharedFeatureFaceFilter::k_FeatureNumTrianglesArrayName_Key, std::make_any<std::string>("Counts"));
auto result = filter.execute(ds, args);
SIMPLNX_RESULT_REQUIRE_VALID(result.result);
REQUIRE_NOTHROW(ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Faces", "Ids"})));
const auto& idsRef = ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Faces", "Ids"}));
REQUIRE_NOTHROW(ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Boundaries", "Labels"})));
const auto& outLabelsRef = ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Boundaries", "Labels"}));
REQUIRE_NOTHROW(ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Boundaries", "Counts"})));
const auto& countsRef = ds.getDataRefAs<Int32Array>(DataPath({"Mesh", "Boundaries", "Counts"}));
REQUIRE(idsRef.getNumberOfTuples() == expectedIds.size());
REQUIRE(outLabelsRef.getNumberOfTuples() == expectedLabels.size());
REQUIRE(countsRef.getNumberOfTuples() == expectedCounts.size());
for(usize tupleIdx = 0; tupleIdx < expectedIds.size(); ++tupleIdx)
{
CHECK(idsRef[tupleIdx] == expectedIds[tupleIdx]);
}
for(usize row = 0; row < expectedLabels.size(); ++row)
{
CHECK(outLabelsRef[2 * row] == expectedLabels[row].first);
CHECK(outLabelsRef[2 * row + 1] == expectedLabels[row].second);
CHECK(countsRef[row] == expectedCounts[row]);
}
UnitTest::CheckArraysInheritTupleDims(ds);
}

} // namespace SharedFeatureFaceFilterTest

using namespace SharedFeatureFaceFilterTest;
Expand Down Expand Up @@ -103,3 +180,31 @@ TEST_CASE("SimplnxCore::SharedFeatureFaceFilter", "[SimplnxCore][SharedFeatureFa

UnitTest::CheckArraysInheritTupleDims(dataStructure);
}

TEST_CASE("SimplnxCore::SharedFeatureFace: Missing zero pair rotation race", "[SimplnxCore][SharedFeatureFaceFilter][Regression]")
{
UnitTest::LoadPlugins();
// The first distinct pairs create map keys 2 and 1. Key zero is absent, so the reserved row must receive
// count zero without changing the shared map.
const std::vector<std::pair<int32, int32>> pairs{{0, 2}, {0, 2}, {0, 1}};
const std::vector<int32> expectedIds{1, 1, 2};
const std::vector<std::pair<int32, int32>> expectedLabels{{0, 0}, {0, 2}, {0, 1}};
const std::vector<int32> expectedCounts{0, 2, 1};
for(usize repetition = 0; repetition < 300; ++repetition)
{
CAPTURE(repetition);
ExecuteAndCheckLabelPairs(pairs, expectedIds, expectedLabels, expectedCounts);
}
}

TEST_CASE("SimplnxCore::SharedFeatureFace: Real zero pair counts", "[SimplnxCore][SharedFeatureFaceFilter]")
{
UnitTest::LoadPlugins();
// Pair (0,0) creates map key zero, so the reserved row and boundary row 1 share that key and both report
// its two triangles.
const std::vector<std::pair<int32, int32>> pairs{{0, 0}, {0, 2}, {0, 0}};
const std::vector<int32> expectedIds{1, 2, 1};
const std::vector<std::pair<int32, int32>> expectedLabels{{0, 0}, {0, 0}, {0, 2}};
const std::vector<int32> expectedCounts{2, 2, 1};
ExecuteAndCheckLabelPairs(pairs, expectedIds, expectedLabels, expectedCounts);
}
Loading