mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 09:59:12 +00:00
10e8a4a7f9
Previously, when a ReadPortal or a WritePortal was returned from an ArrayHandle, it had wrapped in it a Token that was attached to the ArrayHandle. This Token would prevent other reads and writes from the ArrayHandle. This added safety in the form of making sure that the ArrayPortal was always valid. Unfortunately, it also made deadlocks very easy. They happened when an ArrayPortal did not leave scope immediately after use (which is not all that uncommon). Now, the ArrayPortal no longer locks up the ArrayHandle. Instead, when an access happens on the ArrayPortal, it checks to make sure that nothing has happened to the data being accessed. If it has, a fatal error is reported to the log.
112 lines
3.6 KiB
C++
112 lines
3.6 KiB
C++
//============================================================================
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
//
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//============================================================================
|
|
#include <vtkm/worklet/ScatterPermutation.h>
|
|
|
|
#include <vtkm/cont/ArrayHandle.h>
|
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
#include <vtkm/worklet/DispatcherMapTopology.h>
|
|
#include <vtkm/worklet/WorkletMapTopology.h>
|
|
|
|
#include <ctime>
|
|
#include <random>
|
|
|
|
namespace
|
|
{
|
|
|
|
class Worklet : public vtkm::worklet::WorkletVisitPointsWithCells
|
|
{
|
|
public:
|
|
using ControlSignature = void(CellSetIn cellset,
|
|
FieldOutPoint outPointId,
|
|
FieldOutPoint outVisit);
|
|
using ExecutionSignature = void(InputIndex, VisitIndex, _2, _3);
|
|
using InputDomain = _1;
|
|
|
|
using ScatterType = vtkm::worklet::ScatterPermutation<>;
|
|
|
|
VTKM_CONT
|
|
static ScatterType MakeScatter(const vtkm::cont::ArrayHandle<vtkm::Id>& permutation)
|
|
{
|
|
return ScatterType(permutation);
|
|
}
|
|
|
|
VTKM_EXEC void operator()(vtkm::Id pointId,
|
|
vtkm::IdComponent visit,
|
|
vtkm::Id& outPointId,
|
|
vtkm::IdComponent& outVisit) const
|
|
{
|
|
outPointId = pointId;
|
|
outVisit = visit;
|
|
}
|
|
};
|
|
|
|
template <typename CellSetType>
|
|
void RunTest(const CellSetType& cellset, const vtkm::cont::ArrayHandle<vtkm::Id>& permutation)
|
|
{
|
|
vtkm::cont::ArrayHandle<vtkm::Id> outPointId;
|
|
vtkm::cont::ArrayHandle<vtkm::IdComponent> outVisit;
|
|
|
|
vtkm::worklet::DispatcherMapTopology<Worklet> dispatcher(Worklet::MakeScatter(permutation));
|
|
dispatcher.Invoke(cellset, outPointId, outVisit);
|
|
|
|
for (vtkm::Id i = 0; i < permutation.GetNumberOfValues(); ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(outPointId.ReadPortal().Get(i) == permutation.ReadPortal().Get(i),
|
|
"output point ids do not match the permutation");
|
|
VTKM_TEST_ASSERT(outVisit.ReadPortal().Get(i) == 0, "incorrect visit index");
|
|
}
|
|
}
|
|
|
|
void TestScatterPermutation()
|
|
{
|
|
vtkm::cont::DataSet dataset = vtkm::cont::testing::MakeTestDataSet().Make2DUniformDataSet0();
|
|
auto cellset = dataset.GetCellSet();
|
|
vtkm::Id numberOfPoints = cellset.GetNumberOfPoints();
|
|
|
|
vtkm::UInt32 seed = static_cast<vtkm::UInt32>(std::time(nullptr));
|
|
|
|
std::default_random_engine generator;
|
|
generator.seed(seed);
|
|
std::uniform_int_distribution<vtkm::Id> countDistribution(1, 2 * numberOfPoints);
|
|
std::uniform_int_distribution<vtkm::Id> ptidDistribution(0, numberOfPoints - 1);
|
|
|
|
const int iterations = 5;
|
|
std::cout << "Testing with random permutations " << iterations << " times\n";
|
|
std::cout << "Seed: " << seed << std::endl;
|
|
for (int i = 1; i <= iterations; ++i)
|
|
{
|
|
std::cout << "iteration: " << i << "\n";
|
|
|
|
vtkm::Id count = countDistribution(generator);
|
|
vtkm::cont::ArrayHandle<vtkm::Id> permutation;
|
|
permutation.Allocate(count);
|
|
|
|
auto portal = permutation.WritePortal();
|
|
std::cout << "using permutation:";
|
|
for (vtkm::Id j = 0; j < count; ++j)
|
|
{
|
|
auto val = ptidDistribution(generator);
|
|
std::cout << " " << val;
|
|
portal.Set(j, val);
|
|
}
|
|
std::cout << "\n";
|
|
|
|
RunTest(cellset, permutation);
|
|
}
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
int UnitTestScatterPermutation(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestScatterPermutation, argc, argv);
|
|
}
|