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.
139 lines
4.3 KiB
C++
139 lines
4.3 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 <random>
|
|
#include <vtkm/cont/Algorithm.h>
|
|
#include <vtkm/worklet/KdTree3D.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
using Algorithm = vtkm::cont::Algorithm;
|
|
|
|
////brute force method /////
|
|
template <typename CoordiVecT, typename CoordiPortalT, typename CoordiT>
|
|
VTKM_EXEC_CONT vtkm::Id NNSVerify3D(CoordiVecT qc, CoordiPortalT coordiPortal, CoordiT& dis)
|
|
{
|
|
dis = std::numeric_limits<CoordiT>::max();
|
|
vtkm::Id nnpIdx = 0;
|
|
|
|
for (vtkm::Int32 i = 0; i < coordiPortal.GetNumberOfValues(); i++)
|
|
{
|
|
CoordiT splitX = coordiPortal.Get(i)[0];
|
|
CoordiT splitY = coordiPortal.Get(i)[1];
|
|
CoordiT splitZ = coordiPortal.Get(i)[2];
|
|
CoordiT _dis =
|
|
vtkm::Sqrt((splitX - qc[0]) * (splitX - qc[0]) + (splitY - qc[1]) * (splitY - qc[1]) +
|
|
(splitZ - qc[2]) * (splitZ - qc[2]));
|
|
if (_dis < dis)
|
|
{
|
|
dis = _dis;
|
|
nnpIdx = i;
|
|
}
|
|
}
|
|
return nnpIdx;
|
|
}
|
|
|
|
class NearestNeighborSearchBruteForce3DWorklet : public vtkm::worklet::WorkletMapField
|
|
{
|
|
public:
|
|
using ControlSignature = void(FieldIn qcIn,
|
|
WholeArrayIn treeCoordiIn,
|
|
FieldOut nnIdOut,
|
|
FieldOut nnDisOut);
|
|
using ExecutionSignature = void(_1, _2, _3, _4);
|
|
|
|
VTKM_CONT
|
|
NearestNeighborSearchBruteForce3DWorklet() {}
|
|
|
|
template <typename CoordiVecType, typename CoordiPortalType, typename IdType, typename CoordiType>
|
|
VTKM_EXEC void operator()(const CoordiVecType& qc,
|
|
const CoordiPortalType& coordiPortal,
|
|
IdType& nnId,
|
|
CoordiType& nnDis) const
|
|
{
|
|
nnDis = std::numeric_limits<CoordiType>::max();
|
|
|
|
nnId = NNSVerify3D(qc, coordiPortal, nnDis);
|
|
}
|
|
};
|
|
|
|
void TestKdTreeBuildNNS(vtkm::cont::DeviceAdapterId deviceId)
|
|
{
|
|
vtkm::Int32 nTrainingPoints = 1000;
|
|
vtkm::Int32 nTestingPoint = 1000;
|
|
|
|
std::vector<vtkm::Vec3f_32> coordi;
|
|
|
|
///// randomly generate training points/////
|
|
std::default_random_engine dre;
|
|
std::uniform_real_distribution<vtkm::Float32> dr(0.0f, 10.0f);
|
|
|
|
for (vtkm::Int32 i = 0; i < nTrainingPoints; i++)
|
|
{
|
|
coordi.push_back(vtkm::make_Vec(dr(dre), dr(dre), dr(dre)));
|
|
}
|
|
|
|
///// preprare data to build 3D kd tree /////
|
|
auto coordi_Handle = vtkm::cont::make_ArrayHandle(coordi, vtkm::CopyFlag::On);
|
|
|
|
// Run data
|
|
vtkm::worklet::KdTree3D kdtree3d;
|
|
kdtree3d.Build(coordi_Handle);
|
|
|
|
//Nearest Neighbor worklet Testing
|
|
/// randomly generate testing points /////
|
|
std::vector<vtkm::Vec3f_32> qcVec;
|
|
for (vtkm::Int32 i = 0; i < nTestingPoint; i++)
|
|
{
|
|
qcVec.push_back(vtkm::make_Vec(dr(dre), dr(dre), dr(dre)));
|
|
}
|
|
|
|
///// preprare testing data /////
|
|
auto qc_Handle = vtkm::cont::make_ArrayHandle(qcVec, vtkm::CopyFlag::On);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Id> nnId_Handle;
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> nnDis_Handle;
|
|
|
|
kdtree3d.Run(coordi_Handle, qc_Handle, nnId_Handle, nnDis_Handle, deviceId);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Id> bfnnId_Handle;
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> bfnnDis_Handle;
|
|
NearestNeighborSearchBruteForce3DWorklet nnsbf3dWorklet;
|
|
vtkm::worklet::DispatcherMapField<NearestNeighborSearchBruteForce3DWorklet> nnsbf3DDispatcher(
|
|
nnsbf3dWorklet);
|
|
nnsbf3DDispatcher.Invoke(qc_Handle,
|
|
vtkm::cont::make_ArrayHandle(coordi, vtkm::CopyFlag::On),
|
|
bfnnId_Handle,
|
|
bfnnDis_Handle);
|
|
|
|
///// verfity search result /////
|
|
bool passTest = true;
|
|
for (vtkm::Int32 i = 0; i < nTestingPoint; i++)
|
|
{
|
|
vtkm::Id workletIdx = nnId_Handle.WritePortal().Get(i);
|
|
vtkm::Id bfworkletIdx = bfnnId_Handle.WritePortal().Get(i);
|
|
|
|
if (workletIdx != bfworkletIdx)
|
|
{
|
|
passTest = false;
|
|
}
|
|
}
|
|
|
|
VTKM_TEST_ASSERT(passTest, "Kd tree NN search result incorrect.");
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
int UnitTestKdTreeBuildNNS(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::RunOnDevice(TestKdTreeBuildNNS, argc, argv);
|
|
}
|