6f0fc110e2
Remove patches that have been applied upstream. Fix compilation issues with `clang++` version 19. Fix new build issues with fmt 11. Cherry-pick patches from upstream VTK-m. Update patch to make it apply cleanly. Update DIY to version 3.6.0 to avoid compilation issue with C++ STL from LLVM 19 (`std::char_traits<T>` can no longer be instantiated with arbitrary types). Add patch to fix compatibility with DIY 3. Add patch to fix build issue of the InfovisBoostGraphAlgorithms module that requires C++14 now. Add patch for the ANARI rendering module to fix an issue with undeclared type identifiers. Add optional dependencies for new Alembic and ANARI modules.
38 lines
2.3 KiB
Diff
38 lines
2.3 KiB
Diff
From 48e385af319543800398656645327243a29babfb Mon Sep 17 00:00:00 2001
|
|
From: Kenneth Moreland <morelandkd@ornl.gov>
|
|
Date: Tue, 15 Oct 2024 12:01:34 -0400
|
|
Subject: [PATCH] Fix compile error for contour tree print
|
|
|
|
A print for one of the contour tree objects was referencing members of
|
|
itself that don't seem to exist. This causes the Intel compiler to fail
|
|
to compile it. I'm at a loss about how any other compiler does not error
|
|
out, but at any rate this should be correct.
|
|
---
|
|
.../worklet/contourtree_distributed/HierarchicalContourTree.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
|
|
index a996d42928..e40d5f4f15 100644
|
|
--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
|
|
+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
|
|
@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
|
|
auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
|
|
auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
|
|
auto whichIterationPortal = this->WhichIteration.ReadPortal();
|
|
- auto whichRoundPortal = this->whichRound.ReadPortal();
|
|
+ auto whichRoundPortal = this->WhichRound.ReadPortal();
|
|
auto superarcsPortal = this->Superarcs.ReadPortal();
|
|
auto superparentsPortal = this->Superparents.ReadPortal();
|
|
for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
|
|
@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
|
|
if (contourtree_augmented::NoSuchElement(superarcTo))
|
|
{ // no superarc
|
|
// if it occurred on the final round, it's the global root and is shown as the NULL node
|
|
- if (whichRoundPortal.Get(superarcFrom) == this->NRounds)
|
|
+ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
|
|
{ // root node
|
|
outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
|
|
<< " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";
|
|
--
|
|
GitLab
|