d1a4aecc59
We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
200 lines
5.9 KiB
C++
200 lines
5.9 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/cont/CellSetPermutation.h>
|
|
#include <vtkm/cont/CellSetSingleType.h>
|
|
#include <vtkm/cont/DataSet.h>
|
|
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
|
|
|
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
#include <vtkm/worklet/CellAverage.h>
|
|
#include <vtkm/worklet/DispatcherMapTopology.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
template <typename T, typename Storage>
|
|
bool TestArrayHandle(const vtkm::cont::ArrayHandle<T, Storage>& ah,
|
|
const T* expected,
|
|
vtkm::Id size)
|
|
{
|
|
if (size != ah.GetNumberOfValues())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
auto ahPortal = ah.ReadPortal();
|
|
for (vtkm::Id i = 0; i < size; ++i)
|
|
{
|
|
if (ahPortal.Get(i) != expected[i])
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
inline vtkm::cont::DataSet make_SingleTypeDataSet()
|
|
{
|
|
using CoordType = vtkm::Vec3f_32;
|
|
std::vector<CoordType> coordinates;
|
|
coordinates.push_back(CoordType(0, 0, 0));
|
|
coordinates.push_back(CoordType(1, 0, 0));
|
|
coordinates.push_back(CoordType(1, 1, 0));
|
|
coordinates.push_back(CoordType(2, 1, 0));
|
|
coordinates.push_back(CoordType(2, 2, 0));
|
|
|
|
std::vector<vtkm::Id> conn;
|
|
// First Cell
|
|
conn.push_back(0);
|
|
conn.push_back(1);
|
|
conn.push_back(2);
|
|
// Second Cell
|
|
conn.push_back(1);
|
|
conn.push_back(2);
|
|
conn.push_back(3);
|
|
// Third Cell
|
|
conn.push_back(2);
|
|
conn.push_back(3);
|
|
conn.push_back(4);
|
|
|
|
vtkm::cont::DataSet ds;
|
|
vtkm::cont::DataSetBuilderExplicit builder;
|
|
ds = builder.Create(coordinates, vtkm::CellShapeTagTriangle(), 3, conn);
|
|
|
|
//Set point scalar
|
|
const int nVerts = 5;
|
|
vtkm::Float32 vars[nVerts] = { 10.1f, 20.1f, 30.2f, 40.2f, 50.3f };
|
|
|
|
ds.AddPointField("pointvar", vars, nVerts);
|
|
|
|
return ds;
|
|
}
|
|
|
|
void TestDataSet_Explicit()
|
|
{
|
|
|
|
vtkm::cont::DataSet dataSet = make_SingleTypeDataSet();
|
|
|
|
//iterate the 2nd cell 4 times
|
|
vtkm::cont::ArrayHandle<vtkm::Id> validCellIds =
|
|
vtkm::cont::make_ArrayHandle<vtkm::Id>({ 1, 1, 1, 1 });
|
|
|
|
//get the cellset single type from the dataset
|
|
vtkm::cont::CellSetSingleType<> cellSet;
|
|
dataSet.GetCellSet().CopyTo(cellSet);
|
|
|
|
//verify that we can create a subset of a singlset
|
|
using SubsetType = vtkm::cont::CellSetPermutation<vtkm::cont::CellSetSingleType<>>;
|
|
SubsetType subset;
|
|
subset.Fill(validCellIds, cellSet);
|
|
|
|
subset.PrintSummary(std::cout);
|
|
|
|
//run a basic for-each topology algorithm on this
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage> dispatcher;
|
|
dispatcher.Invoke(subset, dataSet.GetField("pointvar"), result);
|
|
|
|
//iterate same cell 4 times
|
|
vtkm::Float32 expected[4] = { 30.1667f, 30.1667f, 30.1667f, 30.1667f };
|
|
auto resultPortal = result.ReadPortal();
|
|
for (int i = 0; i < 4; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultPortal.Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on explicit subset data");
|
|
}
|
|
}
|
|
|
|
void TestDataSet_Structured2D()
|
|
{
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make2DUniformDataSet0();
|
|
|
|
//iterate the 2nd cell 4 times
|
|
vtkm::cont::ArrayHandle<vtkm::Id> validCellIds =
|
|
vtkm::cont::make_ArrayHandle<vtkm::Id>({ 1, 1, 1, 1 });
|
|
|
|
vtkm::cont::CellSetStructured<2> cellSet;
|
|
dataSet.GetCellSet().CopyTo(cellSet);
|
|
|
|
//verify that we can create a subset of a 2d UniformDataSet
|
|
vtkm::cont::CellSetPermutation<vtkm::cont::CellSetStructured<2>> subset;
|
|
subset.Fill(validCellIds, cellSet);
|
|
|
|
subset.PrintSummary(std::cout);
|
|
|
|
//run a basic for-each topology algorithm on this
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage> dispatcher;
|
|
dispatcher.Invoke(subset, dataSet.GetField("pointvar"), result);
|
|
|
|
vtkm::Float32 expected[4] = { 40.1f, 40.1f, 40.1f, 40.1f };
|
|
auto resultPortal = result.ReadPortal();
|
|
for (int i = 0; i < 4; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultPortal.Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on 2d structured subset data");
|
|
}
|
|
}
|
|
|
|
void TestDataSet_Structured3D()
|
|
{
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
//iterate the 2nd cell 4 times
|
|
vtkm::cont::ArrayHandle<vtkm::Id> validCellIds =
|
|
vtkm::cont::make_ArrayHandle<vtkm::Id>({ 1, 1, 1, 1 });
|
|
|
|
vtkm::cont::CellSetStructured<3> cellSet;
|
|
dataSet.GetCellSet().CopyTo(cellSet);
|
|
|
|
//verify that we can create a subset of a 2d UniformDataSet
|
|
vtkm::cont::CellSetPermutation<vtkm::cont::CellSetStructured<3>> subset;
|
|
subset.Fill(validCellIds, cellSet);
|
|
|
|
subset.PrintSummary(std::cout);
|
|
|
|
//run a basic for-each topology algorithm on this
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage> dispatcher;
|
|
dispatcher.Invoke(subset, dataSet.GetField("pointvar"), result);
|
|
|
|
vtkm::Float32 expected[4] = { 70.2125f, 70.2125f, 70.2125f, 70.2125f };
|
|
auto resultPortal = result.ReadPortal();
|
|
for (int i = 0; i < 4; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultPortal.Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on 2d structured subset data");
|
|
}
|
|
}
|
|
|
|
void TestDataSet_Permutation()
|
|
{
|
|
std::cout << std::endl;
|
|
std::cout << "--TestDataSet_Permutation--" << std::endl << std::endl;
|
|
|
|
TestDataSet_Explicit();
|
|
TestDataSet_Structured2D();
|
|
TestDataSet_Structured3D();
|
|
}
|
|
}
|
|
|
|
int UnitTestDataSetPermutation(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestDataSet_Permutation, argc, argv);
|
|
}
|