mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
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.
106 lines
3.7 KiB
C++
106 lines
3.7 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/DispatcherMapField.h>
|
|
#include <vtkm/worklet/DotProduct.h>
|
|
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
template <typename T>
|
|
T normalizedVector(T v)
|
|
{
|
|
T vN = vtkm::Normal(v);
|
|
return vN;
|
|
}
|
|
|
|
template <typename T>
|
|
void createVectors(std::vector<vtkm::Vec<T, 3>>& vecs1,
|
|
std::vector<vtkm::Vec<T, 3>>& vecs2,
|
|
std::vector<T>& result)
|
|
{
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
result.push_back(1);
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(-1), T(0), T(0))));
|
|
result.push_back(-1);
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(0), T(1), T(0))));
|
|
result.push_back(0);
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(0), T(-1), T(0))));
|
|
result.push_back(0);
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(1), T(1), T(0))));
|
|
result.push_back(T(1.0 / vtkm::Sqrt(2.0)));
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(1), T(1), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(1), T(0), T(0))));
|
|
result.push_back(T(1.0 / vtkm::Sqrt(2.0)));
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(-1), T(0), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(1), T(1), T(0))));
|
|
result.push_back(-T(1.0 / vtkm::Sqrt(2.0)));
|
|
|
|
vecs1.push_back(normalizedVector(vtkm::make_Vec(T(0), T(1), T(0))));
|
|
vecs2.push_back(normalizedVector(vtkm::make_Vec(T(1), T(1), T(0))));
|
|
result.push_back(T(1.0 / vtkm::Sqrt(2.0)));
|
|
}
|
|
|
|
template <typename T>
|
|
void TestDotProduct()
|
|
{
|
|
std::vector<vtkm::Vec<T, 3>> inputVecs1, inputVecs2;
|
|
std::vector<T> answer;
|
|
createVectors(inputVecs1, inputVecs2, answer);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>> inputArray1, inputArray2;
|
|
vtkm::cont::ArrayHandle<T> outputArray;
|
|
inputArray1 = vtkm::cont::make_ArrayHandle(inputVecs1, vtkm::CopyFlag::Off);
|
|
inputArray2 = vtkm::cont::make_ArrayHandle(inputVecs2, vtkm::CopyFlag::Off);
|
|
|
|
vtkm::worklet::DotProduct dotProductWorklet;
|
|
vtkm::worklet::DispatcherMapField<vtkm::worklet::DotProduct> dispatcherDotProduct(
|
|
dotProductWorklet);
|
|
dispatcherDotProduct.Invoke(inputArray1, inputArray2, outputArray);
|
|
|
|
VTKM_TEST_ASSERT(outputArray.GetNumberOfValues() == inputArray1.GetNumberOfValues(),
|
|
"Wrong number of results for DotProduct worklet");
|
|
|
|
for (vtkm::Id i = 0; i < inputArray1.GetNumberOfValues(); i++)
|
|
{
|
|
vtkm::Vec<T, 3> v1 = inputArray1.ReadPortal().Get(i);
|
|
vtkm::Vec<T, 3> v2 = inputArray2.ReadPortal().Get(i);
|
|
T ans = answer[static_cast<std::size_t>(i)];
|
|
|
|
VTKM_TEST_ASSERT(test_equal(ans, vtkm::Dot(v1, v2)), "Wrong result for dot product");
|
|
}
|
|
}
|
|
|
|
void TestDotProductWorklets()
|
|
{
|
|
std::cout << "Testing DotProduct Worklet" << std::endl;
|
|
TestDotProduct<vtkm::Float32>();
|
|
// TestDotProduct<vtkm::Float64>();
|
|
}
|
|
}
|
|
|
|
int UnitTestDotProduct(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestDotProductWorklets, argc, argv);
|
|
}
|