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.
124 lines
5.2 KiB
C++
124 lines
5.2 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/WorkletMapField.h>
|
|
|
|
#include <vtkm/cont/ArrayHandleExtrudeCoords.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
|
|
namespace
|
|
{
|
|
//std::vector<vtkm::Vec<vtkm::Float32,3>> points_rz = { vtkm::Vec<vtkm::Float32,3>(1.72485139f, 0.020562f, 1.73493571f),
|
|
// vtkm::Vec<vtkm::Float32,3>(0.02052826f, 1.73478011f, 0.02299051f )}; //really a vec<float,2>
|
|
std::vector<float> points_rz = { 1.72485139f, 0.020562f, 1.73493571f,
|
|
0.02052826f, 1.73478011f, 0.02299051f }; //really a vec<float,2>
|
|
std::vector<float> correct_x_coords = {
|
|
1.72485139f, 1.73493571f, 1.73478011f, 1.21965411f, 1.22678481f, 1.22667478f,
|
|
1.05616686e-16f, 1.06234173e-16f, 1.06224646e-16f, -1.21965411f, -1.22678481f, -1.22667478f,
|
|
-1.72485139f, -1.73493571f, -1.73478011f, -1.21965411f, -1.22678481f, -1.22667478f,
|
|
-3.16850059e-16f, -3.18702520e-16f, -3.18673937e-16f, 1.21965411f, 1.22678481f, 1.22667478f
|
|
};
|
|
std::vector<float> correct_y_coords = { 0.0f,
|
|
0.0f,
|
|
0.0f,
|
|
1.21965411f,
|
|
1.22678481f,
|
|
1.22667478f,
|
|
1.72485139f,
|
|
1.73493571f,
|
|
1.73478011f,
|
|
1.21965411f,
|
|
1.22678481f,
|
|
1.22667478f,
|
|
2.11233373e-16f,
|
|
2.12468346e-16f,
|
|
2.12449291e-16f,
|
|
-1.21965411f,
|
|
-1.22678481f,
|
|
-1.22667478f,
|
|
-1.72485139f,
|
|
-1.73493571f,
|
|
-1.73478011f,
|
|
-1.21965411f,
|
|
-1.22678481f,
|
|
-1.22667478f };
|
|
std::vector<float> correct_z_coords = { 0.020562f, 0.02052826f, 0.02299051f, 0.020562f,
|
|
0.02052826f, 0.02299051f, 0.020562f, 0.02052826f,
|
|
0.02299051f, 0.020562f, 0.02052826f, 0.02299051f,
|
|
0.020562f, 0.02052826f, 0.02299051f, 0.020562f,
|
|
0.02052826f, 0.02299051f, 0.020562f, 0.02052826f,
|
|
0.02299051f, 0.020562f, 0.02052826f, 0.02299051f };
|
|
|
|
struct CopyValue : public vtkm::worklet::WorkletMapField
|
|
{
|
|
typedef void ControlSignature(FieldIn, FieldOut);
|
|
typedef _2 ExecutionSignature(_1);
|
|
|
|
template <typename T>
|
|
T&& operator()(T&& t) const
|
|
{
|
|
return std::forward<T>(t);
|
|
}
|
|
};
|
|
|
|
template <typename T, typename S>
|
|
void verify_results(vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>, S> const& handle)
|
|
{
|
|
auto portal = handle.ReadPortal();
|
|
VTKM_TEST_ASSERT(portal.GetNumberOfValues() == static_cast<vtkm::Id>(correct_x_coords.size()),
|
|
"coordinate portal size is incorrect");
|
|
|
|
for (vtkm::Id i = 0; i < handle.GetNumberOfValues(); ++i)
|
|
{
|
|
auto v = portal.Get(i);
|
|
auto e = vtkm::make_Vec(correct_x_coords[static_cast<std::size_t>(i)],
|
|
correct_y_coords[static_cast<std::size_t>(i)],
|
|
correct_z_coords[static_cast<std::size_t>(i)]);
|
|
// std::cout << std::setprecision(4) << "computed " << v << " expected " << e << std::endl;
|
|
VTKM_TEST_ASSERT(test_equal(v, e), "incorrect conversion to Cartesian space");
|
|
}
|
|
}
|
|
|
|
|
|
int TestArrayHandleExtrude()
|
|
{
|
|
const int numPlanes = 8;
|
|
|
|
auto coords = vtkm::cont::make_ArrayHandleExtrudeCoords(
|
|
vtkm::cont::make_ArrayHandle(points_rz, vtkm::CopyFlag::Off), numPlanes, false);
|
|
|
|
VTKM_TEST_ASSERT(coords.GetNumberOfValues() ==
|
|
static_cast<vtkm::Id>(((points_rz.size() / 2) * numPlanes)),
|
|
"coordinate size is incorrect");
|
|
|
|
// Verify first that control is correct
|
|
verify_results(coords);
|
|
|
|
// Verify 1d scheduling by doing a copy to a vtkm::ArrayHandle<Vec3>
|
|
vtkm::cont::ArrayHandle<vtkm::Vec<float, 3>> output1D;
|
|
vtkm::worklet::DispatcherMapField<CopyValue> dispatcher;
|
|
dispatcher.Invoke(coords, output1D);
|
|
verify_results(output1D);
|
|
|
|
return 0;
|
|
}
|
|
|
|
} // end namespace anonymous
|
|
|
|
int UnitTestArrayHandleExtrude(int argc, char* argv[])
|
|
{
|
|
vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
|
|
return vtkm::cont::testing::Testing::Run(TestArrayHandleExtrude, argc, argv);
|
|
}
|